diff --git a/include/common_structs.h b/include/common_structs.h
index 2715d912d5..09ab28d00e 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -759,11 +759,19 @@ typedef struct CollisionData {
     /* 0x0E */ char unk_0E[2];
 } CollisionData; // size = 0x10
 
+typedef struct ModelNode {
+    /* 0x00 */ s32 type; /* 2 = model */
+    /* 0x04 */ UNK_PTR displayList;
+    /* 0x08 */ s32 numProperties;
+    /* 0x0C */ UNK_PTR propertyList;
+    /* 0x10 */ struct ModelGroupData* groupData;
+} ModelNode; // size = 0x14
+
 typedef struct Model {
     /* 0x00 */ u16 flags;
     /* 0x02 */ s16 modelID;
     /* 0x04 */ char unk_04[4];
-    /* 0x08 */ s32* modelNode;
+    /* 0x08 */ struct ModelNode** modelNode;
     /* 0x0C */ struct ModelGroupData* groupData;
     /* 0x10 */ s32* currentSpecialMatrix;
     /* 0x14 */ char unk_14[4];
@@ -855,6 +863,41 @@ typedef struct EffectBlueprint {
     /* 0x14 */ void (*unk_14)(EffectInstance* effectInst);
 } EffectBlueprint; // size = 0x18
 
+typedef struct {
+    char unk_00[0x38];
+    f32 unk_38[4];
+} EffectUnkStruct1;
+// TODO figure out what this actually is
+// func_800715D0 invokes gEffectTable[78]'s entryPoint function
+// func_80072230 invokes gEffectTable[111]'s entryPoint function
+// func_800729B0 invokes gEffectTable[131]'s entryPoint function
+// These functions are currently typed to return void
+// Assume they return an Effect*, and this struct is accessed at unk_0C,
+// but this struct differs from EffectInstanceData
+// Search for "struct N(temp)" for examples
+typedef struct {
+    char unk_00[0x4];
+    f32 unk_04;
+    f32 unk_08;
+    f32 unk_0C;
+    f32 unk_10;
+    char unk_14[0x4];
+    s32 unk_18;
+    s32 unk_1C;
+    s32 unk_20;
+    X32 unk_24;
+    s32 unk_28;
+    s32 unk_2C;
+    s32 unk_30;
+    s32 unk_34;
+    s32 unk_38;
+    char unk_3C[0xC];
+    EffectUnkStruct1* unk_48;
+    char unk_4C[0x24];
+    s32 unk_70;
+    s32 unk_74;
+} EffectInstanceDataThing;
+
 typedef struct Effect {
     /* 0x00 */ s32 flags;
     /* 0x04 */ s32 effectIndex;
@@ -906,14 +949,6 @@ typedef struct ItemEntity {
     /* 0x58 */ s32 unk_58;
 } ItemEntity; // size = 0x5C
 
-typedef struct ModelNode {
-    /* 0x00 */ s32 type; /* 2 = model */
-    /* 0x04 */ UNK_PTR displayList;
-    /* 0x08 */ s32 numProperties;
-    /* 0x0C */ UNK_PTR propertyList;
-    /* 0x10 */ struct ModelGroupData* groupData;
-} ModelNode; // size = 0x14
-
 typedef struct StaticShadowData {
     /* 0x00 */ s16 flags;
     /* 0x02 */ char unk_02[34];
@@ -1738,7 +1773,8 @@ typedef struct {
 } PauseItemPage; // size = 0xC
 
 typedef struct {
-    /* 0x00 */ char unk_00[8];
+    /* 0x00 */ f32 unk_00;
+    /* 0x04 */ char unk_04[4];
     /* 0x08 */ s8* unk_08;
     /* 0x0C */ void* fpInit;
     /* 0x10 */ void* fpHandleInput;
diff --git a/include/functions.h b/include/functions.h
index f2e0b3d5ae..eb2e30593f 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -19,6 +19,7 @@ void osCleanupThread(void);
 
 void func_80070A90(s32, f32, f32, f32);
 void func_80070AF0(s32, f32, f32, f32);
+f32 signF(f32 val);
 
 void* heap_malloc(s32 size);
 HeapNode* _heap_create(s32* addr, u32 size);
@@ -99,19 +100,27 @@ Npc* make_disguise_npc(s32 peachDisguise);
 s32 partner_player_can_pause(void);
 s32 disable_player_static_collisions(void);
 s32 disable_player_input(void);
-
+void func_80027088(s32);
 void set_time_freeze_mode(s32);
 
 void get_dpad_input_radial(f32* angle, f32* magnitude);
-
+void transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS);
 void func_8006F8F0(f32, f32, f32);
 void func_8006FEF0(s32, f32, f32, f32, f32);
 void func_80070190(s32, f32, f32, f32, s32, f32, s32, s32);
-
+void func_80070F70(s32 var1, f32 var2, f32 var3, f32 var4, f32 var5, f32 var6, f32 var7, s32 var8, s32* unk);
 void func_80071090(s32, f32, f32, f32, s32);
 Effect* func_80071750(s32, f32, f32, f32, f32, s32);
-void func_800720B0(s32, f32, f32, f32, f32, s32);
+Effect* func_800720B0(s32, f32, f32, f32, f32, s32);
 void func_80072950(s32, f32, f32, f32, f32, s32 time);
+Effect* func_800715D0(s32, f32, f32, f32);
+Effect* func_80071810(s32, f32, f32, f32);
+Effect* func_80072890(s32, f32, f32, f32, f32, s32);
+Effect* func_800716F0(s32, f32, f32, f32, f32, s32);
+
+void func_80071690(s32, f32, f32, f32);
+void func_800F4E40(void*);
+s32 func_800DDCEC(s32, f32*, f32*, f32*, f32, f32, f32, f32);
 
 void update_collider_transform(s16 colliderID);
 void get_collider_center(s32 colliderID, f32* x, f32* y, f32* z);
@@ -200,7 +209,7 @@ ScriptInstance* start_script_in_group(Script* source, u8 priority, u8 initialSta
 void set_animation_rate(ActorID actorID, s32 partIndex, f32 rate);
 void func_8011B7C0(u16, s32, s32);
 AnimatedMesh* get_anim_mesh(s32 arg0);
-void set_transition_stencil_zoom_0(s32, f32);
+void set_transition_stencil_zoom_0(u8, f32);
 void set_transition_stencil_zoom_1(s32, f32);
 void func_80137DC0(s32, f32*, f32*);
 s32 set_transition_stencil_color(s32, u8, u8, u8);
@@ -295,7 +304,11 @@ s32 func_80071030(s32 a0, f32 a1, f32 a2, f32 a3, s32 a4);
 void func_80070CD0(s32, f32, f32, f32, f32, f32);
 
 void func_802B2078(void);
-
+extern f32 gCurtainScale;
+extern f32 gCurtainScaleGoal;
+extern f32 gCurtainFade;
+extern f32 gCurtainFadeGoal;
+extern UNK_FUN_PTR(gCurtainDrawCallback);
 void func_802DDA8C(s32, s32, f32);
 
 void initialize_curtains(void);
@@ -321,21 +334,16 @@ f32 dead_set_float_variable(ScriptInstance* script, Bytecode var, f32 value);
 f32 dead_cos_rad(f32 x);
 f32 dead_atan2(f32 startX, f32 startZ, f32 endX, f32 endZ);
 
-void func_8004A784(Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5);
-void base_UnkNpcAIFunc1(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory);
-ApiStatus func_80045900(ScriptInstance* script);
-ApiStatus func_802D6420(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802D6954(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802D2B6C(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_80045838(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802D585C(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802CA988(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802CDE68(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802D8248(ScriptInstance* script, s32 isInitialCall);
-
 s32 create_dynamic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void));
 EntityModel* get_entity_model(s32 idx);
 f32 func_800E5938(s32 lag, s32* x, s32* y, s32* z);
 
+void sfx_get_spatialized_sound_params(f32 arg0, f32 arg1, f32 arg2, s16* arg3, s16* arg4, s32 arg5);
+void sfx_play_sound_with_params(s32 arg0, u8 arg1, u8 arg2, s16 arg3);
+void* func_800729B0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
+void* func_800726B0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
+void func_8004A784(Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5);
+void base_UnkNpcAIFunc1(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory);
+
+
 #endif
diff --git a/include/macros.h b/include/macros.h
index 3acfd73556..34b0086cc5 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -19,7 +19,6 @@
 #define STATIC_ASSERT(condition) enum { static_assert_fail = 1/(!!(condition)) } // Causes division by zero ("not integer constant") if false
 
 #define CAM(id) (&gCameras[id])
-#define CAM2(id) ({ Camera* c = gCameras; &c[id]; })
 
 #define BADGE_MENU_PAGE(index) (&gBadgeMenuPages[index])
 #define ITEM_MENU_PAGE(index) (&gItemMenuPages[index])
@@ -38,6 +37,7 @@
 #define MAX_ENTITIES 30
 #define MAX_DYNAMIC_ENTITIES 16
 #define MAX_TEX_PANNERS 16
+#define MAX_ITEM_ENTITIES 256
 
 // Alternative to libultra's M_PI: non-float version; more digits cause issues
 #define PI 3.141592f
diff --git a/include/map.h b/include/map.h
index 4030805c71..882358dca4 100644
--- a/include/map.h
+++ b/include/map.h
@@ -219,7 +219,7 @@ typedef struct {
     /* 0x0C */ s32 pointZ;
     /* 0x10 */ s32 sizeX;
     /* 0x14 */ s32 sizeZ;
-    /* 0x18 */ f32 unk_34;
+    /* 0x18 */ f32 unk_18;
     /* 0x1C */ s16 unk_1C;
 } EnemyTerritoryThing; // size = 0x20
 
diff --git a/include/script_api/common.h b/include/script_api/common.h
index 1d0ccc01ce..44b10ab15c 100644
--- a/include/script_api/common.h
+++ b/include/script_api/common.h
@@ -261,12 +261,13 @@ ApiStatus DemoSetButtons(ScriptInstance* script, s32 isInitialCall);
 ApiStatus DemoJoystickRadial(ScriptInstance* script, s32 isInitialCall);
 ApiStatus DemoJoystickXY(ScriptInstance* script, s32 isInitialCall);
 ApiStatus WaitForPlayerInputEnabled(ScriptInstance* script, s32 isInitialCall);
-
+ApiStatus IsPlayerOnValidFloor(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802CFE2C(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802CFD30(ScriptInstance* script, s32 isInitialCall);
 ApiStatus IsStartingConversation(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802D5830(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall);
+ApiStatus SetNpcSprite(ScriptInstance* script, s32 isInitialCall);
 
 ApiStatus func_802D3624(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802D36E0(ScriptInstance* script, s32 isInitialCall);
@@ -274,6 +275,32 @@ ApiStatus func_802D38EC(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802D3840(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802D39FC(ScriptInstance* script, s32 isInitialCall);
 ApiStatus func_802D3C58(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D2884(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D2C14(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D7B10(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D663C(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_80045900(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D6420(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D6954(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D2B6C(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_80045838(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D585C(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802CA988(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802CDE68(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D8248(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D2520(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D5FF8(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D5FD8(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802D62E4(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_80044238(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802C9C70(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802C94A0(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802C90FC(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802CFE80(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802CFFC0(ScriptInstance* script, s32 isInitialCall);
+ApiStatus func_802C971C(ScriptInstance* script, s32 isInitialCall);
 
 extern Script EnemyNpcHit;
 extern Script EnemyNpcDefeat;
diff --git a/include/si.h b/include/si.h
index 968018274e..752082ba6d 100644
--- a/include/si.h
+++ b/include/si.h
@@ -75,7 +75,7 @@ typedef enum ScriptOpcode {
     ScriptOpcode_OR_CONST, ///< Args: container, value to bitwise OR with
     ScriptOpcode_CALL, ///< Args: *function, ...
     ScriptOpcode_SPAWN_SCRIPT, ///< Args: Script*
-    ScriptOpcode_SPAWN_SCRIPT_GET_ID, ///< Args: Script*, container
+    ScriptOpcode_SPAWN_GET_ID, ///< Args: Script*, container
     ScriptOpcode_AWAIT_SCRIPT, ///< Spawns a script and waits for it to return before continuing. Args: Script*
     ScriptOpcode_BIND_TRIGGER, ///< Args: Script*, trigger flags, s32 target, 1, Trigger*
     ScriptOpcode_UNBIND, ///< Unbinds any triggers bound to this script.
@@ -99,16 +99,16 @@ typedef enum ScriptOpcode {
     ScriptOpcode_DEBUG_PRINT = 0x5B, ///< Args: expression
 } ScriptOpcode;
 
-#define SI_VAR(v) ((v - 30000000))
-#define SI_MAP_VAR(v) ((v - 50000000))
-#define SI_FLAG(v) ((v - 70000000))
-#define SI_MAP_FLAG(v) ((v - 90000000))
-#define SI_AREA_FLAG(v) ((v - 110000000))
-#define SI_SAVE_FLAG(v) ((v - 130000000))
-#define SI_AREA_VAR(v) ((v - 150000000))
-#define SI_SAVE_VAR(v) ((v - 170000000))
-#define SI_ARRAY(v) ((v - 190000000))
-#define SI_ARRAY_FLAG(v) ((v - 210000000))
+#define SI_VAR(v)           ((v -  30000000))
+#define SI_MAP_VAR(v)       ((v -  50000000))
+#define SI_FLAG(v)          ((v -  70000000))
+#define SI_MAP_FLAG(v)      ((v -  90000000))
+#define SI_AREA_FLAG(v)     ((v - 110000000))
+#define SI_SAVE_FLAG(v)     ((v - 130000000))
+#define SI_AREA_VAR(v)      ((v - 150000000))
+#define SI_SAVE_VAR(v)      ((v - 170000000))
+#define SI_ARRAY(v)         ((v - 190000000))
+#define SI_ARRAY_FLAG(v)    ((v - 210000000))
 #define SI_FIXED(v) (((v * 1024.0f) + -230000000)) // See float_to_fixed_var
 #define MAKE_ENTITY_END 0x80000000
 
diff --git a/include/variables.h b/include/variables.h
index b369a7b13b..8bb1bca541 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -163,7 +163,7 @@ extern s32 gPauseMenuCommonIconIDs[8];
 extern s32 gPauseMenuTabIconIDs[6];
 extern s32 gPauseMenuStrings[348];
 extern s32 gPauseMenuIconScripts[8];
-extern MenuTab* gPauseMenuTabs[7];
+extern MenuTab gPauseMenuTabs[7];
 extern s32 gPauseMenuCursorPosX;
 extern s32 gPauseMenuCursorPosY;
 extern s32 gPauseMenuCursorOpacity;
diff --git a/src/1060_len_310.c b/src/1060_len_310.c
index 80c67c17df..3e882fb404 100644
--- a/src/1060_len_310.c
+++ b/src/1060_len_310.c
@@ -4,11 +4,9 @@
 u32 func_80025D74(void* arg0, const unsigned char* str, s32 count);
 
 void func_80025C60(void) {
-    OSPiHandle** handle = &carthandle;
-
-    osEPiWriteIo(*handle, 0xB3FF0014, 0);
-    osEPiWriteIo(*handle, 0xB3FF0004, 0);
-    osEPiWriteIo(*handle, 0xB3FF0000, ASCII_TO_U32('I', 'S', '6', '4'));
+    osEPiWriteIo(carthandle, 0xB3FF0014, 0);
+    osEPiWriteIo(carthandle, 0xB3FF0004, 0);
+    osEPiWriteIo(carthandle, 0xB3FF0000, ASCII_TO_U32('I', 'S', '6', '4'));
 }
 
 void func_80025CC0(const char* fmt, ...) {
diff --git a/src/1f580_len_1940.c b/src/1f580_len_1940.c
index 62da54c1aa..b515bfa0d3 100644
--- a/src/1f580_len_1940.c
+++ b/src/1f580_len_1940.c
@@ -517,7 +517,7 @@ ApiStatus func_800458CC(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_80045900(ScriptInstance* script) {
+ApiStatus func_80045900(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
     s32 var0 = get_variable(script, *script->ptrReadPos);
diff --git a/src/4ac90_len_3910.c b/src/4ac90_len_3910.c
index a9e3ffffd3..f4828acf74 100644
--- a/src/4ac90_len_3910.c
+++ b/src/4ac90_len_3910.c
@@ -128,7 +128,7 @@ INCLUDE_ASM(s32, "4ac90_len_3910", func_80070EB0);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80070F10);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_80070F70);
+INCLUDE_ASM(void, "4ac90_len_3910", func_80070F70, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32* arg8);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80070FD0);
 
@@ -162,19 +162,19 @@ INCLUDE_ASM(s32, "4ac90_len_3910", func_80071510);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80071570);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_800715D0);
+INCLUDE_ASM(Effect*, "4ac90_len_3910", func_800715D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80071630);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_80071690);
+INCLUDE_ASM(void, "4ac90_len_3910", func_80071690, s32 arg0, f32 arg1, f32 arg2, f32 arg3);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_800716F0);
+INCLUDE_ASM(Effect*, "4ac90_len_3910", func_800716F0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 
 INCLUDE_ASM(Effect*, "4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_800717B0);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_80071810);
+INCLUDE_ASM(Effect*, "4ac90_len_3910", func_80071810, s32 arg0, f32 arg1, f32 arg2, f32 arg3);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80071870);
 
@@ -220,7 +220,7 @@ INCLUDE_ASM(void, "4ac90_len_3910", func_80071FF0, s32 arg0, f32 arg1, f32 arg2,
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80072050);
 
-INCLUDE_ASM(void, "4ac90_len_3910", func_800720B0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5);
+INCLUDE_ASM(Effect*, "4ac90_len_3910", func_800720B0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80072110);
 
@@ -254,7 +254,7 @@ INCLUDE_ASM(s32, "4ac90_len_3910", func_800725F0);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80072650);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_800726B0);
+INCLUDE_ASM(void*, "4ac90_len_3910", func_800726B0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80072710);
 
@@ -264,13 +264,13 @@ INCLUDE_ASM(s32, "4ac90_len_3910", func_800727D0);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80072830);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_80072890);
+INCLUDE_ASM(Effect*, "4ac90_len_3910", func_80072890, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_800728F0);
 
 INCLUDE_ASM(void, "4ac90_len_3910", func_80072950, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 time);
 
-INCLUDE_ASM(s32, "4ac90_len_3910", func_800729B0);
+INCLUDE_ASM(void*, "4ac90_len_3910", func_800729B0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 
 INCLUDE_ASM(s32, "4ac90_len_3910", func_80072A10);
 
diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c
index f659b3626b..4a617b5995 100644
--- a/src/8a860_len_3f30.c
+++ b/src/8a860_len_3f30.c
@@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4CF0);
 
 INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4D28);
 
-INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4E40);
+INCLUDE_ASM(void, "8a860_len_3f30", func_800F4E40, void* arg0);
 
 INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4FC4);
 
diff --git a/src/DF950.c b/src/DF950.c
index 50acd60786..beb93fc7e6 100644
--- a/src/DF950.c
+++ b/src/DF950.c
@@ -102,7 +102,7 @@ INCLUDE_ASM(s32, "DF950", sfx_adjust_env_sound_pos, s32 soundID, s32 arg1, f32 a
 
 INCLUDE_ASM(s32, "DF950", func_80149A6C);
 
-INCLUDE_ASM(s32, "DF950", sfx_play_sound_with_params);
+INCLUDE_ASM(void, "DF950", sfx_play_sound_with_params, s32 arg0, u8 arg1, u8 arg2, s16 arg3);
 
 INCLUDE_ASM(s32, "DF950", sfx_adjust_env_sound_params);
 
@@ -129,7 +129,7 @@ void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) {
 INCLUDE_ASM(s32, "DF950", sfx_play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY,
             f32 posZ);
 
-INCLUDE_ASM(s32, "DF950", sfx_get_spatialized_sound_params);
+INCLUDE_ASM(void, "DF950", sfx_get_spatialized_sound_params, f32 arg0, f32 arg1, f32 arg2, s16* arg3, s16* arg4, s32 arg5);
 
 INCLUDE_ASM(s32, "DF950", sfx_compute_spatialized_sound_params_0);
 
diff --git a/src/battle/area_kmr_part_1/goomba.c b/src/battle/area_kmr_part_1/goomba.c
index 48a8d0555d..7b30949980 100644
--- a/src/battle/area_kmr_part_1/goomba.c
+++ b/src/battle/area_kmr_part_1/goomba.c
@@ -5,16 +5,16 @@
 #include "goomba.h"
 
 ApiStatus func_8021818C_430B2C(ScriptInstance* script, s32 isInitialCall);
-s32 goomba_anims_running[];
-s32 goomba_anims[];
-s32 goomba_defense_table[];
-s32 goomba_status_table[];
-s32 goomba_defense_table[];
-ActorPartDesc goomba_parts[];
-Script goomba_init;
-Script goomba_turn;
-Script goomba_idle;
-Script goomba_dispatch;
+extern s32 goomba_anims_running[];
+extern s32 goomba_anims[];
+extern s32 goomba_defense_table[];
+extern s32 goomba_status_table[];
+extern s32 goomba_defense_table[];
+extern ActorPartDesc goomba_parts[];
+extern Script goomba_init;
+extern Script goomba_turn;
+extern Script goomba_idle;
+extern Script goomba_dispatch;
 
 s32 goomba_defense_table[] = {
     ELEMENT_NORMAL, 0,
diff --git a/src/battle/item/electro_pop/lib.c b/src/battle/item/electro_pop/lib.c
index 686407f34b..34df380c3e 100644
--- a/src/battle/item/electro_pop/lib.c
+++ b/src/battle/item/electro_pop/lib.c
@@ -105,8 +105,8 @@ ApiStatus N(func_802A1450_7309F0)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(AddFP)(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
-
     s32 amt = get_variable(script, *script->ptrReadPos);
+    
     // @bug Should be playerData->curFP
     s32 newFP = playerData->curHP + amt;
 
diff --git a/src/battle/item/insecticide_herb/lib.c b/src/battle/item/insecticide_herb/lib.c
index d68a0c409d..e9df393611 100644
--- a/src/battle/item/insecticide_herb/lib.c
+++ b/src/battle/item/insecticide_herb/lib.c
@@ -75,33 +75,9 @@ ApiStatus N(func_802A1280_72A9D0)(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-// This is a duplicate, search for others
-// TODO figure out what this actually is
-// func_80072230 invokes gEffectTable[111]'s entryPoint function
-// that function is currently typed to return void
-// Assume it returns an Effect* and unk_0C is this EffectInstanceData
-// s32 unk_0C;  //? Maybe EffectInstanceData too ?
-struct N(temp2) {
-    char unk_00[0x8];
-    f32 unk_08;
-    f32 unk_0C;
-    f32 unk_10;
-    char unk_14[0x4];
-    s32 unk_18;
-    s32 unk_1C;
-    s32 unk_20;
-    char unk_24[0x4];
-    s32 unk_28;
-    s32 unk_2C;
-    s32 unk_30;
-    char unk_34[0x3C];
-    s32 unk_70;
-    s32 unk_74;
-} N(temp2);
-
 struct N(temp) {
     char unk_00[0xC];
-    struct N(temp2)* unk_0C;
+    EffectInstanceDataThing* unk_0C;
 } N(temp);
 
 ApiStatus N(func_802A12E0_72AA30)(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/battle/item/mystery/mystery.h b/src/battle/item/mystery/mystery.h
index 320e90bef7..57cc4e275a 100644
--- a/src/battle/item/mystery/mystery.h
+++ b/src/battle/item/mystery/mystery.h
@@ -7,6 +7,9 @@
 #undef NAMESPACE
 #define NAMESPACE battle_item_mystery
 
+ApiStatus N(func_802A13E4_72C994)(ScriptInstance *script, s32 isInitialCall);
+ApiStatus N(func_802A188C_72CE3C)(ScriptInstance *script, s32 isInitialCall);
+
 struct N(tempStc) {
     s32 iconId;
     s32 unk_04;
@@ -14,10 +17,6 @@ struct N(tempStc) {
 
 extern s32 N(D_802A227C_72D82C)[8];
 extern s32 N(D_802A229C_72D84C)[8];
-
 extern Script N(UseItemWithEffect);
 
-ApiStatus N(func_802A13E4_72C994)(ScriptInstance *script, s32 isInitialCall);
-ApiStatus N(func_802A188C_72CE3C)(ScriptInstance *script, s32 isInitialCall);
-
 #endif
diff --git a/src/cd180_len_38f0.c b/src/cd180_len_38f0.c
index f8fdd94cb3..8123284f0d 100644
--- a/src/cd180_len_38f0.c
+++ b/src/cd180_len_38f0.c
@@ -2,7 +2,7 @@
 
 INCLUDE_ASM(void, "cd180_len_38f0", _render_transition_stencil, s32 arg0, f32 arg1, s32 arg2);
 
-INCLUDE_ASM(void, "cd180_len_38f0", set_transition_stencil_zoom_0, s32 arg0, f32 arg1);
+INCLUDE_ASM(void, "cd180_len_38f0", set_transition_stencil_zoom_0, u8 arg0, f32 arg1);
 
 INCLUDE_ASM(void, "cd180_len_38f0", set_transition_stencil_zoom_1, s32 arg0, f32 arg1);
 
diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c
index 782c0ff6db..d8e2406f3f 100644
--- a/src/evt/fa4c0_len_3bf0.c
+++ b/src/evt/fa4c0_len_3bf0.c
@@ -176,7 +176,7 @@ ApiStatus PlaySoundAtF(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(ApiStatus, "evt/fa4c0_len_3bf0", func_802D6420, ScriptInstance* script, s32 isInitialCall);
 
-INCLUDE_ASM(s32, "evt/fa4c0_len_3bf0", func_802D663C);
+INCLUDE_ASM(ApiStatus, "evt/fa4c0_len_3bf0", func_802D663C, ScriptInstance* script, s32 isInitialCall);
 
 // TODO: probably a split here (sound_api, item_api)
 
diff --git a/src/evt/map_api.c b/src/evt/map_api.c
index 745f58f6d8..e381ecdf11 100644
--- a/src/evt/map_api.c
+++ b/src/evt/map_api.c
@@ -161,7 +161,7 @@ ApiStatus func_802C90FC(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 #else
-INCLUDE_ASM(s32, "evt/map_api", func_802C90FC);
+INCLUDE_ASM(ApiStatus, "evt/map_api", func_802C90FC, ScriptInstance* script, s32 isInitialCall);
 #endif
 
 ApiStatus func_802C91A4(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/evt/player_api.c b/src/evt/player_api.c
index 6bbae60188..04bcacf69a 100644
--- a/src/evt/player_api.c
+++ b/src/evt/player_api.c
@@ -362,7 +362,7 @@ ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "evt/player_api", func_802D2884);
+INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D2884, ScriptInstance* script, s32 isInitialCall);
 
 ApiStatus DisablePulseStone(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
diff --git a/src/world/area_arn/arn_02/arn_02.h b/src/world/area_arn/arn_02/arn_02.h
index 38d2a2de08..dde5a4f482 100644
--- a/src/world/area_arn/arn_02/arn_02.h
+++ b/src/world/area_arn/arn_02/arn_02.h
@@ -6,7 +6,6 @@
 
 s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3);
 ApiStatus N(func_80240C90_BDDE40)(ScriptInstance *script, s32 isInitialCall);
-ApiStatus N(func_80240C90_BDDE40)(ScriptInstance *script, s32 isInitialCall);
 
 extern Script N(main);
 extern Script N(80241040);
diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c
index f38d3c301a..44239877d6 100644
--- a/src/world/area_arn/arn_02/events.c
+++ b/src/world/area_arn/arn_02/events.c
@@ -201,10 +201,9 @@ NpcGroupList N(npcGroupList_80241A9C) = {
 };
 
 s32 N(func_80240000_BDD1B0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    PlayerStatus** playerStatus;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     f32 phi_f20;
     s32 ret = FALSE;
 
@@ -217,7 +216,6 @@ s32 N(func_80240000_BDD1B0)(ScriptInstance* script, NpcAISettings* aiSettings, E
         phi_f20 = 270.0f;
     }
 
-    playerStatus = &gPlayerStatusPtr;
     if (fabsf(get_clamped_angle_diff(phi_f20,
             atan2(npc->pos.x, npc->pos.z,
                   gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z))) > 75.0) {
@@ -259,29 +257,7 @@ void N(func_802401D4_BDD384)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc22.inc.c"
 
-void N(func_802404D0_BDD680)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
-    } else {
-        npc->duration--;
-        if (npc->duration <= 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s > 0) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-                npc->duration = 15;
-                script->functionTemp[0].s = 0x28;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc8.inc.c"
 
 #include "world/common/UnkNpcAIFunc16.inc.c"
 
@@ -309,41 +285,7 @@ void N(func_80240694_BDD844)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 }
 
-void N(func_80240834_BDD9E4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ;
-    s32 phi_s1;
-
-    func_8003D660(npc, 1);
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    phi_s1 = 0;
-    if (is_point_within_region(enemy->territory->wander.detectShape,
-            enemy->territory->wander.detect.x, enemy->territory->wander.detect.z,
-            npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX,
-            enemy->territory->wander.detectSizeZ)) {
-        phi_s1 = 1;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-
-    if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ,
-            1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) {
-        phi_s1 = 1;
-    }
-
-    npc->duration--;
-    if (npc->duration <= 0) {
-        phi_s1 = 1;
-    }
-    if (phi_s1) {
-        script->functionTemp[0].s = 4;
-        enemy->unk_07 = 0;
-    }
-}
+#include "world/common/UnkFunc10.inc.c"
 
 void N(func_80240984_BDDB34)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -361,21 +303,7 @@ void N(func_80240984_BDDB34)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 }
 
-void N(func_80240A30_BDDBE0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
-    } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) {
-        npc->duration = 10;
-        script->functionTemp[0].s = 50;
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    }
-}
+#include "world/common/UnkFunc9.inc.c"
 
 #include "world/common/UnkNpcAIFunc19.inc.c"
 
@@ -399,7 +327,7 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -445,7 +373,7 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance *script, s32 isInitialCall) {
         case 4:
             N(UnkNpcAIFunc22)(script, npcAISettings, territoryPtr);
         case 5:
-            N(func_802404D0_BDD680)(script, npcAISettings, territoryPtr);
+            N(UnkFunc8)(script, npcAISettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 12:
             func_80049F7C(script, npcAISettings, territoryPtr);
@@ -469,7 +397,7 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance *script, s32 isInitialCall) {
             N(func_80240694_BDD844)(script, npcAISettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 22:
-            N(func_80240834_BDD9E4)(script, npcAISettings, territoryPtr);
+            N(UnkFunc10)(script, npcAISettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 40:
             N(func_80240984_BDDB34)(script, npcAISettings, territoryPtr);
@@ -477,7 +405,7 @@ s32 N(func_80240C90_BDDE40)(ScriptInstance *script, s32 isInitialCall) {
                 return ApiStatus_BLOCK;
             }
         case 41:
-            N(func_80240A30_BDDBE0)(script, npcAISettings, territoryPtr);
+            N(UnkFunc9)(script, npcAISettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 50:
             N(UnkNpcAIFunc19)(script, npcAISettings, territoryPtr);
diff --git a/src/world/area_arn/arn_03/arn_03.h b/src/world/area_arn/arn_03/arn_03.h
index 2bda2d7ce4..cf45489f43 100644
--- a/src/world/area_arn/arn_03/arn_03.h
+++ b/src/world/area_arn/arn_03/arn_03.h
@@ -10,11 +10,6 @@ ApiStatus N(func_80241648_BE03D8)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80241680_BE0410)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802415F4_BE0384)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_8024113C_BDFECC)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_8024113C_BDFECC)(ScriptInstance *script, s32 isInitialCall);
-ApiStatus N(AddPlayerHandsOffset)(ScriptInstance *script, s32 isInitialCall);
-ApiStatus N(func_80241648_BE03D8)(ScriptInstance *script, s32 isInitialCall);
-ApiStatus N(func_80241680_BE0410)(ScriptInstance *script, s32 isInitialCall);
-ApiStatus N(func_802415F4_BE0384)(ScriptInstance *script, s32 isInitialCall);
 
 extern Script N(main);
 extern Script N(80241780);
diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c
index 67aeeb114b..5008970e88 100644
--- a/src/world/area_arn/arn_03/events.c
+++ b/src/world/area_arn/arn_03/events.c
@@ -2,7 +2,7 @@
 #include "sprite/npc/boo.h"
 #include "sprite/npc/world_bow.h"
 
-s32 D_80244A20[0x70];
+static s32 N(D_80244A20)[112];
 
 Script N(exitWalk_80241830) = EXIT_WALK_SCRIPT(60,  0, "arn_07",  1);
 
@@ -91,7 +91,7 @@ NpcSettings N(npcSettings_80241C3C) = {
     .level = 99,
 };
 
-s32* N(D_80241C68_BE09F8) = NULL;
+s32** N(D_80241C68_BE09F8) = NULL;
 
 Script N(80241C6C) = SCRIPT({
     ShowGotItem(SI_VAR(0), 1, 0);
@@ -137,7 +137,7 @@ Script N(80241CD4) = SCRIPT({
 
 Script N(80241E18) = {
     SI_CMD(ScriptOpcode_CALL, (Bytecode) N(func_80241680_BE0410), SI_VAR(0)),
-    SI_CMD(ScriptOpcode_BIND_PADLOCK, (Bytecode) N(80241CD4), 0x10, 0, (Bytecode) D_80244A20, 0, 1),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, (Bytecode) N(80241CD4), 0x10, 0, (Bytecode) N(D_80244A20), 0, 1),
     SI_CMD(ScriptOpcode_CALL, (Bytecode) N(func_802415F4_BE0384), SI_VAR(0)),
     SI_CMD(ScriptOpcode_RETURN),
     SI_CMD(ScriptOpcode_END)
@@ -985,46 +985,11 @@ void N(func_8024067C_BDF40C)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-void N(func_8024094C_BDF6DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_80240AD4_BDF864)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1041,7 +1006,7 @@ ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -1061,7 +1026,7 @@ ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -1096,13 +1061,13 @@ ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_8024094C_BDF6DC)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
             break;
         case 15:
-            N(func_80240AD4_BDF864)(script, npcAISettings, territoryPtr);
+            N(UnkFunc16)(script, npcAISettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
@@ -1177,7 +1142,7 @@ ApiStatus N(func_8024113C_BDFECC)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 100.0f;
+    territory.unk_18 = 100.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -1208,23 +1173,19 @@ ApiStatus N(func_8024113C_BDFECC)(ScriptInstance* script, s32 isInitialCall) {
 
 /// Pushes/pops script local variables to D_80241C68_BE09F8
 ApiStatus N(func_802412B0_BE0040)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = (s32*) i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241C68_BE09F8) == NULL) {
+        N(D_80241C68_BE09F8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241C68_BE09F8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241C68_BE09F8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241C68_BE09F8));
+        N(D_80241C68_BE09F8) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -1265,18 +1226,18 @@ ApiStatus N(func_80241648_BE03D8)(ScriptInstance* script, s32 isInitialCall) {
 
 ApiStatus N(func_80241680_BE0410)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* var1 = get_variable(script, *args++);
+    s32* ptr = get_variable(script, *args);
     s32 i;
 
-    if (var1 != NULL) {
-        for (i = 0; var1[i] != 0; i++) {
-            D_80244A20[i] = var1[i];
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
         }
-        D_80244A20[i] = 0;
+        N(D_80244A20)[i] = 0;
     } else {
         for (i = 0; i < 0x70; i++) {
-            D_80244A20[i] = i + 16;
-            D_80244A20[0x70] = 0;
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
         }
     }
     return ApiStatus_DONE2;
diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c
index e59e2524db..b3e1786a4a 100644
--- a/src/world/area_arn/arn_04/events.c
+++ b/src/world/area_arn/arn_04/events.c
@@ -412,46 +412,11 @@ void N(func_8024067C_BE3E2C)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-void N(func_8024094C_BE40FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_80240AD4_BE4284)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -468,7 +433,7 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -488,7 +453,7 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -523,13 +488,13 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr);
         case 13:
-            N(func_8024094C_BE40FC)(script, aiSettings, territoryPtr);
+            N(UnkFunc15)(script, aiSettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, aiSettings, territoryPtr);
             break;
         case 15:
-            N(func_80240AD4_BE4284)(script, aiSettings, territoryPtr);
+            N(UnkFunc16)(script, aiSettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
@@ -707,70 +672,7 @@ INCLUDE_ASM(void, "world/area_arn/arn_04/events", arn_04_func_80241040_BE47F0, S
 
 #include "world/common/UnkNpcAIFunc1_copy.inc.c"
 
-void N(func_80241728_BE4ED8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f24 = (f32)enemy->varTable[3] / 100.0;
-    f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0);
-    s32 var;
-
-    if (npc->duration > 0) {
-        npc->duration--;
-    }
-
-    if (enemy->varTable[1] > 0) {
-        f32 temp_f22 = (f32)enemy->varTable[1] / 100.0;
-        f32 sin_degrees = sin_deg(enemy->varTable[2]);
-        s32 phi_v0;
-
-        if (npc->flags & 8) {
-            phi_v0 = FALSE;
-        } else {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        }
-
-        if (phi_v0) {
-            npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22);
-        } else {
-            npc->pos.y = temp_f26 + (sin_degrees * temp_f22);
-        }
-
-        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
-    }
-
-    if (enemy->varTable[9] <= 0) {
-        if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-            fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-            npc->moveToPos.y = npc->pos.y;
-            func_800494C0(npc, 0x2F4, 0x200000);
-            if (enemy->npcSettings->unk_2A & 1) {
-                script->functionTemp[0].s = 10;
-            } else {
-                script->functionTemp[0].s = 12;
-            }
-            return;
-        }
-    } else {
-        enemy->varTable[9]--;
-    }
-
-    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
-            if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-            }
-            npc->duration = (rand_int(1000) % 11) + 5;
-        } else {
-            script->functionTemp[0].s = 0;
-        }
-    }
-}
+#include "world/common/UnkFunc4.inc.c"
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
@@ -788,121 +690,9 @@ void N(func_80241AE4_BE5294)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc3.inc.c"
 
-void N(func_80241CE8_BE5498)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f0_2;
-    f32 temp_f20;
-    f32 temp_f22;
-    f32 temp_f2;
-    s32 phi_v0;
-    f32 phi_f20;
-    f32 a = enemy->varTable[3];
-    f32 b = enemy->varTable[7];
+#include "world/common/UnkFunc6.inc.c"
 
-    npc->jumpVelocity += npc->jumpScale;
-    temp_f20 = a / 100.0;
-    temp_f22 = b / 100.0;
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    if (npc->jumpVelocity >= 0.0) {
-        npc->pos.y += npc->jumpVelocity;
-        npc->currentAnim = enemy->animList[9];
-        enemy->unk_07 = 0;
-        if (!(npc->flags & 8)) {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        } else {
-            phi_v0 = FALSE;
-        }
-        if (phi_v0) {
-            temp_f2 = posY + temp_f20;
-            if (temp_f2 <= npc->pos.y) {
-                npc->pos.y = temp_f2;
-                script->functionTemp[0].s = 0;
-            }
-        } else if (npc->pos.y >= npc->moveToPos.y) {
-            script->functionTemp[0].s = 0;
-        }
-    } else if (npc->jumpVelocity < 0.0) {
-        npc->duration++;
-        if (npc->duration >= aiSettings->unk_20) {
-            npc->duration = 0;
-            phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-            temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20);
-            if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) {
-                phi_f20 = npc->yaw;
-                if (temp_f0_2 < 0.0f) {
-                    phi_f20 += -aiSettings->unk_1C.s;
-                } else {
-                    phi_f20 += aiSettings->unk_1C.s;
-                }
-            }
-            npc->yaw = clamp_angle(phi_f20);
-        }
-
-        if (npc->flags & 8) {
-            if (npc->pos.y + npc->jumpVelocity < temp_f22) {
-                npc->pos.y = temp_f22;
-                npc->jumpVelocity = 0.0f;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0;
-        if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) {
-                npc->jumpVelocity = 0.0f;
-                npc->pos.y = posY;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) {
-            npc->pos.y = npc->pos.y + npc->jumpVelocity;
-            return;
-        }
-        npc->jumpVelocity = 0.0f;
-    }
-}
-
-void N(func_80242078_BE5828)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) {
-    f32 posX, posY, posZ, posW;
-    s32 temp_a1;
-    s32 temp_v1;
-    s32 phi_v0;
-
-    script->functionTemp[0].s = 0;
-    npc->duration = 0;
-    temp_v1 = npc->flags & ~0x200;
-    npc->flags = (npc->flags & ~0x200) | 0x800;
-    if (enemy->territory->wander.isFlying) {
-        npc->flags = temp_v1 | 0x808;
-    } else {
-        npc->flags = npc->flags & ~8;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-    posW = 1000.0f;
-    func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-    enemy->varTable[2] = 0;
-    enemy->varTable[9] = 0;
-    enemy->varTable[3] = ((posW * 100.0) + 0.5);
-    enemy->varTable[7] = ((posY * 100.0) + 0.5);
-    script->functionTemp[1].s = aiSettings->unk_14;
-    enemy->unk_B0 |= 0x10;
-}
+#include "world/common/UnkFunc5.inc.c"
 
 ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -918,11 +708,11 @@ ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80242078_BE5828)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -943,7 +733,7 @@ ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80241728_BE4ED8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -957,7 +747,7 @@ ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 14:
-            N(func_80241CE8_BE5498)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
     }
 
@@ -968,7 +758,7 @@ s32 N(func_80242388_BE5B38)(ScriptInstance* script, NpcAISettings *aiSettings, E
     PlayerStatus** playerStatus;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     f32 phi_f20;
     s32 ret = FALSE;
 
@@ -1023,29 +813,7 @@ void N(func_8024255C_BE5D0C)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc22.inc.c"
 
-void N(func_80242858_BE6008)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
-    } else {
-        npc->duration--;
-        if (npc->duration <= 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s > 0) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-                npc->duration = 15;
-                script->functionTemp[0].s = 0x28;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc8.inc.c"
 
 #include "world/common/UnkNpcAIFunc16.inc.c"
 
@@ -1060,7 +828,6 @@ void N(func_80242A1C_BE61CC)(ScriptInstance* script, NpcAISettings* aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-
         enemy->unk_10.x = npc->pos.x;
         enemy->unk_10.y = npc->pos.y;
         enemy->unk_10.z = npc->pos.z;
@@ -1074,41 +841,7 @@ void N(func_80242A1C_BE61CC)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 }
 
-void N(func_80242BBC_BE636C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ;
-    s32 phi_s1;
-
-    func_8003D660(npc, 1);
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    phi_s1 = 0;
-    if (is_point_within_region(enemy->territory->wander.detectShape,
-            enemy->territory->wander.detect.x, enemy->territory->wander.detect.z,
-            npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX,
-            enemy->territory->wander.detectSizeZ)) {
-        phi_s1 = 1;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-
-    if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ,
-            1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) {
-        phi_s1 = 1;
-    }
-
-    npc->duration--;
-    if (npc->duration <= 0) {
-        phi_s1 = 1;
-    }
-    if (phi_s1) {
-        script->functionTemp[0].s = 4;
-        enemy->unk_07 = 0;
-    }
-}
+#include "world/common/UnkFunc10.inc.c"
 
 void N(func_80242D0C_BE64BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -1126,21 +859,7 @@ void N(func_80242D0C_BE64BC)(ScriptInstance* script, NpcAISettings* aiSettings,
     }
 }
 
-void N(func_80242DB8_BE6568)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-
-    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        script->functionTemp[0].s = 12;
-    } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) {
-        npc->duration = 10;
-        script->functionTemp[0].s = 50;
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-    }
-}
+#include "world/common/UnkFunc9.inc.c"
 
 #include "world/common/UnkNpcAIFunc19.inc.c"
 
@@ -1165,7 +884,7 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -1214,7 +933,7 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
         case 4:
             N(UnkNpcAIFunc22)(script, aiSettings, territoryPtr);
         case 5:
-            N(func_80242858_BE6008)(script, aiSettings, territoryPtr);
+            N(UnkFunc8)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 12:
             func_80049F7C(script, aiSettings, territoryPtr);
@@ -1238,7 +957,7 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
             N(func_80242A1C_BE61CC)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 22:
-            N(func_80242BBC_BE636C)(script, aiSettings, territoryPtr);
+            N(UnkFunc10)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 40:
             N(func_80242D0C_BE64BC)(script, aiSettings, territoryPtr);
@@ -1246,7 +965,7 @@ ApiStatus N(func_80243018_BE67C8)(ScriptInstance* script, s32 isInitialCall) {
                 return ApiStatus_BLOCK;
             }
         case 41:
-            N(func_80242DB8_BE6568)(script, aiSettings, territoryPtr);
+            N(UnkFunc9)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 50:
             N(UnkNpcAIFunc19)(script, aiSettings, territoryPtr);
diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c
index 016171b5b4..287d7d4ef1 100644
--- a/src/world/area_arn/arn_05/events.c
+++ b/src/world/area_arn/arn_05/events.c
@@ -1026,85 +1026,11 @@ void N(func_80240000_BE7BE0)(ScriptInstance* script, NpcAISettings* aiSettings,
     script->functionTemp[0].s = 1;
 }
 
-void N(func_80240158_BE7D38)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 x, z;
-    s32 var;
-
-    if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
-            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
-                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-                func_800494C0(npc, 0x2F4, 0x200000);
-                if (enemy->npcSettings->unk_2A & 1) {
-                    script->functionTemp[0].s = 10;
-                } else {
-                    script->functionTemp[0].s = 12;
-                }
-                return;
-            }
-        }
-        script->functionTemp[1].s--;
-    }
-
-    if (npc->turnAroundYawAdjustment == 0) {
-        if (npc->moveSpeed < 4.0) {
-            func_8003D660(npc, 0);
-        } else {
-            func_8003D660(npc, 1);
-        }
-
-        x = script->functionTemp[2].s[enemy->territory->patrol.points].x;
-        z = script->functionTemp[2].s[enemy->territory->patrol.points].z;
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) ||
-                (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) {
-                script->functionTemp[0].s = 4;
-            }
-            if (rand_int(10000) % 100 < aiSettings->moveTime) {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc13.inc.c"
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_802404C0_BE80A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        func_800494C0(npc, 0x2F4, 0x200000);
-        if (!(enemy->npcSettings->unk_2A & 1)) {
-            script->functionTemp[0].s = 12;
-        } else {
-            script->functionTemp[0].s = 10;
-        }
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->duration--;
-        if (npc->duration == 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s != 0) {
-                if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                    npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                }
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc14.inc.c"
 
 void N(func_8024067C_BE825C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -1129,46 +1055,11 @@ void N(func_8024067C_BE825C)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-void N(func_8024094C_BE852C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_80240AD4_BE86B4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1185,7 +1076,7 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -1205,7 +1096,7 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -1222,12 +1113,12 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
         case 0:
             N(func_80240000_BE7BE0)(script, aiSettings, territoryPtr);
         case 1:
-            N(func_80240158_BE7D38)(script, aiSettings, territoryPtr);
+            N(UnkFunc13)(script, aiSettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802404C0_BE80A0)(script, aiSettings, territoryPtr);
+            N(UnkFunc14)(script, aiSettings, territoryPtr);
             break;
         case 4:
             N(func_8024067C_BE825C)(script, aiSettings, territoryPtr);
@@ -1240,13 +1131,13 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr);
         case 13:
-            N(func_8024094C_BE852C)(script, aiSettings, territoryPtr);
+            N(UnkFunc15)(script, aiSettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, aiSettings, territoryPtr);
             break;
         case 15:
-            N(func_80240AD4_BE86B4)(script, aiSettings, territoryPtr);
+            N(UnkFunc16)(script, aiSettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
@@ -1322,7 +1213,7 @@ ApiStatus N(func_8024113C_BE8D1C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 100.0f;
+    territory.unk_18 = 100.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c
index 53c04a8f8b..4760cc3b64 100644
--- a/src/world/area_arn/arn_07/BECDF0.c
+++ b/src/world/area_arn/arn_07/BECDF0.c
@@ -2,38 +2,9 @@
 #include "sprite/npc/world_tubba.h"
 #include "sprite/npc/tubbas_heart.h"
 
-void* func_800729B0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
-void* func_800726B0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
-
-// This is a duplicate, search for others
-// TODO figure out what this actually is
-// func_800729B0 invokes gEffectTable[131]'s entryPoint function
-// that function is currently typed to return void
-// Assume it returns an Effect* and unk_0C is this EffectInstanceData:
-// s32 unk_0C;  //? Maybe EffectInstanceData too ?
-struct N(temp2) {
-    char unk_00[0x4];
-    f32 unk_04;
-    f32 unk_08;
-    f32 unk_0C;
-    f32 unk_10;
-    char unk_14[0x4];
-    s32 unk_18;
-    s32 unk_1C;
-    s32 unk_20;
-    f32 unk_24;
-    s32 unk_28;
-    s32 unk_2C;
-    s32 unk_30;
-    s8 unk_34;
-    char unk_38[0x38];
-    s32 unk_70;
-    s32 unk_74;
-} N(temp2);
-
 struct N(temp) {
     char unk_00[0xC];
-    struct N(temp2)* unk_0C;
+    EffectInstanceDataThing* unk_0C;
 } N(temp);
 
 typedef struct {
@@ -132,7 +103,7 @@ ApiStatus N(func_802401AC_BECF9C)(ScriptInstance* script, s32 isInitialCall) {
             ptr->unk_46++;
             if (ptr->unk_46 >= 60) {
                 ptr->unk_54 = func_800726B0(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0);
-                ptr->unk_54->unk_0C->unk_34 = ptr->unk_38;
+                *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38;
                 ptr->unk_54->unk_0C->unk_20 = 0;
                 ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20);
                 ptr->unk_44 = 3;
@@ -188,7 +159,7 @@ ApiStatus N(func_802401AC_BECF9C)(ScriptInstance* script, s32 isInitialCall) {
             ptr->unk_2C = clamp_angle(ptr->unk_2C + ptr->unk_30);
 
         case 2:
-            ptr->unk_54->unk_0C->unk_24 = ptr->unk_2C;
+            ptr->unk_54->unk_0C->unk_24.f = ptr->unk_2C;
             ptr->unk_54->unk_0C->unk_04 = ptr->unk_18;
             ptr->unk_54->unk_0C->unk_08 = ptr->unk_04;
             ptr->unk_54->unk_0C->unk_0C = ptr->unk_20;
@@ -217,7 +188,7 @@ ApiStatus N(func_802405FC_BED3EC)(ScriptInstance* script, s32 isInitialCall) {
         ptr->unk_20 = get_float_variable(script, *args++);
         ptr->unk_28 = get_float_variable(script, *args++);
         ptr->unk_54 = func_800726B0(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0);
-        ptr->unk_54->unk_0C->unk_34 = ptr->unk_38;
+        *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38;
         ptr->unk_54->unk_0C->unk_20 = 0;
         ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20);
         ptr->unk_4C = 0x10E;
diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c
index 52ba0d0aeb..07d432ec12 100644
--- a/src/world/area_arn/arn_07/events.c
+++ b/src/world/area_arn/arn_07/events.c
@@ -1330,70 +1330,7 @@ INCLUDE_ASM(void, "world/area_arn/arn_07/events", arn_07_func_80240B00_BED8F0, S
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_802411E8_BEDFD8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f24 = (f32)enemy->varTable[3] / 100.0;
-    f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0);
-    s32 var;
-
-    if (npc->duration > 0) {
-        npc->duration--;
-    }
-
-    if (enemy->varTable[1] > 0) {
-        f32 temp_f22 = (f32)enemy->varTable[1] / 100.0;
-        f32 sin_degrees = sin_deg(enemy->varTable[2]);
-        s32 phi_v0;
-
-        if (npc->flags & 8) {
-            phi_v0 = FALSE;
-        } else {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        }
-
-        if (phi_v0) {
-            npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22);
-        } else {
-            npc->pos.y = temp_f26 + (sin_degrees * temp_f22);
-        }
-
-        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
-    }
-
-    if (enemy->varTable[9] <= 0) {
-        if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-            fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-            npc->moveToPos.y = npc->pos.y;
-            func_800494C0(npc, 0x2F4, 0x200000);
-            if (enemy->npcSettings->unk_2A & 1) {
-                script->functionTemp[0].s = 10;
-            } else {
-                script->functionTemp[0].s = 12;
-            }
-            return;
-        }
-    } else {
-        enemy->varTable[9]--;
-    }
-
-    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
-            if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-            }
-            npc->duration = (rand_int(1000) % 11) + 5;
-        } else {
-            script->functionTemp[0].s = 0;
-        }
-    }
-}
+#include "world/common/UnkFunc4.inc.c"
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
@@ -1411,121 +1348,9 @@ void N(func_802415A4_BEE394)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc3.inc.c"
 
-void N(func_802417A8_BEE598)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f0_2;
-    f32 temp_f20;
-    f32 temp_f22;
-    f32 temp_f2;
-    s32 phi_v0;
-    f32 phi_f20;
-    f32 a = enemy->varTable[3];
-    f32 b = enemy->varTable[7];
+#include "world/common/UnkFunc6.inc.c"
 
-    npc->jumpVelocity += npc->jumpScale;
-    temp_f20 = a / 100.0;
-    temp_f22 = b / 100.0;
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    if (npc->jumpVelocity >= 0.0) {
-        npc->pos.y += npc->jumpVelocity;
-        npc->currentAnim = enemy->animList[9];
-        enemy->unk_07 = 0;
-        if (!(npc->flags & 8)) {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        } else {
-            phi_v0 = FALSE;
-        }
-        if (phi_v0) {
-            temp_f2 = posY + temp_f20;
-            if (temp_f2 <= npc->pos.y) {
-                npc->pos.y = temp_f2;
-                script->functionTemp[0].s = 0;
-            }
-        } else if (npc->pos.y >= npc->moveToPos.y) {
-            script->functionTemp[0].s = 0;
-        }
-    } else if (npc->jumpVelocity < 0.0) {
-        npc->duration++;
-        if (npc->duration >= aiSettings->unk_20) {
-            npc->duration = 0;
-            phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-            temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20);
-            if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) {
-                phi_f20 = npc->yaw;
-                if (temp_f0_2 < 0.0f) {
-                    phi_f20 += -aiSettings->unk_1C.s;
-                } else {
-                    phi_f20 += aiSettings->unk_1C.s;
-                }
-            }
-            npc->yaw = clamp_angle(phi_f20);
-        }
-
-        if (npc->flags & 8) {
-            if (npc->pos.y + npc->jumpVelocity < temp_f22) {
-                npc->pos.y = temp_f22;
-                npc->jumpVelocity = 0.0f;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0;
-        if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) {
-                npc->jumpVelocity = 0.0f;
-                npc->pos.y = posY;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) {
-            npc->pos.y = npc->pos.y + npc->jumpVelocity;
-            return;
-        }
-        npc->jumpVelocity = 0.0f;
-    }
-}
-
-void N(func_80241B38_BEE928)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) {
-    f32 posX, posY, posZ, posW;
-    s32 temp_a1;
-    s32 temp_v1;
-    s32 phi_v0;
-
-    script->functionTemp[0].s = 0;
-    npc->duration = 0;
-    temp_v1 = npc->flags & ~0x200;
-    npc->flags = (npc->flags & ~0x200) | 0x800;
-    if (enemy->territory->wander.isFlying) {
-        npc->flags = temp_v1 | 0x808;
-    } else {
-        npc->flags = npc->flags & ~8;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-    posW = 1000.0f;
-    func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-    enemy->varTable[2] = 0;
-    enemy->varTable[9] = 0;
-    enemy->varTable[3] = ((posW * 100.0) + 0.5);
-    enemy->varTable[7] = ((posY * 100.0) + 0.5);
-    script->functionTemp[1].s = aiSettings->unk_14;
-    enemy->unk_B0 |= 0x10;
-}
+#include "world/common/UnkFunc5.inc.c"
 
 ApiStatus N(func_80241C5C_BEEA4C)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1541,11 +1366,11 @@ ApiStatus N(func_80241C5C_BEEA4C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80241B38_BEE928)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -1566,7 +1391,7 @@ ApiStatus N(func_80241C5C_BEEA4C)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802411E8_BEDFD8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -1580,7 +1405,7 @@ ApiStatus N(func_80241C5C_BEEA4C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
         case 14:
-            N(func_802417A8_BEE598)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             return ApiStatus_BLOCK;
     }
 
@@ -1596,4 +1421,3 @@ ApiStatus PostChapter3StatUpdate(ScriptInstance* script, s32 isInitialCall) {
     sync_status_menu();
     return ApiStatus_DONE2;
 }
-
diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c
index ac8b497625..29f9151bcc 100644
--- a/src/world/area_dgb/dgb_01/BFD9A0.c
+++ b/src/world/area_dgb/dgb_01/BFD9A0.c
@@ -657,70 +657,7 @@ INCLUDE_ASM(void, "world/area_dgb/dgb_01/BFD9A0", dgb_01_func_802402D0_BFDB50, S
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_802409B8_BFE238)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f24 = (f32)enemy->varTable[3] / 100.0;
-    f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0);
-    s32 var;
-
-    if (npc->duration > 0) {
-        npc->duration--;
-    }
-
-    if (enemy->varTable[1] > 0) {
-        f32 temp_f22 = (f32)enemy->varTable[1] / 100.0;
-        f32 sin_degrees = sin_deg(enemy->varTable[2]);
-        s32 phi_v0;
-
-        if (npc->flags & 8) {
-            phi_v0 = FALSE;
-        } else {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        }
-
-        if (phi_v0) {
-            npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22);
-        } else {
-            npc->pos.y = temp_f26 + (sin_degrees * temp_f22);
-        }
-
-        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
-    }
-
-    if (enemy->varTable[9] <= 0) {
-        if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-            fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-            npc->moveToPos.y = npc->pos.y;
-            func_800494C0(npc, 0x2F4, 0x200000);
-            if (enemy->npcSettings->unk_2A & 1) {
-                script->functionTemp[0].s = 10;
-            } else {
-                script->functionTemp[0].s = 12;
-            }
-            return;
-        }
-    } else {
-        enemy->varTable[9]--;
-    }
-
-    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
-            if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-            }
-            npc->duration = (rand_int(1000) % 11) + 5;
-        } else {
-            script->functionTemp[0].s = 0;
-        }
-    }
-}
+#include "world/common/UnkFunc4.inc.c"
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
@@ -738,121 +675,9 @@ void N(func_80240D74_BFE5F4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc3.inc.c"
 
-void N(func_80240F78_BFE7F8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f0_2;
-    f32 temp_f20;
-    f32 temp_f22;
-    f32 temp_f2;
-    s32 phi_v0;
-    f32 phi_f20;
-    f32 a = enemy->varTable[3];
-    f32 b = enemy->varTable[7];
+#include "world/common/UnkFunc6.inc.c"
 
-    npc->jumpVelocity += npc->jumpScale;
-    temp_f20 = a / 100.0;
-    temp_f22 = b / 100.0;
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    if (npc->jumpVelocity >= 0.0) {
-        npc->pos.y += npc->jumpVelocity;
-        npc->currentAnim = enemy->animList[9];
-        enemy->unk_07 = 0;
-        if (!(npc->flags & 8)) {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        } else {
-            phi_v0 = FALSE;
-        }
-        if (phi_v0) {
-            temp_f2 = posY + temp_f20;
-            if (temp_f2 <= npc->pos.y) {
-                npc->pos.y = temp_f2;
-                script->functionTemp[0].s = 0;
-            }
-        } else if (npc->pos.y >= npc->moveToPos.y) {
-            script->functionTemp[0].s = 0;
-        }
-    } else if (npc->jumpVelocity < 0.0) {
-        npc->duration++;
-        if (npc->duration >= aiSettings->unk_20) {
-            npc->duration = 0;
-            phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-            temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20);
-            if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) {
-                phi_f20 = npc->yaw;
-                if (temp_f0_2 < 0.0f) {
-                    phi_f20 += -aiSettings->unk_1C.s;
-                } else {
-                    phi_f20 += aiSettings->unk_1C.s;
-                }
-            }
-            npc->yaw = clamp_angle(phi_f20);
-        }
-
-        if (npc->flags & 8) {
-            if (npc->pos.y + npc->jumpVelocity < temp_f22) {
-                npc->pos.y = temp_f22;
-                npc->jumpVelocity = 0.0f;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0;
-        if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) {
-                npc->jumpVelocity = 0.0f;
-                npc->pos.y = posY;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) {
-            npc->pos.y = npc->pos.y + npc->jumpVelocity;
-            return;
-        }
-        npc->jumpVelocity = 0.0f;
-    }
-}
-
-void N(func_80241308_BFEB88)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) {
-    f32 posX, posY, posZ, posW;
-    s32 temp_a1;
-    s32 temp_v1;
-    s32 phi_v0;
-
-    script->functionTemp[0].s = 0;
-    npc->duration = 0;
-    temp_v1 = npc->flags & ~0x200;
-    npc->flags = (npc->flags & ~0x200) | 0x800;
-    if (enemy->territory->wander.isFlying) {
-        npc->flags = temp_v1 | 0x808;
-    } else {
-        npc->flags = npc->flags & ~8;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-    posW = 1000.0f;
-    func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-    enemy->varTable[2] = 0;
-    enemy->varTable[9] = 0;
-    enemy->varTable[3] = ((posW * 100.0) + 0.5);
-    enemy->varTable[7] = ((posY * 100.0) + 0.5);
-    script->functionTemp[1].s = aiSettings->unk_14;
-    enemy->unk_B0 |= 0x10;
-}
+#include "world/common/UnkFunc5.inc.c"
 
 ApiStatus N(func_8024142C_BFECAC)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -868,11 +693,11 @@ ApiStatus N(func_8024142C_BFECAC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80241308_BFEB88)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -893,7 +718,7 @@ ApiStatus N(func_8024142C_BFECAC)(ScriptInstance *script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802409B8_BFE238)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -907,7 +732,7 @@ ApiStatus N(func_8024142C_BFECAC)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80240F78_BFE7F8)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
@@ -922,7 +747,7 @@ void N(func_80241618_BFEE98)(ScriptInstance *script, NpcAISettings *aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1);
         npc->currentAnim = enemy->animList[8];
         npc->moveSpeed = aiSettings->chaseSpeed;
@@ -996,13 +821,11 @@ void N(func_80241954_BFF1D4)(ScriptInstance *script, NpcAISettings *aiSettings,
     if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         script->functionTemp[0].s = 16;
     } else {
-        PlayerStatus** playerStatus = &gPlayerStatusPtr;
-
-        npc->pos.x = (*playerStatus)->position.x;
-        npc->pos.z = (*playerStatus)->position.z + 2.0f;
+        npc->pos.x = gPlayerStatusPtr->position.x;
+        npc->pos.z = gPlayerStatusPtr->position.z + 2.0f;
         npc->rotation.y += 25.0f;
         if (npc->rotation.y > 360.0) {
             npc->rotation.y -= 360.0;
@@ -1010,16 +833,16 @@ void N(func_80241954_BFF1D4)(ScriptInstance *script, NpcAISettings *aiSettings,
         temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f);
         func_802DE894(npc->spriteInstanceID, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0);
 
-        posX = (*playerStatus)->position.x;
-        posY = (*playerStatus)->position.y;
-        posZ = (*playerStatus)->position.z;
+        posX = gPlayerStatusPtr->position.x;
+        posY = gPlayerStatusPtr->position.y;
+        posZ = gPlayerStatusPtr->position.z;
         posW = 1000.0f;
         func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
         if (fabsf(npc->pos.y - posY) > 24.0) {
             npc->pos.y -= 1.8;
         } else {
             npc->rotation.y = 0.0f;
-            npc->flags &= 0xFFDFFFFF;
+            npc->flags &= ~0x00200000;
             if (D_8010EBB0.unk_03 != 9) {
                 disable_player_input();
                 func_800EF628();
@@ -1102,7 +925,7 @@ void N(func_80241EF0_BFF770)(ScriptInstance *script, NpcAISettings *aiSettings,
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
     enemy->varTable[0] &= ~0x100;
-    npc->flags &= 0xFFDFFFFF;
+    npc->flags &= ~0x00200000;
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
@@ -1167,12 +990,12 @@ ApiStatus N(func_802422B0_BFFB30)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 125.0f;
+    territory.unk_18 = 125.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
         script->functionTemp[0].s = 0;
-        N(func_80241308_BFEB88)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     switch (script->functionTemp[0].s) {
@@ -1188,7 +1011,7 @@ ApiStatus N(func_802422B0_BFFB30)(ScriptInstance *script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802409B8_BFE238)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             if (script->functionTemp[0].s == 12) {
                 npc->duration = 6;
             }
@@ -1465,85 +1288,11 @@ ApiStatus N(func_8024252C_BFFDAC)(ScriptInstance* script, NpcAISettings* aiSetti
     return 1;
 }
 
-void N(func_80242684_BFFF04)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 x, z;
-    s32 var;
-
-    if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
-            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
-                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-                func_800494C0(npc, 0x2F4, 0x200000);
-                if (enemy->npcSettings->unk_2A & 1) {
-                    script->functionTemp[0].s = 10;
-                } else {
-                    script->functionTemp[0].s = 12;
-                }
-                return;
-            }
-        }
-        script->functionTemp[1].s--;
-    }
-
-    if (npc->turnAroundYawAdjustment == 0) {
-        if (npc->moveSpeed < 4.0) {
-            func_8003D660(npc, 0);
-        } else {
-            func_8003D660(npc, 1);
-        }
-
-        x = script->functionTemp[2].s[enemy->territory->patrol.points].x;
-        z = script->functionTemp[2].s[enemy->territory->patrol.points].z;
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) ||
-                (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) {
-                script->functionTemp[0].s = 4;
-            }
-            if (rand_int(10000) % 100 < aiSettings->moveTime) {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc13.inc.c"
 
 #include "world/common/UnkNpcAIFunc1_copy.inc.c"
 
-void N(func_802429EC_C0026C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        func_800494C0(npc, 0x2F4, 0x200000);
-        if (!(enemy->npcSettings->unk_2A & 1)) {
-            script->functionTemp[0].s = 12;
-        } else {
-            script->functionTemp[0].s = 10;
-        }
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->duration--;
-        if (npc->duration == 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s != 0) {
-                if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                    npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                }
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc14.inc.c"
 
 ApiStatus N(func_80242BA8_C00428)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -1569,46 +1318,11 @@ ApiStatus N(func_80242BA8_C00428)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-ApiStatus N(func_80242E78_C006F8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_80243000_C00880)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_802430C0_C00940)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1625,7 +1339,7 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -1645,7 +1359,7 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance *script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -1662,12 +1376,12 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance *script, s32 isInitialCall) {
         case 0:
             N(func_8024252C_BFFDAC)(script, aiSettings, territoryPtr);
         case 1:
-            N(func_80242684_BFFF04)(script, aiSettings, territoryPtr);
+            N(UnkFunc13)(script, aiSettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802429EC_C0026C)(script, aiSettings, territoryPtr);
+            N(UnkFunc14)(script, aiSettings, territoryPtr);
             break;
         case 4:
             N(func_80242BA8_C00428)(script, aiSettings, territoryPtr);
@@ -1680,13 +1394,13 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance *script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr);
         case 13:
-            N(func_80242E78_C006F8)(script, aiSettings, territoryPtr);
+            N(UnkFunc15)(script, aiSettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, aiSettings, territoryPtr);
             break;
         case 15:
-            N(func_80243000_C00880)(script, aiSettings, territoryPtr);
+            N(UnkFunc16)(script, aiSettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c
index 9f69c4c568..16b798f9aa 100644
--- a/src/world/area_dgb/dgb_02/C2EBA0.c
+++ b/src/world/area_dgb/dgb_02/C2EBA0.c
@@ -258,7 +258,7 @@ Script N(npcAI_80241D34) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(update_starpoints_display_C2EF5C)();
+    N(UnkFunc7)();
 });
 
 NpcSettings N(npcSettings_80241DDC) = {
@@ -424,7 +424,7 @@ NpcGroupList N(npcGroupList_802425C8) = {
 s32 N(func_80240208_C2EDA8)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -458,77 +458,7 @@ s32 N(func_80240208_C2EDA8)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(update_starpoints_display_C2EF5C)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -544,7 +474,7 @@ ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -806,7 +736,7 @@ ApiStatus N(func_802410D4_C2FC74)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_dgb/dgb_02/dgb_02.h b/src/world/area_dgb/dgb_02/dgb_02.h
index 0e2c96941f..e558e674d4 100644
--- a/src/world/area_dgb/dgb_02/dgb_02.h
+++ b/src/world/area_dgb/dgb_02/dgb_02.h
@@ -5,7 +5,7 @@
 
 ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802410D4_C2FC74)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(update_starpoints_display_C2EF5C)(ScriptInstance *script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance *script, s32 isInitialCall);
 
 NpcGroupList N(npcGroupList_802425C8);
 Script N(main);
diff --git a/src/world/area_dgb/dgb_03/C314E0.c b/src/world/area_dgb/dgb_03/C314E0.c
index c5563cf862..77e2cb3aa6 100644
--- a/src/world/area_dgb/dgb_03/C314E0.c
+++ b/src/world/area_dgb/dgb_03/C314E0.c
@@ -1,52 +1,8 @@
 #include "dgb_03.h"
 
-ApiStatus N(func_80240000_C314E0)(ScriptInstance *script, s32 isInitialCall) {
-    s32 var = get_variable(script, *script->ptrReadPos);
-    PlayerStatus* playerStatus = &gPlayerStatus;
-    CollisionStatus* collisionStatus = &gCollisionStatus;
+#include "world/common/UnkFunc11.inc.c"
 
-    if (((collisionStatus->pushingAgainstWall != var) && (playerStatus->actionState == 20)) ||
-        playerStatus->enableCollisionOverlapsCheck || playerStatus->statusMenuCounterinputEnabledCounter) {
-        set_action_state(0);
-        script->varTable[0] = 0;
-        return ApiStatus_DONE2;
-    }
-
-    if (collisionStatus->pushingAgainstWall != var) {
-        script->varTable[0] = 0;
-    } else if ((playerStatus->actionState != 20) && (playerStatus->actionState != 1) &&
-               (playerStatus->actionState != 2)) {
-        script->varTable[0] = 0;
-    } else if (playerStatus->animFlags & 1) {
-        script->varTable[0] = 0;
-    } else {
-        script->varTable[0] = 1;
-    }
-
-    return ApiStatus_DONE2;
-}
-
-ApiStatus N(func_802400BC_C3159C)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerStatus* playerStatus = &gPlayerStatus;
-    f32 posX, posY, posZ, posW;
-
-    if (script->varTable[5] == 0) {
-        playerStatus->position.x = script->varTable[0];
-    } else {
-        playerStatus->position.z = script->varTable[0];
-    }
-
-    posX = playerStatus->position.x;
-    posY = playerStatus->position.y + 10.0f;
-    posZ = playerStatus->position.z;
-    posW = 40.0f;
-    func_800DCB7C(0, &posX, &posY, &posZ, &posW);
-    playerStatus->position.x = posX;
-    playerStatus->position.y = posY;
-    playerStatus->position.z = posZ;
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc12.inc.c"
 
 #include "world/common/SetEntityFlags100000.inc.c"
 
diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c
index a3cc51e95b..69c8ba49e3 100644
--- a/src/world/area_dgb/dgb_03/C31730.c
+++ b/src/world/area_dgb/dgb_03/C31730.c
@@ -215,7 +215,7 @@ Script N(802430E0) = SCRIPT({
             SI_VAR(8) = -1;
             return;
         }
-        N(func_80240000_C314E0)(SI_VAR(9));
+        N(UnkFunc11)(SI_VAR(9));
         if (SI_VAR(0) == 0) {
             SI_VAR(8) = -1;
             return;
@@ -249,7 +249,7 @@ Script N(802430E0) = SCRIPT({
         loop {
             SetPlayerActionState(20);
             UpdateLerp();
-            N(func_802400BC_C3159C)();
+            N(UnkFunc12)();
             sleep 1;
             if (SI_VAR(1) == 0) {
                 break loop;
@@ -507,7 +507,7 @@ Script N(npcAI_80243CC0) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(func_8024060C_C31AEC)();
+    N(UnkFunc7)();
 });
 
 NpcSettings N(npcSettings_80243D68) = {
@@ -749,7 +749,7 @@ NpcGroupList N(npcGroupList_80244988) = {
 s32 N(func_80240458_C31938)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -783,77 +783,7 @@ s32 N(func_80240458_C31938)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(func_8024060C_C31AEC)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 ApiStatus N(func_8024086C_C31D4C)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -869,7 +799,7 @@ ApiStatus N(func_8024086C_C31D4C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -975,85 +905,11 @@ ApiStatus N(func_80240B20_C32000)(ScriptInstance* script, NpcAISettings* aiSetti
     return 1;
 }
 
-void N(func_80240C78_C32158)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 x, z;
-    s32 var;
-
-    if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
-            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
-                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-                func_800494C0(npc, 0x2F4, 0x200000);
-                if (enemy->npcSettings->unk_2A & 1) {
-                    script->functionTemp[0].s = 10;
-                } else {
-                    script->functionTemp[0].s = 12;
-                }
-                return;
-            }
-        }
-        script->functionTemp[1].s--;
-    }
-
-    if (npc->turnAroundYawAdjustment == 0) {
-        if (npc->moveSpeed < 4.0) {
-            func_8003D660(npc, 0);
-        } else {
-            func_8003D660(npc, 1);
-        }
-
-        x = script->functionTemp[2].s[enemy->territory->patrol.points].x;
-        z = script->functionTemp[2].s[enemy->territory->patrol.points].z;
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) ||
-                (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) {
-                script->functionTemp[0].s = 4;
-            }
-            if (rand_int(10000) % 100 < aiSettings->moveTime) {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc13.inc.c"
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_80240FE0_C324C0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        func_800494C0(npc, 0x2F4, 0x200000);
-        if (!(enemy->npcSettings->unk_2A & 1)) {
-            script->functionTemp[0].s = 12;
-        } else {
-            script->functionTemp[0].s = 10;
-        }
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->duration--;
-        if (npc->duration == 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s != 0) {
-                if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                    npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                }
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc14.inc.c"
 
 ApiStatus N(func_8024119C_C3267C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -1079,46 +935,11 @@ ApiStatus N(func_8024119C_C3267C)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-ApiStatus N(func_8024146C_C3294C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_802415F4_C32AD4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_802416B4_C32B94)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1135,7 +956,7 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -1155,7 +976,7 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance *script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -1172,12 +993,12 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance *script, s32 isInitialCall) {
         case 0:
             N(func_80240B20_C32000)(script, npcAISettings, territoryPtr);
         case 1:
-            N(func_80240C78_C32158)(script, npcAISettings, territoryPtr);
+            N(UnkFunc13)(script, npcAISettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_80240FE0_C324C0)(script, npcAISettings, territoryPtr);
+            N(UnkFunc14)(script, npcAISettings, territoryPtr);
             break;
         case 4:
             N(func_8024119C_C3267C)(script, npcAISettings, territoryPtr);
@@ -1190,13 +1011,13 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance *script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_8024146C_C3294C)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
             break;
         case 15:
-            N(func_802415F4_C32AD4)(script, npcAISettings, territoryPtr);
+            N(UnkFunc16)(script, npcAISettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
@@ -1219,7 +1040,7 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -1248,12 +1069,12 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance *script, s32 isInitialCall) {
         case 0:
             N(func_80240B20_C32000)(script, npcAISettings, territoryPtr);
         case 1:
-            N(func_80240C78_C32158)(script, npcAISettings, territoryPtr);
+            N(UnkFunc13)(script, npcAISettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_80240FE0_C324C0)(script, npcAISettings, territoryPtr);
+            N(UnkFunc14)(script, npcAISettings, territoryPtr);
             break;
         case 4:
             N(func_8024119C_C3267C)(script, npcAISettings, territoryPtr);
@@ -1266,7 +1087,7 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance *script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_8024146C_C3294C)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
@@ -1484,7 +1305,7 @@ ApiStatus N(func_80242480_C33960)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_dgb/dgb_03/dgb_03.h b/src/world/area_dgb/dgb_03/dgb_03.h
index 58c2137a17..8ef1033bfb 100644
--- a/src/world/area_dgb/dgb_03/dgb_03.h
+++ b/src/world/area_dgb/dgb_03/dgb_03.h
@@ -3,9 +3,9 @@
 
 #define NAMESPACE dgb_03
 
-ApiStatus N(func_80240000_C314E0)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_802400BC_C3159C)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_8024060C_C31AEC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc11)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc12)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_8024086C_C31D4C)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802419B0_C32E90)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80242480_C33960)(ScriptInstance* script, s32 isInitialCall);
diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c
index 235952fd0b..9134f8426e 100644
--- a/src/world/area_dgb/dgb_04/C36530.c
+++ b/src/world/area_dgb/dgb_04/C36530.c
@@ -267,10 +267,10 @@ s16 N(D_80243D38_C3A268)[] = {
 };
 
 s32 N(D_80243D48_C3A278)[8][2] = {
-    {0x001D00E0, 0x001D00E1 }, {0x001D00E2, 0x001D00E3 },
-    {0x001D00E4, 0x001D00E5 }, {0x001D00E6, 0x001D00E7 },
-    {0x001D00E8, 0x001D00E9 }, {0x001D00EA, 0x001D00EB },
-    {0x001D00EC, 0x001D00ED }, {0x001D00EE, 0x001D00EF }
+    { 0x001D00E0, 0x001D00E1 }, { 0x001D00E2, 0x001D00E3 },
+    { 0x001D00E4, 0x001D00E5 }, { 0x001D00E6, 0x001D00E7 },
+    { 0x001D00E8, 0x001D00E9 }, { 0x001D00EA, 0x001D00EB },
+    { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF }
 };
 
 f32 N(D_80243D88_C3A2B8)[] = {
@@ -280,7 +280,7 @@ f32 N(D_80243D88_C3A2B8)[] = {
 Script N(80243D94) = SCRIPT({
     sleep 10;
     PlaySound(0x212D);
-    N(func_80242914_C38E44)(SI_MAP_VAR(0));
+    N(UnkFunc21)(SI_MAP_VAR(0));
     sleep 85;
     spawn {
         PlaySound(0x212E);
@@ -295,7 +295,7 @@ Script N(80243D94) = SCRIPT({
     }
     spawn {
         sleep 47;
-        N(func_80242978_C38EA8)();
+        N(UnkFunc22)();
         N(UnkPartnerPosFunc)();
         sleep 5;
         N(UnkPartnerPosFunc2)();
@@ -315,7 +315,7 @@ Script N(80243EF8) = SCRIPT({
     if (SI_VAR(0) == 1) {
         return;
     }
-    N(func_802430D8_C39608)();
+    N(UnkFunc24)();
     if (SI_VAR(0) == 1) {
         return;
     }
@@ -324,17 +324,17 @@ Script N(80243EF8) = SCRIPT({
     DisablePlayerInput(TRUE);
     DisablePartnerAI(0);
     SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
-    N(func_80242850_C38D80)(SI_MAP_VAR(0), SI_VAR(9));
+    N(UnkFunc20)(SI_MAP_VAR(0), SI_VAR(9));
     FindKeyItem(15, SI_VAR(12));
-    N(func_802424F0_C38A20)();
+    N(UnkFunc38)();
     if (SI_VAR(0) == -1) {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DC), 160, 40);
         sleep 10;
-        N(func_802428E0_C38E10)(SI_VAR(9));
+        N(UnkFunc39)(SI_VAR(9));
         DisablePlayerInput(FALSE);
         EnablePartnerAI();
         func_802D585C(0, 2097152);
-        N(func_802423EC_C3891C)();
+        N(UnkFunc17)();
         return;
     }
     if (SI_SAVE_FLAG(438) == 0) {
@@ -345,11 +345,11 @@ Script N(80243EF8) = SCRIPT({
     }
     N(func_8024259C_C38ACC)();
     if (SI_VAR(0) == -1) {
-        N(func_802428E0_C38E10)(SI_VAR(9));
+        N(UnkFunc39)(SI_VAR(9));
         DisablePlayerInput(FALSE);
         EnablePartnerAI();
         func_802D585C(0, 2097152);
-        N(func_802423EC_C3891C)();
+        N(UnkFunc17)();
         return;
     }
     SI_VAR(10) = SI_VAR(0);
@@ -366,18 +366,18 @@ Script N(80243EF8) = SCRIPT({
     ShowChoice(1966093);
     CloseMessage();
     if (SI_VAR(0) != 0) {
-        N(func_802428E0_C38E10)(SI_VAR(9));
+        N(UnkFunc39)(SI_VAR(9));
         DisablePlayerInput(FALSE);
         EnablePartnerAI();
         func_802D585C(0, 2097152);
-        N(func_802423EC_C3891C)();
+        N(UnkFunc17)();
         return;
     }
     await N(80243D94);
-    N(func_80242438_C38968)(SI_VAR(11), SI_VAR(13));
+    N(UnkFunc18)(SI_VAR(11), SI_VAR(13));
     SI_SAVE_FLAG(1046) = 1;
-    N(func_802428E0_C38E10)(SI_VAR(9));
-    N(func_80242818_C38D48)();
+    N(UnkFunc39)(SI_VAR(9));
+    N(UnkFunc19)();
     if (SI_VAR(13) == 1) {
         ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DD), 160, 40);
     } else {
@@ -386,7 +386,7 @@ Script N(80243EF8) = SCRIPT({
     DisablePlayerInput(FALSE);
     EnablePartnerAI();
     func_802D585C(0, 2097152);
-    N(func_802423EC_C3891C)();
+    N(UnkFunc17)();
 });
 
 Script N(makeEntities) = SCRIPT({
@@ -566,70 +566,7 @@ INCLUDE_ASM(void, "world/area_dgb/dgb_04/C36530", dgb_04_func_802401B0_C366E0, S
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_80240898_C36DC8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f24 = (f32)enemy->varTable[3] / 100.0;
-    f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0);
-    s32 var;
-
-    if (npc->duration > 0) {
-        npc->duration--;
-    }
-
-    if (enemy->varTable[1] > 0) {
-        f32 temp_f22 = (f32)enemy->varTable[1] / 100.0;
-        f32 sin_degrees = sin_deg(enemy->varTable[2]);
-        s32 phi_v0;
-
-        if (npc->flags & 8) {
-            phi_v0 = FALSE;
-        } else {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        }
-
-        if (phi_v0) {
-            npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22);
-        } else {
-            npc->pos.y = temp_f26 + (sin_degrees * temp_f22);
-        }
-
-        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
-    }
-
-    if (enemy->varTable[9] <= 0) {
-        if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-            fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-            npc->moveToPos.y = npc->pos.y;
-            func_800494C0(npc, 0x2F4, 0x200000);
-            if (enemy->npcSettings->unk_2A & 1) {
-                script->functionTemp[0].s = 10;
-            } else {
-                script->functionTemp[0].s = 12;
-            }
-            return;
-        }
-    } else {
-        enemy->varTable[9]--;
-    }
-
-    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
-            if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-            }
-            npc->duration = (rand_int(1000) % 11) + 5;
-        } else {
-            script->functionTemp[0].s = 0;
-        }
-    }
-}
+#include "world/common/UnkFunc4.inc.c"
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
@@ -647,121 +584,9 @@ void N(func_80240C54_C37184)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc3.inc.c"
 
-void N(func_80240E58_C37388)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f0_2;
-    f32 temp_f20;
-    f32 temp_f22;
-    f32 temp_f2;
-    s32 phi_v0;
-    f32 phi_f20;
-    f32 a = enemy->varTable[3];
-    f32 b = enemy->varTable[7];
+#include "world/common/UnkFunc6.inc.c"
 
-    npc->jumpVelocity += npc->jumpScale;
-    temp_f20 = a / 100.0;
-    temp_f22 = b / 100.0;
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    if (npc->jumpVelocity >= 0.0) {
-        npc->pos.y += npc->jumpVelocity;
-        npc->currentAnim = enemy->animList[9];
-        enemy->unk_07 = 0;
-        if (!(npc->flags & 8)) {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        } else {
-            phi_v0 = FALSE;
-        }
-        if (phi_v0) {
-            temp_f2 = posY + temp_f20;
-            if (temp_f2 <= npc->pos.y) {
-                npc->pos.y = temp_f2;
-                script->functionTemp[0].s = 0;
-            }
-        } else if (npc->pos.y >= npc->moveToPos.y) {
-            script->functionTemp[0].s = 0;
-        }
-    } else if (npc->jumpVelocity < 0.0) {
-        npc->duration++;
-        if (npc->duration >= aiSettings->unk_20) {
-            npc->duration = 0;
-            phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-            temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20);
-            if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) {
-                phi_f20 = npc->yaw;
-                if (temp_f0_2 < 0.0f) {
-                    phi_f20 += -aiSettings->unk_1C.s;
-                } else {
-                    phi_f20 += aiSettings->unk_1C.s;
-                }
-            }
-            npc->yaw = clamp_angle(phi_f20);
-        }
-
-        if (npc->flags & 8) {
-            if (npc->pos.y + npc->jumpVelocity < temp_f22) {
-                npc->pos.y = temp_f22;
-                npc->jumpVelocity = 0.0f;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0;
-        if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) {
-                npc->jumpVelocity = 0.0f;
-                npc->pos.y = posY;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) {
-            npc->pos.y = npc->pos.y + npc->jumpVelocity;
-            return;
-        }
-        npc->jumpVelocity = 0.0f;
-    }
-}
-
-void N(func_802411E8_C37718)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) {
-    f32 posX, posY, posZ, posW;
-    s32 temp_a1;
-    s32 temp_v1;
-    s32 phi_v0;
-
-    script->functionTemp[0].s = 0;
-    npc->duration = 0;
-    temp_v1 = npc->flags & ~0x200;
-    npc->flags = (npc->flags & ~0x200) | 0x800;
-    if (enemy->territory->wander.isFlying) {
-        npc->flags = temp_v1 | 0x808;
-    } else {
-        npc->flags = npc->flags & ~8;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-    posW = 1000.0f;
-    func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-    enemy->varTable[2] = 0;
-    enemy->varTable[9] = 0;
-    enemy->varTable[3] = ((posW * 100.0) + 0.5);
-    enemy->varTable[7] = ((posY * 100.0) + 0.5);
-    script->functionTemp[1].s = aiSettings->unk_14;
-    enemy->unk_B0 |= 0x10;
-}
+#include "world/common/UnkFunc5.inc.c"
 
 ApiStatus N(func_8024130C_C3783C)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -777,11 +602,11 @@ ApiStatus N(func_8024130C_C3783C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_802411E8_C37718)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -802,7 +627,7 @@ ApiStatus N(func_8024130C_C3783C)(ScriptInstance *script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80240898_C36DC8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -816,7 +641,7 @@ ApiStatus N(func_8024130C_C3783C)(ScriptInstance *script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80240E58_C37388)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
     }
 
     return ApiStatus_BLOCK;
@@ -830,7 +655,7 @@ void N(func_802414F8_C37A28)(ScriptInstance *script, NpcAISettings *aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1);
         npc->currentAnim = enemy->animList[8];
         npc->moveSpeed = aiSettings->chaseSpeed;
@@ -895,13 +720,11 @@ void N(func_802417F8_C37D28)(ScriptInstance *script, NpcAISettings *aiSettings,
     if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         script->functionTemp[0].s = 16;
     } else {
-        PlayerStatus** playerStatus = &gPlayerStatusPtr;
-
-        npc->pos.x = (*playerStatus)->position.x;
-        npc->pos.z = (*playerStatus)->position.z + 2.0f;
+        npc->pos.x = gPlayerStatusPtr->position.x;
+        npc->pos.z = gPlayerStatusPtr->position.z + 2.0f;
         npc->rotation.y += 25.0f;
         if (npc->rotation.y > 360.0) {
             npc->rotation.y -= 360.0;
@@ -909,16 +732,16 @@ void N(func_802417F8_C37D28)(ScriptInstance *script, NpcAISettings *aiSettings,
         temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f);
         func_802DE894(npc->spriteInstanceID, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0);
 
-        posX = (*playerStatus)->position.x;
-        posY = (*playerStatus)->position.y;
-        posZ = (*playerStatus)->position.z;
+        posX = gPlayerStatusPtr->position.x;
+        posY = gPlayerStatusPtr->position.y;
+        posZ = gPlayerStatusPtr->position.z;
         posW = 1000.0f;
         func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
         if (fabsf(npc->pos.y - posY) > 24.0) {
             npc->pos.y -= 1.8;
         } else {
             npc->rotation.y = 0.0f;
-            npc->flags &= 0xFFDFFFFF;
+            npc->flags &= ~0x00200000;
             if (D_8010EBB0.unk_03 != 9) {
                 disable_player_input();
                 func_800EF628();
@@ -1001,7 +824,7 @@ void N(func_80241D94_C382C4)(ScriptInstance *script, NpcAISettings *aiSettings,
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
     enemy->varTable[0] &= ~0x100;
-    npc->flags &= 0xFFDFFFFF;
+    npc->flags &= ~0x00200000;
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
@@ -1066,12 +889,12 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 125.0f;
+    territory.unk_18 = 125.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
         script->functionTemp[0].s = 0;
-        N(func_802411E8_C37718)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     switch (script->functionTemp[0].s) {
@@ -1087,7 +910,7 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance *script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80240898_C36DC8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             if (script->functionTemp[0].s == 12) {
                 npc->duration = 6;
             }
@@ -1130,58 +953,14 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/SetOverrideFlags_40.inc.c"
 
-ApiStatus N(func_802423EC_C3891C)(ScriptInstance *script, s32 isInitialCall) {
-    gOverrideFlags &= ~0x40;
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc17.inc.c"
 
 ApiStatus N(func_8024240C_C3893C)(ScriptInstance *script, s32 isInitialCall) {
     func_802E5690(get_variable(script, *script->ptrReadPos));
     return ApiStatus_DONE2;
 }
 
-ApiStatus N(func_80242438_C38968)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    Bytecode* args = script->ptrReadPos;
-    s32 partnerIdx = get_variable(script, *args++);
-    s32 si_var = *args++;
-
-    playerData->partners[partnerIdx].level++;
-    set_variable(script, si_var, playerData->partners[partnerIdx].level);
-
-    return ApiStatus_DONE2;
-}
-
-#ifdef NON_MATCHING
-s32 N(func_802424A4_C389D4)(s32 arg0, s16 arg1) {
-    PlayerData* playerData = &gPlayerData;
-    if (playerData->partners[arg0].enabled) {
-        if (playerData->partners[arg0].level <= arg1) {
-            return playerData->partners[arg0].level;
-        }
-    }
-    return -1;
-}
-#else
-INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", dgb_04_func_802424A4_C389D4, s32 arg0, s16 arg1)
-#endif
-
-ApiStatus N(func_802424F0_C38A20)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc18.inc.c"
 
 #ifdef NON_MATCHING
 
@@ -1208,53 +987,50 @@ typedef struct {
 
 ApiStatus N(func_8024259C_C38ACC)(ScriptInstance *script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
-    N(UnkStruct)* structPtr;
     N(UnkStruct)* ptr;
     s32 i;
-    s32 temp_a0;
+    s32 partnerLevel;
     s32 var, partnerActiveCount;
+    s32 idx;
 
     if (isInitialCall) {
         script->functionTemp[2].s = heap_malloc(0x330);
-        structPtr = script->functionTemp[2].s;
+        ptr = script->functionTemp[2].s;
 
-        ptr = structPtr;
         partnerActiveCount = 0;
         var = script->varTable[12] >= 0;
 
         for (i = 0; i < 8; i++) {
-            s32 idx = *(N(D_80243D38_C3A268) + i);
+            idx = N(D_80243D38_C3A268)[i];
 
             if (playerData->partners[idx].enabled) {
-                continue;
+                ptr->unk_108[i] = idx;
+                ptr->unk_84[i] = *D_8008EF20[idx];
+                partnerLevel = N(UnkFunc37)(idx, var);
+                if (partnerLevel >= 0) {
+                    ptr->unk_00[i] = D_800F7F00[idx];
+                    ptr->unk_18C[i] = 1;
+                    ptr->unk_294[i] = N(D_80243D48_C3A278)[i][partnerLevel];
+                } else {
+                    ptr->unk_00[i] = D_800F7F40[idx];
+                    ptr->unk_18C[i] = 0;
+                    ptr->unk_294[i] = N(D_80243D30_C3A260)[var];
+                }
+                ptr->unk_210[i] = playerData->partners[idx].level;
+                partnerActiveCount++;
             }
-
-            ptr->unk_108[i] = idx;
-            ptr->unk_84[i] = **(D_8008EF20 + idx);
-            temp_a0 = N(func_802424A4_C389D4)(idx, var);
-            if (temp_a0 >= 0) {
-                ptr->unk_00[i] = *(D_800F7F00 + idx);
-                ptr->unk_18C[i] = 1;
-                ptr->unk_294[i] = *(temp_a0 + *(N(D_80243D48_C3A278) + i));
-            } else {
-                ptr->unk_00[i] = *(D_800F7F40 + idx);
-                ptr->unk_18C[i] = 0;
-                ptr->unk_294[i] = *(N(D_80243D30_C3A260) + var);
-            }
-            ptr->unk_210[i] = playerData->partners[idx].level;
-            partnerActiveCount++;
         }
 
-        structPtr->unk_318 = 4;
-        structPtr->unk_324 = partnerActiveCount;
-        structPtr->unk_328 = 0;
-        func_800F4E40(structPtr);
+        ptr->unk_318 = 4;
+        ptr->unk_324 = partnerActiveCount;
+        ptr->unk_328 = 0;
+        func_800F4E40(ptr);
         script->functionTemp[0].s = 0;
     }
 
-    structPtr = script->functionTemp[2].s;
+    ptr = script->functionTemp[2].s;
     if (script->functionTemp[0].s == 0) {
-        script->functionTemp[1].s = structPtr->unk_32C;
+        script->functionTemp[1].s = ptr->unk_32C;
         if (script->functionTemp[1].s != 0) {
             func_800F13B0();
         } else {
@@ -1270,8 +1046,8 @@ ApiStatus N(func_8024259C_C38ACC)(ScriptInstance *script, s32 isInitialCall) {
 
     func_800F1538();
     if (script->functionTemp[1].s != 0xFF) {
-        script->varTable[0] = D_8008EF20[structPtr->unk_108[script->functionTemp[1].s - 1]][0];
-        script->varTable[1] = structPtr->unk_108[script->functionTemp[1].s - 1];
+        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1].s - 1]][0];
+        script->varTable[1] = ptr->unk_108[script->functionTemp[1].s - 1];
     } else {
         script->varTable[0] = -1;
     }
@@ -1281,7 +1057,7 @@ ApiStatus N(func_8024259C_C38ACC)(ScriptInstance *script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 #else
-INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", dgb_04_func_8024259C_C38ACC, ScriptInstance *script, s32 isInitialCall)
+INCLUDE_ASM(ApiStatus, "world/area_dgb/dgb_04/C36530", dgb_04_func_8024259C_C38ACC, ScriptInstance *script, s32 isInitialCall)
 #endif
 
 ApiStatus N(func_802427EC_C38D1C)(ScriptInstance* script, s32 isInitialCall) {
@@ -1291,47 +1067,15 @@ ApiStatus N(func_802427EC_C38D1C)(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus N(func_80242818_C38D48)(ScriptInstance *script, s32 isInitialCall) {
-    set_message_string(D_8008EF20[gPlayerData.currentPartner][0], 0);
+#include "world/common/UnkFunc19.inc.c"
 
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc20.inc.c"
 
-ApiStatus N(func_80242850_C38D80)(ScriptInstance *script, s32 isInitialCall) {
-    Bytecode *args = script->ptrReadPos;
-    s32 entityIdx = get_variable(script, *args++);
-    Entity* entity = get_entity_by_index(entityIdx);
-    s32 si_var = *args++;
-    Effect* effect = func_80071750(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f, 0);
+#include "world/common/UnkFunc39.inc.c"
 
-    set_variable(script, si_var, effect);
+#include "world/common/UnkFunc21.inc.c"
 
-    return ApiStatus_DONE2;
-}
-
-ApiStatus N(func_802428E0_C38E10)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-
-ApiStatus N(func_80242914_C38E44)(ScriptInstance *script, s32 isInitialCall) {
-    Entity* entity = get_entity_by_index(get_variable(script, *script->ptrReadPos));
-
-    func_80070BB0(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B);
-
-    return ApiStatus_DONE2;
-}
-
-ApiStatus N(func_80242978_C38EA8)(ScriptInstance *script, s32 isInitialCall) {
-    Npc *npc = get_npc_safe(-4);
-
-    func_80070BB0(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 0x1E);
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc22.inc.c"
 
 typedef struct {
     s32 unk_00;
@@ -1346,9 +1090,7 @@ typedef struct {
     Entity* unk_5C;
     s32 unk_60;
     s32 unk_64;
-} UserData;
-
-Effect* func_800716F0(s32, f32, f32, f32, f32, s32);
+} N(UserData);
 
 ApiStatus N(func_802429D0_C38F00)(ScriptInstance *script, s32 isInitialCall) {
     Bytecode *args = script->ptrReadPos;
@@ -1356,15 +1098,15 @@ ApiStatus N(func_802429D0_C38F00)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -1396,7 +1138,7 @@ ApiStatus N(func_802429D0_C38F00)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -1526,13 +1268,6 @@ s32 N(func_80242F08_C39438)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-ApiStatus N(func_802430D8_C39608)(ScriptInstance *script, s32 isInitialCall) {
-    script->varTable[0] = 0;
-    if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) {
-        script->varTable[0] = 1;
-    }
-
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc24.inc.c"
 
 const char N(dgb_00_name_hack)[] = "dgb_00";
diff --git a/src/world/area_dgb/dgb_04/dgb_04.h b/src/world/area_dgb/dgb_04/dgb_04.h
index 358cb4ffd6..96ba718973 100644
--- a/src/world/area_dgb/dgb_04/dgb_04.h
+++ b/src/world/area_dgb/dgb_04/dgb_04.h
@@ -7,21 +7,21 @@ ApiStatus N(SetOverrideFlags_40)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(UnkPartnerPosFunc)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(UnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80242154_C38684)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_802423EC_C3891C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc17)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_8024240C_C3893C)(ScriptInstance *script, s32 isInitialCall);
-ApiStatus N(func_80242438_C38968)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_802424F0_C38A20)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc18)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc38)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_8024259C_C38ACC)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802427EC_C38D1C)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_80242818_C38D48)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_80242850_C38D80)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_802428E0_C38E10)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_80242914_C38E44)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_80242978_C38EA8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc19)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc20)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc39)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc21)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc22)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802429D0_C38F00)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80242F08_C39438)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_802430D8_C39608)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc24)(ScriptInstance* script, s32 isInitialCall);
 
 NpcGroupList N(npcGroupList_80243D18);
 Script N(main);
-Script N(makeEntities);
+Script N(makeEntities);
\ No newline at end of file
diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c
index 1132c2f0cc..414871aa95 100644
--- a/src/world/area_dgb/dgb_05/C3AA10.c
+++ b/src/world/area_dgb/dgb_05/C3AA10.c
@@ -180,7 +180,7 @@ Script N(npcAI_80241A78) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(func_8024041C_C3AE2C)();
+    N(UnkFunc7)();
 });
 
 NpcSettings N(npcSettings_80241B20) = {
@@ -359,7 +359,7 @@ ApiStatus N(func_80240030_C3AA40)(ScriptInstance *script, s32 isInitialCall) {
 s32 N(func_80240268_C3AC78)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -393,77 +393,7 @@ s32 N(func_80240268_C3AC78)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(func_8024041C_C3AE2C)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 void N(func_8024067C_C3B08C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -656,7 +586,7 @@ ApiStatus N(func_80240E80_C3B890)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -760,7 +690,7 @@ ApiStatus N(func_802411D0_C3BBE0)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_dgb/dgb_05/dgb_05.h b/src/world/area_dgb/dgb_05/dgb_05.h
index 6ce7c0dbda..b156a6cc64 100644
--- a/src/world/area_dgb/dgb_05/dgb_05.h
+++ b/src/world/area_dgb/dgb_05/dgb_05.h
@@ -5,7 +5,7 @@
 
 ApiStatus N(func_80240000_C3AA10)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80240030_C3AA40)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_8024041C_C3AE2C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80240E80_C3B890)(ScriptInstance* script, s32 isInitialCall);
 
 NpcGroupList N(npcGroupList_8024230C);
diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c
index 95fed63be8..76588b61d5 100644
--- a/src/world/area_dgb/dgb_06/C3D080.c
+++ b/src/world/area_dgb/dgb_06/C3D080.c
@@ -81,9 +81,7 @@ Script N(main) = SCRIPT({
     spawn N(enterSingleDoor_80240474);
 });
 
-s32 N(D_80240620_C3D6A0) = {
-    0x00000000,
-};
+s32** N(D_80240620_C3D6A0) = NULL;
 
 Script N(80240624) = SCRIPT({
     group 0;
@@ -193,23 +191,19 @@ NpcGroupList N(npcGroupList_80240B44) = {
 };
 
 ApiStatus N(func_80240000_C3D080)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80240620_C3D6A0);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240620_C3D6A0) == NULL) {
+        N(D_80240620_C3D6A0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240620_C3D6A0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240620_C3D6A0)[i];
         }
-        ptr = &N(D_80240620_C3D6A0);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240620_C3D6A0));
+        N(D_80240620_C3D6A0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c
index 0d459bcea8..43f9c6b59f 100644
--- a/src/world/area_dgb/dgb_07/C3DBF0.c
+++ b/src/world/area_dgb/dgb_07/C3DBF0.c
@@ -167,7 +167,7 @@ Script N(npcAI_802419A8) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(update_starpoints_display_C3DFAC)();
+    N(UnkFunc7)();
 });
 
 NpcSettings N(npcSettings_80241A50) = {
@@ -268,7 +268,7 @@ static const s32 N(pad_1E74)[] = {
 s32 N(func_80240208_C3DDF8)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -302,77 +302,7 @@ s32 N(func_80240208_C3DDF8)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(update_starpoints_display_C3DFAC)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 void N(func_8024061C_C3E20C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -565,7 +495,7 @@ ApiStatus N(func_80240E20_C3EA10)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -669,7 +599,7 @@ ApiStatus N(func_80241170_C3ED60)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_dgb/dgb_07/dgb_07.h b/src/world/area_dgb/dgb_07/dgb_07.h
index ff5983d1f1..befc24032d 100644
--- a/src/world/area_dgb/dgb_07/dgb_07.h
+++ b/src/world/area_dgb/dgb_07/dgb_07.h
@@ -4,7 +4,7 @@
 #define NAMESPACE dgb_07
 
 ApiStatus N(func_80240E20_C3EA10)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(update_starpoints_display_C3DFAC)(ScriptInstance *script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance *script, s32 isInitialCall);
 
 NpcGroupList N(npcGroupList_80241E5C);
 Script N(main);
diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c
index 5720a55200..fabd4af5cd 100644
--- a/src/world/area_dgb/dgb_08/C3FDB0.c
+++ b/src/world/area_dgb/dgb_08/C3FDB0.c
@@ -242,7 +242,7 @@ Script N(npcAI_8024438C) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(func_8024124C_C40FFC)();
+    N(UnkFunc7)();
 });
 
 NpcSettings N(npcSettings_80244434) = {
@@ -989,85 +989,11 @@ ApiStatus N(func_80240000_C3FDB0)(ScriptInstance* script, NpcAISettings* aiSetti
     return ApiStatus_DONE1;
 }
 
-void N(func_80240158_C3FF08)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 x, z;
-    s32 var;
-
-    if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
-            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
-                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-                func_800494C0(npc, 0x2F4, 0x200000);
-                if (enemy->npcSettings->unk_2A & 1) {
-                    script->functionTemp[0].s = 10;
-                } else {
-                    script->functionTemp[0].s = 12;
-                }
-                return;
-            }
-        }
-        script->functionTemp[1].s--;
-    }
-
-    if (npc->turnAroundYawAdjustment == 0) {
-        if (npc->moveSpeed < 4.0) {
-            func_8003D660(npc, 0);
-        } else {
-            func_8003D660(npc, 1);
-        }
-
-        x = script->functionTemp[2].s[enemy->territory->patrol.points].x;
-        z = script->functionTemp[2].s[enemy->territory->patrol.points].z;
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) ||
-                (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) {
-                script->functionTemp[0].s = 4;
-            }
-            if (rand_int(10000) % 100 < aiSettings->moveTime) {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc13.inc.c"
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_802404C0_C40270)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        func_800494C0(npc, 0x2F4, 0x200000);
-        if (!(enemy->npcSettings->unk_2A & 1)) {
-            script->functionTemp[0].s = 12;
-        } else {
-            script->functionTemp[0].s = 10;
-        }
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->duration--;
-        if (npc->duration == 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s != 0) {
-                if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                    npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                }
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc14.inc.c"
 
 ApiStatus N(func_8024067C_C4042C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -1093,46 +1019,11 @@ ApiStatus N(func_8024067C_C4042C)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-ApiStatus N(func_8024094C_C406FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_80240AD4_C40884)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_80240B94_C40944)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1149,7 +1040,7 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -1169,7 +1060,7 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance *script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -1186,12 +1077,12 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance *script, s32 isInitialCall) {
         case 0:
             N(func_80240000_C3FDB0)(script, npcAISettings, territoryPtr);
         case 1:
-            N(func_80240158_C3FF08)(script, npcAISettings, territoryPtr);
+            N(UnkFunc13)(script, npcAISettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_802404C0_C40270)(script, npcAISettings, territoryPtr);
+            N(UnkFunc14)(script, npcAISettings, territoryPtr);
             break;
         case 4:
             N(func_8024067C_C4042C)(script, npcAISettings, territoryPtr);
@@ -1204,13 +1095,13 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance *script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_8024094C_C406FC)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
             break;
         case 15:
-            N(func_80240AD4_C40884)(script, npcAISettings, territoryPtr);
+            N(UnkFunc16)(script, npcAISettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
@@ -1230,7 +1121,7 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance *script, s32 isInitialCall) {
 s32 N(func_80241098_C40E48)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -1264,77 +1155,7 @@ s32 N(func_80241098_C40E48)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(func_8024124C_C40FFC)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 ApiStatus N(func_802414AC_C4125C)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1350,7 +1171,7 @@ ApiStatus N(func_802414AC_C4125C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -1591,70 +1412,7 @@ INCLUDE_ASM(void, "world/area_dgb/dgb_08/C3FDB0", dgb_08_func_80241910_C416C0, S
 
 #include "world/common/UnkNpcAIFunc1_copy.inc.c"
 
-void N(func_80241FF8_C41DA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f24 = (f32)enemy->varTable[3] / 100.0;
-    f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0);
-    s32 var;
-
-    if (npc->duration > 0) {
-        npc->duration--;
-    }
-
-    if (enemy->varTable[1] > 0) {
-        f32 temp_f22 = (f32)enemy->varTable[1] / 100.0;
-        f32 sin_degrees = sin_deg(enemy->varTable[2]);
-        s32 phi_v0;
-
-        if (npc->flags & 8) {
-            phi_v0 = FALSE;
-        } else {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        }
-
-        if (phi_v0) {
-            npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22);
-        } else {
-            npc->pos.y = temp_f26 + (sin_degrees * temp_f22);
-        }
-
-        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
-    }
-
-    if (enemy->varTable[9] <= 0) {
-        if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-            fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-            npc->moveToPos.y = npc->pos.y;
-            func_800494C0(npc, 0x2F4, 0x200000);
-            if (enemy->npcSettings->unk_2A & 1) {
-                script->functionTemp[0].s = 10;
-            } else {
-                script->functionTemp[0].s = 12;
-            }
-            return;
-        }
-    } else {
-        enemy->varTable[9]--;
-    }
-
-    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
-            if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-            }
-            npc->duration = (rand_int(1000) % 11) + 5;
-        } else {
-            script->functionTemp[0].s = 0;
-        }
-    }
-}
+#include "world/common/UnkFunc4.inc.c"
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
@@ -1672,121 +1430,9 @@ void N(func_802423B4_C42164)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc3.inc.c"
 
-void N(func_802425B8_C42368)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f0_2;
-    f32 temp_f20;
-    f32 temp_f22;
-    f32 temp_f2;
-    s32 phi_v0;
-    f32 phi_f20;
-    f32 a = enemy->varTable[3];
-    f32 b = enemy->varTable[7];
+#include "world/common/UnkFunc6.inc.c"
 
-    npc->jumpVelocity += npc->jumpScale;
-    temp_f20 = a / 100.0;
-    temp_f22 = b / 100.0;
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    if (npc->jumpVelocity >= 0.0) {
-        npc->pos.y += npc->jumpVelocity;
-        npc->currentAnim = enemy->animList[9];
-        enemy->unk_07 = 0;
-        if (!(npc->flags & 8)) {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        } else {
-            phi_v0 = FALSE;
-        }
-        if (phi_v0) {
-            temp_f2 = posY + temp_f20;
-            if (temp_f2 <= npc->pos.y) {
-                npc->pos.y = temp_f2;
-                script->functionTemp[0].s = 0;
-            }
-        } else if (npc->pos.y >= npc->moveToPos.y) {
-            script->functionTemp[0].s = 0;
-        }
-    } else if (npc->jumpVelocity < 0.0) {
-        npc->duration++;
-        if (npc->duration >= aiSettings->unk_20) {
-            npc->duration = 0;
-            phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-            temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20);
-            if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) {
-                phi_f20 = npc->yaw;
-                if (temp_f0_2 < 0.0f) {
-                    phi_f20 += -aiSettings->unk_1C.s;
-                } else {
-                    phi_f20 += aiSettings->unk_1C.s;
-                }
-            }
-            npc->yaw = clamp_angle(phi_f20);
-        }
-
-        if (npc->flags & 8) {
-            if (npc->pos.y + npc->jumpVelocity < temp_f22) {
-                npc->pos.y = temp_f22;
-                npc->jumpVelocity = 0.0f;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0;
-        if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) {
-                npc->jumpVelocity = 0.0f;
-                npc->pos.y = posY;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) {
-            npc->pos.y = npc->pos.y + npc->jumpVelocity;
-            return;
-        }
-        npc->jumpVelocity = 0.0f;
-    }
-}
-
-void N(func_80242948_C426F8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) {
-    f32 posX, posY, posZ, posW;
-    s32 temp_a1;
-    s32 temp_v1;
-    s32 phi_v0;
-
-    script->functionTemp[0].s = 0;
-    npc->duration = 0;
-    temp_v1 = npc->flags & ~0x200;
-    npc->flags = (npc->flags & ~0x200) | 0x800;
-    if (enemy->territory->wander.isFlying) {
-        npc->flags = temp_v1 | 0x808;
-    } else {
-        npc->flags = npc->flags & ~8;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-    posW = 1000.0f;
-    func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-    enemy->varTable[2] = 0;
-    enemy->varTable[9] = 0;
-    enemy->varTable[3] = ((posW * 100.0) + 0.5);
-    enemy->varTable[7] = ((posY * 100.0) + 0.5);
-    script->functionTemp[1].s = aiSettings->unk_14;
-    enemy->unk_B0 |= 0x10;
-}
+#include "world/common/UnkFunc5.inc.c"
 
 ApiStatus N(func_80242A6C_C4281C)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1802,11 +1448,11 @@ ApiStatus N(func_80242A6C_C4281C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80242948_C426F8)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -1827,7 +1473,7 @@ ApiStatus N(func_80242A6C_C4281C)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80241FF8_C41DA8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -1841,7 +1487,7 @@ ApiStatus N(func_80242A6C_C4281C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_802425B8_C42368)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
@@ -1856,7 +1502,7 @@ void N(func_80242C58_C42A08)(ScriptInstance *script, NpcAISettings *aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1);
         npc->currentAnim = enemy->animList[8];
         npc->moveSpeed = aiSettings->chaseSpeed;
@@ -1929,7 +1575,7 @@ void N(func_80242F94_C42D44)(ScriptInstance *script, NpcAISettings *aiSettings,
     if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         script->functionTemp[0].s = 16;
     } else {
         PlayerStatus** playerStatus = &gPlayerStatusPtr;
@@ -1952,7 +1598,7 @@ void N(func_80242F94_C42D44)(ScriptInstance *script, NpcAISettings *aiSettings,
             npc->pos.y -= 1.8;
         } else {
             npc->rotation.y = 0.0f;
-            npc->flags &= 0xFFDFFFFF;
+            npc->flags &= ~0x00200000;
             if (D_8010EBB0.unk_03 != 9) {
                 disable_player_input();
                 func_800EF628();
@@ -2035,7 +1681,7 @@ void N(func_80243530_C432E0)(ScriptInstance *script, NpcAISettings *aiSettings,
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
     enemy->varTable[0] &= ~0x100;
-    npc->flags &= 0xFFDFFFFF;
+    npc->flags &= ~0x00200000;
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
@@ -2100,12 +1746,12 @@ ApiStatus N(func_802438F0_C436A0)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 125.0f;
+    territory.unk_18 = 125.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
         script->functionTemp[0].s = 0;
-        N(func_80242948_C426F8)(npc, enemy, script, npcAISettings);
+        N(UnkFunc5)(npc, enemy, script, npcAISettings);
     }
 
     switch (script->functionTemp[0].s) {
@@ -2121,7 +1767,7 @@ ApiStatus N(func_802438F0_C436A0)(ScriptInstance *script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1_copy)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_80241FF8_C41DA8)(script, npcAISettings, territoryPtr);
+            N(UnkFunc4)(script, npcAISettings, territoryPtr);
             if (script->functionTemp[0].s == 12) {
                 npc->duration = 6;
             }
diff --git a/src/world/area_dgb/dgb_08/dgb_08.h b/src/world/area_dgb/dgb_08/dgb_08.h
index 6c56a8b482..6b966e27f1 100644
--- a/src/world/area_dgb/dgb_08/dgb_08.h
+++ b/src/world/area_dgb/dgb_08/dgb_08.h
@@ -5,7 +5,7 @@
 
 ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80240B94_C40944)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_8024124C_C40FFC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802414AC_C4125C)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802438F0_C436A0)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80243B98_C43948)(ScriptInstance* script, s32 isInitialCall);
diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c
index 7b5adb60b8..ede66b3254 100644
--- a/src/world/area_dgb/dgb_09/C46BE0.c
+++ b/src/world/area_dgb/dgb_09/C46BE0.c
@@ -147,9 +147,7 @@ static s32 N(pad_3E4C) = {
     0x00000000,
 };
 
-s32 N(triggerCoord_80243E50)[] = {
-    0x43960000, 0x00000000, 0x42B00000, 0x00000000,
-};
+Vec4f N(triggerCoord_80243E50) = { 300.0f, 0.0f, 88.0f, 0.0f };
 
 Script N(80243E60) = SCRIPT({
     sleep 2;
@@ -288,7 +286,7 @@ Script N(npcAI_80244284) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(update_starpoints_display_C46F9C)();
+    N(UnkFunc7)();
 });
 
 NpcSettings N(npcSettings_8024432C) = {
@@ -609,7 +607,7 @@ NpcGroupList N(npcGroupList_8024533C) = {
 s32 N(func_80240208_C46DE8)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -643,77 +641,7 @@ s32 N(func_80240208_C46DE8)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(update_starpoints_display_C46F9C)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 ApiStatus N(func_8024061C_C471FC)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -729,7 +657,7 @@ ApiStatus N(func_8024061C_C471FC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -991,7 +919,7 @@ ApiStatus N(func_802410D4_C47CB4)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -1251,70 +1179,7 @@ INCLUDE_ASM(void, "world/area_dgb/dgb_09/C46BE0", dgb_09_func_802415D4_C481B4, S
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_80241CBC_C4889C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f24 = (f32)enemy->varTable[3] / 100.0;
-    f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0);
-    s32 var;
-
-    if (npc->duration > 0) {
-        npc->duration--;
-    }
-
-    if (enemy->varTable[1] > 0) {
-        f32 temp_f22 = (f32)enemy->varTable[1] / 100.0;
-        f32 sin_degrees = sin_deg(enemy->varTable[2]);
-        s32 phi_v0;
-
-        if (npc->flags & 8) {
-            phi_v0 = FALSE;
-        } else {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        }
-
-        if (phi_v0) {
-            npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22);
-        } else {
-            npc->pos.y = temp_f26 + (sin_degrees * temp_f22);
-        }
-
-        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
-    }
-
-    if (enemy->varTable[9] <= 0) {
-        if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-            fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
-            npc->moveToPos.y = npc->pos.y;
-            func_800494C0(npc, 0x2F4, 0x200000);
-            if (enemy->npcSettings->unk_2A & 1) {
-                script->functionTemp[0].s = 10;
-            } else {
-                script->functionTemp[0].s = 12;
-            }
-            return;
-        }
-    } else {
-        enemy->varTable[9]--;
-    }
-
-    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
-        script->functionTemp[1].s--;
-        if (script->functionTemp[1].s > 0) {
-            if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                npc->yaw = clamp_angle(npc->yaw + 180.0f);
-            }
-            npc->duration = (rand_int(1000) % 11) + 5;
-        } else {
-            script->functionTemp[0].s = 0;
-        }
-    }
-}
+#include "world/common/UnkFunc4.inc.c"
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
@@ -1332,121 +1197,9 @@ void N(func_80242078_C48C58)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkNpcAIFunc3.inc.c"
 
-void N(func_8024227C_C48E5C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 posX, posY, posZ, posW;
-    f32 temp_f0_2;
-    f32 temp_f20;
-    f32 temp_f22;
-    f32 temp_f2;
-    s32 phi_v0;
-    f32 phi_f20;
-    f32 a = enemy->varTable[3];
-    f32 b = enemy->varTable[7];
+#include "world/common/UnkFunc6.inc.c"
 
-    npc->jumpVelocity += npc->jumpScale;
-    temp_f20 = a / 100.0;
-    temp_f22 = b / 100.0;
-    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-
-    if (npc->jumpVelocity >= 0.0) {
-        npc->pos.y += npc->jumpVelocity;
-        npc->currentAnim = enemy->animList[9];
-        enemy->unk_07 = 0;
-        if (!(npc->flags & 8)) {
-            posX = npc->pos.x;
-            posY = npc->pos.y;
-            posZ = npc->pos.z;
-            posW = 1000.0f;
-            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-        } else {
-            phi_v0 = FALSE;
-        }
-        if (phi_v0) {
-            temp_f2 = posY + temp_f20;
-            if (temp_f2 <= npc->pos.y) {
-                npc->pos.y = temp_f2;
-                script->functionTemp[0].s = 0;
-            }
-        } else if (npc->pos.y >= npc->moveToPos.y) {
-            script->functionTemp[0].s = 0;
-        }
-    } else if (npc->jumpVelocity < 0.0) {
-        npc->duration++;
-        if (npc->duration >= aiSettings->unk_20) {
-            npc->duration = 0;
-            phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-            temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20);
-            if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) {
-                phi_f20 = npc->yaw;
-                if (temp_f0_2 < 0.0f) {
-                    phi_f20 += -aiSettings->unk_1C.s;
-                } else {
-                    phi_f20 += aiSettings->unk_1C.s;
-                }
-            }
-            npc->yaw = clamp_angle(phi_f20);
-        }
-
-        if (npc->flags & 8) {
-            if (npc->pos.y + npc->jumpVelocity < temp_f22) {
-                npc->pos.y = temp_f22;
-                npc->jumpVelocity = 0.0f;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        }
-
-        posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight;
-        posZ = npc->pos.z;
-        posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0;
-        if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) {
-            if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) {
-                npc->jumpVelocity = 0.0f;
-                npc->pos.y = posY;
-            } else {
-                npc->pos.y += npc->jumpVelocity;
-            }
-            return;
-        } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) {
-            npc->pos.y = npc->pos.y + npc->jumpVelocity;
-            return;
-        }
-        npc->jumpVelocity = 0.0f;
-    }
-}
-
-void N(func_8024260C_C491EC)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) {
-    f32 posX, posY, posZ, posW;
-    s32 temp_a1;
-    s32 temp_v1;
-    s32 phi_v0;
-
-    script->functionTemp[0].s = 0;
-    npc->duration = 0;
-    temp_v1 = npc->flags & ~0x200;
-    npc->flags = (npc->flags & ~0x200) | 0x800;
-    if (enemy->territory->wander.isFlying) {
-        npc->flags = temp_v1 | 0x808;
-    } else {
-        npc->flags = npc->flags & ~8;
-    }
-
-    posX = npc->pos.x;
-    posY = npc->pos.y;
-    posZ = npc->pos.z;
-    posW = 1000.0f;
-    func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
-    enemy->varTable[2] = 0;
-    enemy->varTable[9] = 0;
-    enemy->varTable[3] = ((posW * 100.0) + 0.5);
-    enemy->varTable[7] = ((posY * 100.0) + 0.5);
-    script->functionTemp[1].s = aiSettings->unk_14;
-    enemy->unk_B0 |= 0x10;
-}
+#include "world/common/UnkFunc5.inc.c"
 
 ApiStatus N(func_80242730_C49310)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -1462,11 +1215,11 @@ ApiStatus N(func_80242730_C49310)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_8024260C_C491EC)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -1487,7 +1240,7 @@ ApiStatus N(func_80242730_C49310)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80241CBC_C4889C)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -1501,7 +1254,7 @@ ApiStatus N(func_80242730_C49310)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_8024227C_C48E5C)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
@@ -1516,7 +1269,7 @@ void N(func_8024291C_C494FC)(ScriptInstance *script, NpcAISettings *aiSettings,
 
     npc->duration--;
     if (npc->duration <= 0) {
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1);
         npc->currentAnim = enemy->animList[8];
         npc->moveSpeed = aiSettings->chaseSpeed;
@@ -1581,7 +1334,7 @@ void N(func_80242C1C_C497FC)(ScriptInstance *script, NpcAISettings *aiSettings,
     if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
         enemy->varTable[0] &= ~0x100;
         npc->rotation.y = 0.0f;
-        npc->flags &= 0xFFDFFFFF;
+        npc->flags &= ~0x00200000;
         script->functionTemp[0].s = 16;
     } else {
         PlayerStatus** playerStatus = &gPlayerStatusPtr;
@@ -1604,7 +1357,7 @@ void N(func_80242C1C_C497FC)(ScriptInstance *script, NpcAISettings *aiSettings,
             npc->pos.y -= 1.8;
         } else {
             npc->rotation.y = 0.0f;
-            npc->flags &= 0xFFDFFFFF;
+            npc->flags &= ~0x00200000;
             if (D_8010EBB0.unk_03 != 9) {
                 disable_player_input();
                 func_800EF628();
@@ -1687,7 +1440,7 @@ void N(func_802431B8_C49D98)(ScriptInstance *script, NpcAISettings *aiSettings,
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
     enemy->varTable[0] &= ~0x100;
-    npc->flags &= 0xFFDFFFFF;
+    npc->flags &= ~0x00200000;
     npc->moveSpeed = 2.0 * aiSettings->moveSpeed;
     enemy->varTable[2] = 0;
     enemy->varTable[4] = npc->pos.y * 100.0;
@@ -1752,12 +1505,12 @@ ApiStatus N(func_80243578_C4A158)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 125.0f;
+    territory.unk_18 = 125.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
         script->functionTemp[0].s = 0;
-        N(func_8024260C_C491EC)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     switch (script->functionTemp[0].s) {
@@ -1773,7 +1526,7 @@ ApiStatus N(func_80243578_C4A158)(ScriptInstance *script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80241CBC_C4889C)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             if (script->functionTemp[0].s == 12) {
                 npc->duration = 6;
             }
diff --git a/src/world/area_dgb/dgb_09/dgb_09.h b/src/world/area_dgb/dgb_09/dgb_09.h
index cc63dd54f7..a608d44e95 100644
--- a/src/world/area_dgb/dgb_09/dgb_09.h
+++ b/src/world/area_dgb/dgb_09/dgb_09.h
@@ -6,7 +6,7 @@
 ApiStatus N(func_8024061C_C471FC)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80243578_C4A158)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(update_starpoints_display_C46F9C)(ScriptInstance *script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance *script, s32 isInitialCall);
 
 NpcGroupList N(npcGroupList_8024533C);
 Script N(80243F6C);
diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c
index 0d87605528..748d488d56 100644
--- a/src/world/area_dgb/dgb_12/C4DEF0.c
+++ b/src/world/area_dgb/dgb_12/C4DEF0.c
@@ -123,9 +123,7 @@ static s32 N(pad_868)[] = {
     0x00000000, 0x00000000,
 };
 
-s32 N(D_80240870_C4E760) = {
-    0x00000000,
-};
+s32** N(D_80240870_C4E760) = NULL;
 
 Script N(80240874) = SCRIPT({
     group 0;
@@ -171,23 +169,19 @@ Script N(makeEntities) = SCRIPT({
 });
 
 ApiStatus N(func_80240000_C4DEF0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80240870_C4E760);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240870_C4E760) == NULL) {
+        N(D_80240870_C4E760) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240870_C4E760)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240870_C4E760)[i];
         }
-        ptr = &N(D_80240870_C4E760);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240870_C4E760));
+        N(D_80240870_C4E760) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c
index 270326130c..8fec5053a3 100644
--- a/src/world/area_dgb/dgb_15/C4F510.c
+++ b/src/world/area_dgb/dgb_15/C4F510.c
@@ -199,7 +199,7 @@ Script N(80242058) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(update_starpoints_display_C4F8CC)();
+    N(UnkFunc7)();
 });
 
 s32 N(unk_missing_80242100)[] = {
@@ -455,7 +455,7 @@ Script N(makeEntities) = SCRIPT({
 s32 N(func_80240208_C4F718)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -489,77 +489,7 @@ s32 N(func_80240208_C4F718)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(update_starpoints_display_C4F8CC)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance *script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -575,7 +505,7 @@ ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -681,85 +611,11 @@ ApiStatus N(func_802408D0_C4FDE0)(ScriptInstance* script, NpcAISettings* aiSetti
     return ApiStatus_DONE1;
 }
 
-void N(func_80240A28_C4FF38)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 x, z;
-    s32 var;
-
-    if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
-            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
-                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-                func_800494C0(npc, 0x2F4, 0x200000);
-                if (enemy->npcSettings->unk_2A & 1) {
-                    script->functionTemp[0].s = 10;
-                } else {
-                    script->functionTemp[0].s = 12;
-                }
-                return;
-            }
-        }
-        script->functionTemp[1].s--;
-    }
-
-    if (npc->turnAroundYawAdjustment == 0) {
-        if (npc->moveSpeed < 4.0) {
-            func_8003D660(npc, 0);
-        } else {
-            func_8003D660(npc, 1);
-        }
-
-        x = script->functionTemp[2].s[enemy->territory->patrol.points].x;
-        z = script->functionTemp[2].s[enemy->territory->patrol.points].z;
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) ||
-                (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) {
-                script->functionTemp[0].s = 4;
-            }
-            if (rand_int(10000) % 100 < aiSettings->moveTime) {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc13.inc.c"
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_80240D90_C502A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        func_800494C0(npc, 0x2F4, 0x200000);
-        if (!(enemy->npcSettings->unk_2A & 1)) {
-            script->functionTemp[0].s = 12;
-        } else {
-            script->functionTemp[0].s = 10;
-        }
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->duration--;
-        if (npc->duration == 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s != 0) {
-                if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                    npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                }
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc14.inc.c"
 
 ApiStatus N(func_80240F4C_C5045C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -785,46 +641,11 @@ ApiStatus N(func_80240F4C_C5045C)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-ApiStatus N(func_8024121C_C5072C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_802413A4_C508B4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -841,7 +662,7 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -861,7 +682,7 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -878,12 +699,12 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
         case 0:
             N(func_802408D0_C4FDE0)(script, npcAISettings, territoryPtr);
         case 1:
-            N(func_80240A28_C4FF38)(script, npcAISettings, territoryPtr);
+            N(UnkFunc13)(script, npcAISettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_80240D90_C502A0)(script, npcAISettings, territoryPtr);
+            N(UnkFunc14)(script, npcAISettings, territoryPtr);
             break;
         case 4:
             N(func_80240F4C_C5045C)(script, npcAISettings, territoryPtr);
@@ -896,13 +717,13 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_8024121C_C5072C)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
             break;
         case 15:
-            N(func_802413A4_C508B4)(script, npcAISettings, territoryPtr);
+            N(UnkFunc16)(script, npcAISettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
diff --git a/src/world/area_dgb/dgb_15/dgb_15.h b/src/world/area_dgb/dgb_15/dgb_15.h
index e743e2453c..c6c29412df 100644
--- a/src/world/area_dgb/dgb_15/dgb_15.h
+++ b/src/world/area_dgb/dgb_15/dgb_15.h
@@ -8,7 +8,7 @@ ApiStatus N(SetEntityFlags100000)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(update_starpoints_display_C4F8CC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance* script, s32 isInitialCall);
 
 NpcGroupList N(npcGroupList_80242AB0);
 Script N(80242AD0);
diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c
index 75b02d605f..a0f1c5e581 100644
--- a/src/world/area_dgb/dgb_16/C52540.c
+++ b/src/world/area_dgb/dgb_16/C52540.c
@@ -183,7 +183,7 @@ Script N(npcAI_80241978) = SCRIPT({
     SetSelfVar(3, 32);
     SetSelfVar(4, 3);
     SetSelfVar(15, 8389);
-    N(update_starpoints_display_C528FC)();
+    N(UnkFunc7)();
 });
 
 NpcSettings N(npcSettings_80241A20) = {
@@ -625,7 +625,7 @@ NpcGroupList N(npcGroupList_8024318C) = {
 s32 N(func_80240208_C52748)(ScriptInstance *script) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -659,77 +659,7 @@ s32 N(func_80240208_C52748)(ScriptInstance *script) {
     return ret;
 }
 
-ApiStatus N(update_starpoints_display_C528FC)(ScriptInstance *script, s32 isInitialCall) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc *npc = get_npc_unsafe(enemy->npcID);
-    Enemy* enemy2;
-    Npc* npc2;
-    f32 posX, posZ;
-    s32 func;
-
-    if (isInitialCall || (enemy->unk_B0 & 4)) {
-        script->functionTemp[0].s = 0;
-        npc->duration = 0;
-        npc->flags |= 0x102;
-        enemy->flags |= 0x1F300000;
-        npc->pos.x = 0.0f;
-        npc->pos.y = -1000.0f;
-        npc->pos.z = 0.0f;
-        if (enemy->unk_B0 & 4) {
-            enemy->unk_B0 &= ~4;
-        }
-    }
-
-    func = script->functionTemp[0].s;
-    switch (func) {
-        case 0:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            npc2 = get_npc_unsafe(enemy2->npcID);
-            enemy->unk_07 = 1;
-            if (enemy2->varTable[0] == 3) {
-                if (enemy->varTable[15] != 0) {
-                    func_800494C0(npc2, enemy->varTable[15], 0);
-                }
-                posX = npc2->pos.x;
-                posZ = npc2->pos.z;
-                add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw);
-
-                npc->pos.x = posX;
-                enemy->unk_10.x = npc->pos.x;
-
-                npc->pos.y = npc2->pos.y + enemy->varTable[0];
-                enemy->unk_10.y = npc->pos.y;
-
-                npc->pos.z = posZ;
-                enemy->unk_10.z = npc->pos.z;
-
-                npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-                enemy->flags &= 0xE0EFFFFF;
-                npc->duration = 0;
-                script->functionTemp[0].s = 1;
-            }
-            break;
-
-        case 1:
-            enemy2 = get_enemy(enemy->npcID - 1);
-            get_npc_unsafe(enemy2->npcID);
-            npc->duration++;
-            if (npc->duration >= enemy->varTable[4]) {
-                enemy->unk_07 = 0;
-            }
-            if (enemy2->varTable[0] == 4) {
-                enemy->flags |= 0x1F100000;
-                npc->pos.x = 0.0f;
-                npc->pos.y = -1000.0f;
-                npc->pos.z = 0.0f;
-                enemy->unk_07 = func;
-                script->functionTemp[0].s = 0;
-            }
-            break;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc7.inc.c"
 
 void N(func_8024061C_C52B5C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -922,7 +852,7 @@ ApiStatus N(func_80240E20_C53360)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 40.0f;
+    territory.unk_18 = 40.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -1026,7 +956,7 @@ ApiStatus N(func_80241170_C536B0)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_dgb/dgb_16/dgb_16.h b/src/world/area_dgb/dgb_16/dgb_16.h
index 57fa5fe04a..c20e70bdb3 100644
--- a/src/world/area_dgb/dgb_16/dgb_16.h
+++ b/src/world/area_dgb/dgb_16/dgb_16.h
@@ -4,7 +4,7 @@
 #define NAMESPACE dgb_16
 
 ApiStatus N(func_80240E20_C53360)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(update_starpoints_display_C528FC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc7)(ScriptInstance* script, s32 isInitialCall);
 
 extern NpcGroupList N(npcGroupList_8024318C);
 extern Script N(80241780);
diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c
index 0548d88733..9f86cf92e6 100644
--- a/src/world/area_dgb/dgb_18/C55F40.c
+++ b/src/world/area_dgb/dgb_18/C55F40.c
@@ -638,9 +638,7 @@ static s32 N(pad_36D8)[] = {
     0x00000000, 0x00000000,
 };
 
-s32 N(D_802436E0_C59620) = {
-    0x00000000,
-};
+s32** N(D_802436E0_C59620) = NULL;
 
 Script N(802436E4) = SCRIPT({
     group 0;
@@ -719,85 +717,11 @@ ApiStatus N(func_80240000_C55F40)(ScriptInstance* script, NpcAISettings* aiSetti
     return ApiStatus_DONE1;
 }
 
-void N(func_80240158_C56098)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    f32 x, z;
-    s32 var;
-
-    if (aiSettings->unk_14 >= 0) {
-        if (script->functionTemp[1].s <= 0) {
-            script->functionTemp[1].s = aiSettings->unk_14;
-            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
-                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-                func_800494C0(npc, 0x2F4, 0x200000);
-                if (enemy->npcSettings->unk_2A & 1) {
-                    script->functionTemp[0].s = 10;
-                } else {
-                    script->functionTemp[0].s = 12;
-                }
-                return;
-            }
-        }
-        script->functionTemp[1].s--;
-    }
-
-    if (npc->turnAroundYawAdjustment == 0) {
-        if (npc->moveSpeed < 4.0) {
-            func_8003D660(npc, 0);
-        } else {
-            func_8003D660(npc, 1);
-        }
-
-        x = script->functionTemp[2].s[enemy->territory->patrol.points].x;
-        z = script->functionTemp[2].s[enemy->territory->patrol.points].z;
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) {
-            script->functionTemp[0].s = 2;
-            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
-            if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) ||
-                (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) {
-                script->functionTemp[0].s = 4;
-            }
-            if (rand_int(10000) % 100 < aiSettings->moveTime) {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc13.inc.c"
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
-void N(func_802404C0_C56400)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
-        func_800494C0(npc, 0x2F4, 0x200000);
-        if (!(enemy->npcSettings->unk_2A & 1)) {
-            script->functionTemp[0].s = 12;
-        } else {
-            script->functionTemp[0].s = 10;
-        }
-    } else if (npc->turnAroundYawAdjustment == 0) {
-        npc->duration--;
-        if (npc->duration == 0) {
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s != 0) {
-                if (!(enemy->npcSettings->unk_2A & 0x10)) {
-                    npc->yaw = clamp_angle(npc->yaw + 180.0f);
-                }
-                npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1);
-            } else {
-                script->functionTemp[0].s = 4;
-            }
-        }
-    }
-}
+#include "world/common/UnkFunc14.inc.c"
 
 ApiStatus N(func_8024067C_C565BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
@@ -823,46 +747,11 @@ ApiStatus N(func_8024067C_C565BC)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-ApiStatus N(func_8024094C_C5688C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 var;
-
-    if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) {
-        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var);
-        npc->currentAnim = enemy->animList[0];
-        npc->duration = 25;
-        script->functionTemp[0].s = 14;
-    } else {
-        func_8003D660(npc, 1);
-        npc_move_heading(npc, npc->moveSpeed, npc->yaw);
-        if (npc->duration > 0) {
-            npc->duration--;
-        } else {
-            script->functionTemp[0].s = 12;
-        }
-    }
-}
+#include "world/common/UnkFunc15.inc.c"
 
 #include "world/common/UnkNpcDurationFlagFunc.inc.c"
 
-void N(func_80240AD4_C56A14)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    Enemy* enemy = script->owner1.enemy;
-    Npc* npc = get_npc_unsafe(enemy->npcID);
-    s32 i;
-
-    for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) {
-        if (i[enemy->territory->patrol.points].y <= npc->pos.y) {
-            script->functionTemp[2].s = i;
-            break;
-        }
-    }
-
-    npc->moveSpeed = aiSettings->moveSpeed;
-    npc->currentAnim = enemy->animList[1];
-    script->functionTemp[1].s = 0;
-    script->functionTemp[0].s = 1;
-}
+#include "world/common/UnkFunc16.inc.c"
 
 ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
@@ -879,7 +768,7 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -899,7 +788,7 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -916,12 +805,12 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
         case 0:
             N(func_80240000_C55F40)(script, npcAISettings, territoryPtr);
         case 1:
-            N(func_80240158_C56098)(script, npcAISettings, territoryPtr);
+            N(UnkFunc13)(script, npcAISettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_802404C0_C56400)(script, npcAISettings, territoryPtr);
+            N(UnkFunc14)(script, npcAISettings, territoryPtr);
             break;
         case 4:
             N(func_8024067C_C565BC)(script, npcAISettings, territoryPtr);
@@ -934,13 +823,13 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_8024094C_C5688C)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
             break;
         case 15:
-            N(func_80240AD4_C56A14)(script, npcAISettings, territoryPtr);
+            N(UnkFunc16)(script, npcAISettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c
index 130dfeb201..af351bfb0a 100644
--- a/src/world/area_dgb/dgb_18/C56EF0.c
+++ b/src/world/area_dgb/dgb_18/C56EF0.c
@@ -1,23 +1,19 @@
 #include "dgb_18.h"
 
 ApiStatus N(func_80240FB0_C56EF0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_802436E0_C59620);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802436E0_C59620) == NULL) {
+        N(D_802436E0_C59620) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802436E0_C59620)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802436E0_C59620)[i];
         }
-        ptr = &N(D_802436E0_C59620);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802436E0_C59620));
+        N(D_802436E0_C59620) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_dgb/dgb_18/dgb_18.h b/src/world/area_dgb/dgb_18/dgb_18.h
index 70fcff195f..caceb467d4 100644
--- a/src/world/area_dgb/dgb_18/dgb_18.h
+++ b/src/world/area_dgb/dgb_18/dgb_18.h
@@ -6,9 +6,9 @@
 ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall);
 
+extern s32** N(D_802436E0_C59620);
+
 extern NpcGroupList N(npcGroupList_802436B4);
 extern Script N(main);
 extern Script N(makeEntities);
 extern Script N(npcAI_80242834);
-
-extern s32 N(D_802436E0_C59620);
diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c
index acd6307357..b0db98d8d0 100644
--- a/src/world/area_dro/dro_01/95B200.c
+++ b/src/world/area_dro/dro_01/95B200.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240034_95B234);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240034_95B234);
 
 #include "world/common/SomeXYZFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_802402E0_95B4E0);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240404_95B604);
+#include "world/common/UnkFunc26.inc.c"
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 6125e57f7a..78752b2357 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -1,9 +1,2850 @@
 #include "dro_01.h"
+#include "script_api/battle.h"
+#include "message_ids.h"
+#include "sprite/npc/artist_toad.h"
+#include "sprite/npc/chuck_quizmo.h"
+#include "sprite/npc/dryite.h"
+#include "sprite/npc/mouser.h"
+#include "sprite/npc/three_sisters.h"
+#include "sprite/npc/world_parakarry.h"
 
 #define UNK_ALPHA_FUNC_NPC 10
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802405E0_95B7E0);
+extern s16 gCurrentCamID;
+extern s16 MessagePlural;
+extern s16 MessageSingular;
+
+enum {
+    NPC_MOUSER0,
+    NPC_DRYITE0,
+    NPC_DRYITE1,
+    NPC_DRYITE2,
+    NPC_DRYITE3,
+    NPC_ARTIST_TOAD,
+    NPC_MOUSER1,
+    NPC_THREE_SISTERS0,
+    NPC_THREE_SISTERS1,
+    NPC_THREE_SISTERS2,
+    NPC_CHUCK_QUIZMO,
+    NPC_DRYITE4,
+    NPC_DRYITE5,
+};
+
+typedef struct N(Unk_Struct_1) {
+    s32 unk_00;
+    s32 unk_04;
+    s32 unk_08;
+    s32 unk_0C;
+    s32 unk_10;
+    void (*unk_14)(struct Unk_Struct_1*, s32);
+    s32 unk_18;
+    s32 unk_1C;
+    s32 unk_20;
+    f32 unk_24;
+    f32 unk_28;
+    f32 unk_2C;
+    f32 unk_30;
+    f32 unk_34;
+    s32 unk_38;
+} N(Unk_Struct_1);
+
+typedef struct {
+    s32 unk_00;
+    s32 unk_04;
+    s32 unk_08;
+    s32 unk_0C;
+    s32 unk_10;
+    void (*unk_14)(N(Unk_Struct_1)*, s32);
+} N(Unk_Struct_2);
+
+void N(func_802430C8_95E2C8)(N(Unk_Struct_1)* ptr, s32 arg1);
+
+Script N(80248504);
+
+typedef struct {
+    /* 0x00 */ s32 flags;
+    /* 0x04 */ s32 effectIndex;
+    /* 0x08 */ s32 instanceCounter;
+    /* 0x0C */ EffectInstanceDataThing* unk_0C;
+    /* 0x10 */ void (*update)(EffectInstance* effectInst);
+    /* 0x14 */ void (*renderWorld)(EffectInstance* effectInst);
+    /* 0x18 */ void (*unk_18)(EffectInstance* effectInst);
+    /* 0x1C */ void* unk_1C;
+} N(temp);
+
+static s32 N(D_8024DFC0);
+static s8 N(pad_D_8024DFC4)[0x10];
+static s32 N(D_8024DFD8);
+static s8 N(pad_D_8024DFDC)[0x4];
+static N(temp)* N(D_8024DFE0);
+static N(temp)* N(D_8024DFE4);
+static N(temp)* N(D_8024DFE8);
+static s8 N(pad_D_8024DFEC)[0x4];
+static s32 N(D_8024DFF0)[112];
+static s8 N(pad_D_8024E1B0)[0x4]; // Probably part of the above
+static s32 N(D_8024E1B4);
+
+EntryList N(entryList) = {
+    { -342.0f, 0.0f, 316.0f, 45.0f },
+    { 488.0f, 1.0f, 4.0f, 270.0f },
+    { 430.0f, 35.0f, -120.0f, 180.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { -211.0f, 50.0f, -50.0f, 120.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_dro_01_tattle },
+};
+
+// *INDENT-OFF*
+Script N(80243BB0) = {
+    SI_CMD(ScriptOpcode_CALL, GetEntryID, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_MATCH, SI_VAR(0)),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 3),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 4),
+        SI_CMD(ScriptOpcode_END_CASE_MULTI),
+        SI_CMD(ScriptOpcode_CASE_ELSE),
+            SI_CMD(ScriptOpcode_CALL, SetMusicTrack, 0, 21, 0, 8),
+        SI_CMD(ScriptOpcode_END_CASE_MULTI),
+    SI_CMD(ScriptOpcode_END_MATCH),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80243C30) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    DisablePartnerAI(0);
+    HidePlayerShadow(TRUE);
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        EnableNpcShadow(NPC_PARTNER, FALSE);
+        SetNpcPos(NPC_PARTNER, 0, -1000, 0);
+    }
+    GetEntryID(SI_VAR(0));
+    N(GetEntryPos)();
+    SI_VAR(2) -= 40;
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    InterpPlayerYaw(SI_VAR(4), 0);
+    PlaySound(0x163);
+    func_802D286C(256);
+    func_802D2520(ANIM_STAND_STILL, 5, 2, 1, 1, 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    loop 40 {
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+    }
+    sleep 3;
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        spawn {
+            DisablePartnerAI(0);
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(2) -= 3;
+            SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetNpcFlagBits(NPC_PARTNER, ((0x00000002)), FALSE);
+            EnablePartnerAI();
+            EnableNpcShadow(NPC_PARTNER, TRUE);
+        }
+    }
+    sleep 2;
+    func_802D2520(ANIM_STAND_STILL, 0, 0, 0, 0, 0);
+    sleep 1;
+    SetPlayerAnimation(ANIM_10002);
+    DisablePlayerPhysics(FALSE);
+    DisablePlayerInput(FALSE);
+    HidePlayerShadow(FALSE);
+0:
+    N(GetCurrentFloor)();
+    sleep 1;
+    if (SI_VAR(0) != -1) {
+        goto 0;
+    }
+    spawn 0xFE363C8A;
+});
+
+Script N(80243F84) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    HidePlayerShadow(TRUE);
+    ModifyColliderFlags(0, SI_VAR(11), 0x7FFFFE00);
+    GetEntryID(SI_VAR(0));
+    N(GetEntryPos)();
+    SI_VAR(5) = SI_VAR(1);
+    SI_VAR(6) = SI_VAR(2);
+    SI_VAR(7) = SI_VAR(3);
+    SI_VAR(2) += 2;
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    InterpPlayerYaw(SI_VAR(4), 0);
+    if (SI_VAR(4) == 90) {
+        SI_VAR(5) += 40;
+    } else {
+        SI_VAR(5) -= 40;
+    }
+    UseSettingsFrom(0, SI_VAR(5), SI_VAR(6), SI_VAR(7));
+    SetPanTarget(0, SI_VAR(5), SI_VAR(6), SI_VAR(7));
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        DisablePartnerAI(0);
+        EnableNpcShadow(NPC_PARTNER, FALSE);
+        SetNpcPos(NPC_PARTNER, 0, -1000, 0);
+        InterpNpcYaw(NPC_PARTNER, SI_VAR(0), 0);
+    }
+    sleep 1;
+    PlaySound(0x163);
+    spawn {
+        sleep 25;
+        HidePlayerShadow(FALSE);
+    }
+    func_802D286C(2304);
+    func_802D2520(ANIM_10002, 5, 3, 1, 1, 0);
+    loop 40 {
+        N(SomeXYZFunc2)(1.0);
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+    }
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        spawn {
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(2) -= 3;
+            SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EnableNpcShadow(NPC_PARTNER, TRUE);
+            EnablePartnerAI();
+        }
+    }
+    sleep 5;
+    func_802D2520(ANIM_10002, 0, 0, 0, 0, 0);
+    ModifyColliderFlags(1, SI_VAR(11), 0x7FFFFE00);
+    DisablePlayerInput(FALSE);
+    DisablePlayerPhysics(FALSE);
+    PanToTarget(0, 0, 0);
+    spawn 0xFE363C8A;
+});
+
+Script N(80244374) = SCRIPT({
+    N(UnkFunc25)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        GetCurrentPartnerID(SI_VAR(1));
+        if (SI_VAR(1) != 6) {
+            return;
+        } else {
+            func_802D2B6C();
+            DisablePlayerInput(TRUE);
+        }
+    } else {
+        DisablePlayerInput(TRUE);
+    }
+    await N(80244450);
+});
+
+Script N(80244450) = SCRIPT({
+    N(SetPlayerStatusAnimFlags100000)();
+    group 27;
+    DisablePlayerPhysics(TRUE);
+    HidePlayerShadow(TRUE);
+    SI_VAR(0) = SI_VAR(10);
+    N(GetEntryPos)();
+    PlayerMoveTo(SI_VAR(1), SI_VAR(3), 3);
+    SI_VAR(0) = SI_VAR(10);
+    N(GetEntryPos)();
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    SetPlayerFlagBits(2097152, 1);
+    N(GetCurrentCameraYawClamped180)();
+    InterpPlayerYaw(SI_VAR(0), 0);
+    sleep 2;
+    SetPlayerFlagBits(2097152, 0);
+    PlaySound(0x163);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    spawn {
+        sleep 4;
+        loop 40 {
+            SI_VAR(1) -= 1;
+            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+    }
+    func_802D286C(2048);
+    func_802D2520(ANIM_10002, 5, 2, 1, 1, 0);
+    sleep 25;
+    await 0xFE363C8C;
+});
+
+Script N(8024462C) = SCRIPT({
+    IsPlayerOnValidFloor(SI_VAR(0));
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    GetPlayerActionState(SI_VAR(0));
+    if (SI_VAR(0) == 26) {
+        return;
+    }
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        GetCurrentPartnerID(SI_VAR(1));
+        if (SI_VAR(1) != 6) {
+            return;
+        } else {
+            func_802D2B6C();
+            DisablePlayerInput(TRUE);
+        }
+    } else {
+        DisablePlayerInput(TRUE);
+    }
+    group 27;
+    N(SetPlayerStatusAnimFlags100000)();
+    DisablePlayerPhysics(TRUE);
+    ModifyColliderFlags(0, SI_VAR(11), 0x7FFFFE00);
+    SI_VAR(0) = SI_VAR(10);
+    N(GetEntryPos)();
+    SI_VAR(5) = SI_VAR(1);
+    SI_VAR(6) = SI_VAR(2);
+    SI_VAR(6) += 2;
+    SI_VAR(7) = SI_VAR(3);
+    SI_VAR(8) = SI_VAR(4);
+    SI_VAR(8) += 180;
+    if (SI_VAR(4) >= 360) {
+        SI_VAR(4) -= 360;
+    }
+    InterpPlayerYaw(SI_VAR(8), 1);
+    sleep 1;
+    PlaySound(0x163);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPlayerPos(SI_VAR(0), SI_VAR(6), SI_VAR(7));
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    func_802D286C(2048);
+    func_802D2520(ANIM_STAND_STILL, 5, 3, 1, 1, 0);
+    spawn {
+        sleep 8;
+        HidePlayerShadow(TRUE);
+    }
+    spawn {
+        sleep 3;
+        loop 40 {
+            N(SomeXYZFunc2)(1.0);
+            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+    }
+    sleep 25;
+    await 0xFE363C8C;
+});
+
+Script N(exitWalk_80244960) = SCRIPT({
+    group 27;
+    SI_SAVE_FLAG(761) = 0;
+    UseExitHeading(60, 0);
+    spawn ExitWalk;
+    GotoMap("sbk_36", 1);
+    sleep 100;
+});
+
+Script N(exitWalk_802449CC) = EXIT_WALK_SCRIPT(60,  1, "dro_02",  0);
+
+Script N(80244A28) = SCRIPT({
+    bind N(exitWalk_80244960) to TRIGGER_FLOOR_ABOVE 1;
+    bind N(exitWalk_802449CC) to TRIGGER_FLOOR_ABOVE 5;
+});
+
+Script N(80244A70) = SCRIPT({
+    PlaySound(0x80000060);
+    UseSettingsFrom(0, 175, 0, -201);
+    SetPanTarget(0, 175, 0, -201);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    N(UnkFunc27)(2, 0, 3);
+    N(UnkFunc27)(1, -1, 3);
+    N(UnkFunc26)(3, 44, 32, 177, 0, 0, 0, 0, 0, 0);
+    DisablePlayerInput(TRUE);
+    spawn {
+        ShakeCam(0, 0, 300, 0.2001953125);
+    }
+    spawn {
+        sleep 60;
+        GetEntryID(SI_VAR(0));
+        if (SI_VAR(0) == 3) {
+            GotoMap("dro_02", 2);
+        } else {
+            GotoMap("dro_02", 3);
+        }
+        sleep 100;
+    }
+});
+
+Script N(enterWalk_80244C14) = SCRIPT({
+    GetLoadType(SI_VAR(1));
+    if (SI_VAR(1) == 1) {
+        spawn EnterSavePoint;
+        spawn N(80244A28);
+        return;
+    }
+    GetEntryID(SI_VAR(0));
+    match SI_VAR(0) {
+        == 2 {
+            if (SI_SAVE_FLAG(1939) == 0) {
+                DisablePlayerInput(TRUE);
+                DisablePlayerPhysics(TRUE);
+                GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SetPlayerPos(SI_VAR(0), -1000, SI_VAR(2));
+                sleep 30;
+                PlaySound(SOUND_UNKNOWN_208E);
+                SI_SAVE_FLAG(1939) = 1;
+                sleep 30;
+                SetPlayerActionState(0);
+                SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                DisablePlayerPhysics(FALSE);
+                DisablePlayerInput(FALSE);
+            }
+            SI_VAR(10) = N(80244A28);
+            await N(80243C30);
+        }
+        3, 4 {
+            await N(80244A70);
+        }
+        == 10 {
+            spawn 0x80285C50;
+            spawn N(80244A28);
+        }
+        else {
+            SI_VAR(0) = N(80244A28);
+            spawn EnterWalk;
+        }
+    }
+    sleep 1;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_DRY_DRY_OUTPOST;
+    SetSpriteShading(-1);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    SetCamLeadPlayer(0, 0);
+    SI_SAVE_FLAG(1973) = 1;
+    if (STORY_PROGRESS < STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) {
+        STORY_PROGRESS = STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST;
+    }
+    match STORY_PROGRESS {
+        -53..6 {
+            MakeNpcs(0, N(npcGroupList_8024B47C));
+        }
+        else {
+            MakeNpcs(0, N(npcGroupList_8024B464));
+        }
+    }
+    func_802D3398();
+    await N(makeEntities);
+    MakeShop(N(shopItemPositions_8024BA68), N(shopInventory_8024B4FC), N(shopPriceList_8024B550), 0);
+    MakeShopOwner(N(shopOwnerNPC_8024BA80));
+    await N(8024C218);
+    spawn N(8024C2EC);
+    spawn N(80243BB0);
+    spawn N(enterWalk_80244C14);
+    sleep 1;
+    spawn N(8024DD78);
+});
+
+s32 N(pad_5004)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+NpcAISettings N(npcAISettings_80245010) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 60,
+    .waitTime = 30,
+    .unk_14 = -1,
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80245040) = SCRIPT({
+    DoBasicAI(N(npcAISettings_80245010));
+});
+
+NpcSettings N(npcSettings_80245060) = {
+    .height = 26,
+    .radius = 23,
+    .ai = &N(npcAI_80245040),
+    .level = 99,
+    .unk_2A = 16,
+};
+
+NpcAISettings N(npcAISettings_8024508C) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 30,
+    .waitTime = 30,
+    .unk_14 = -1,
+    .unk_2C = 1,
+};
+
+Script N(npcAI_802450BC) = SCRIPT({
+    N(func_80241174_95C374)(N(npcAISettings_8024508C));
+});
+
+NpcSettings N(npcSettings_802450DC) = {
+    .height = 26,
+    .radius = 23,
+    .ai = &N(npcAI_802450BC),
+    .level = 99,
+    .unk_2A = 16,
+};
+
+NpcSettings N(npcSettings_80245108) = {
+    .height = 26,
+    .radius = 23,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80245134) = {
+    .height = 22,
+    .radius = 25,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80245160) = {
+    .height = 30,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_8024518C) = {
+    .height = 23,
+    .radius = 19,
+    .level = 99,
+};
+
+s32** N(D_802451B8_9603B8) = NULL;
+
+Script N(802451BC) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 0);
+    return;
+});
+
+Script N(802451EC) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 16);
+    return;
+});
+
+u8 N(quizAnswers)[] = {
+    0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00,
+    0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02,
+    0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00,
+    0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01,
+    0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01,
+    0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01,
+    0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02,
+    0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01,
+};
+
+typedef struct {
+    s32 unk_00;
+    s32 unk_04;
+} N(quizReqStruct);
+
+N(quizReqStruct) N(quizRequirements)[] = {
+    { -108, 0 }, { -76, 10 },
+    { -54, 20 }, { -14, 30 },
+    {   6, 37 }, {  39, 44 },
+    {  58, 52 }, {  88, 60 },
+    {  96, 64 }, {   0, 64 },
+};
+
+Script N(802452AC) = SCRIPT({
+    N(GetGameStatus75)();
+    if (SI_VAR(0) <= 1) {
+        GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 300;
+        SetNpcJumpscale(NPC_SELF, 1);
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_C));
+        sleep 40;
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(8024535C) = SCRIPT({
+    N(GetCamVfov)(0, SI_ARRAY(0));
+    N(SetCamVfov)(0, 25);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetCamType(0, SI_VAR(1), SI_VAR(2));
+    SetCamType(0, SI_VAR(1), 0);
+    GetCamDistance(0, SI_VAR(0));
+    if (SI_VAR(0) > 0) {
+        SI_VAR(0) = (float) 370;
+    } else {
+        SI_VAR(0) = (float) -370;
+    }
+    SetCamDistance(0, SI_VAR(0));
+    GetCamPitch(0, SI_VAR(0), SI_VAR(1));
+    SI_VAR(0) = 13.0;
+    SI_VAR(1) = -10.0;
+    SetCamPitch(0, SI_VAR(0), SI_VAR(1));
+    PanToTarget(0, 0, 1);
+    SetCamLeadPlayer(0, 0);
+});
+
+Script N(802454F8) = SCRIPT({
+    GetNpcPos(NPC_CHUCK_QUIZMO, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(1) += 30;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetCamDistance(0, SI_VAR(0));
+    if (SI_VAR(0) > 0) {
+        SI_VAR(0) = (float) 17;
+    } else {
+        SI_VAR(0) = (float) -17;
+    }
+    SetCamDistance(0, SI_VAR(0));
+    SetCamSpeed(0, 90.0);
+    WaitForCam(0, 1.0);
+    SetCamSpeed(0, 1);
+});
+
+Script N(802455F4) = SCRIPT({
+    N(SetCamVfov)(0, SI_ARRAY(0));
+    PanToTarget(0, 0, 0);
+});
+
+Script N(80245630) = SCRIPT({
+    sleep 20;
+    N(UnkCameraFunc)(SI_ARRAY(1), SI_ARRAY(3), 83, SI_VAR(0), SI_VAR(1));
+    spawn {
+        SI_VAR(2) = (float) 0;
+        loop 60 {
+            SI_VAR(3) = (float) SI_VAR(0);
+            SI_VAR(4) = (float) SI_VAR(1);
+            SI_VAR(3) *= (float) SI_VAR(2);
+            SI_VAR(4) *= (float) SI_VAR(2);
+            SI_VAR(3) /= (float) 60;
+            SI_VAR(4) /= (float) 60;
+            SI_VAR(3) += (float) SI_ARRAY(1);
+            SI_VAR(4) += (float) SI_ARRAY(3);
+            SetPlayerPos(SI_VAR(3), SI_ARRAY(2), SI_VAR(4));
+            SI_VAR(2) += (float) 1;
+            sleep 1;
+        }
+        SI_VAR(3) = (float) SI_VAR(0);
+        SI_VAR(4) = (float) SI_VAR(1);
+        SI_VAR(3) += (float) SI_ARRAY(1);
+        SI_VAR(4) += (float) SI_ARRAY(3);
+        SetPlayerPos(SI_VAR(3), SI_ARRAY(2), SI_VAR(4));
+    }
+    N(UnkRotatePlayer)();
+    func_802D2884(SI_ARRAY(1), SI_ARRAY(3), 0);
+    SetPlayerAnimation(ANIM_10002);
+});
+
+Script N(802457E0) = SCRIPT({
+    GetNpcPos(NPC_PARTNER, SI_VAR(10), SI_VAR(11), SI_VAR(12));
+    N(UnkCameraFunc)(SI_VAR(10), SI_VAR(12), 108, SI_VAR(0), SI_VAR(1));
+    SI_VAR(5) = (float) SI_ARRAY(2);
+    SI_VAR(5) -= (float) SI_VAR(11);
+    spawn {
+        N(UnkMovePartner)();
+        SI_VAR(3) = (float) SI_VAR(0);
+        SI_VAR(4) = (float) SI_VAR(1);
+        SI_VAR(6) = (float) SI_VAR(5);
+        SI_VAR(3) += (float) SI_VAR(10);
+        SI_VAR(4) += (float) SI_VAR(12);
+        SI_VAR(6) += (float) SI_VAR(11);
+        SetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(6), SI_VAR(4));
+    }
+    N(UnkRotatePartner)();
+    NpcFacePlayer(NPC_PARTNER, 0);
+    SetNpcAnimation(NPC_PARTNER, 0x106);
+});
+
+Script N(80245918) = SCRIPT({
+    GetNpcPos(NPC_CHUCK_QUIZMO, SI_VAR(10), SI_VAR(11), SI_VAR(12));
+    N(UnkCameraFunc)(SI_VAR(10), SI_VAR(12), -70, SI_VAR(0), SI_VAR(1));
+    spawn {
+        SI_VAR(2) = (float) 0;
+        loop 60 {
+            SI_VAR(3) = (float) SI_VAR(0);
+            SI_VAR(4) = (float) SI_VAR(1);
+            SI_VAR(3) *= (float) SI_VAR(2);
+            SI_VAR(4) *= (float) SI_VAR(2);
+            SI_VAR(3) /= (float) 60;
+            SI_VAR(4) /= (float) 60;
+            SI_VAR(3) += (float) SI_VAR(10);
+            SI_VAR(4) += (float) SI_VAR(12);
+            SetNpcPos(NPC_CHUCK_QUIZMO, SI_VAR(3), SI_ARRAY(2), SI_VAR(4));
+            SI_VAR(2) += (float) 1;
+            sleep 1;
+        }
+    }
+    sleep 60;
+    NpcFacePlayer(NPC_CHUCK_QUIZMO, 0);
+    SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_1));
+});
+
+Script N(80245A84) = SCRIPT({
+    spawn N(80245630);
+    spawn N(802457E0);
+    await N(80245918);
+});
+
+Script N(80245AB8) = SCRIPT({
+    loop {
+        SetPlayerAnimation(ANIM_QUESTION);
+        sleep 20;
+    }
+});
+
+Script N(80245AF8) = SCRIPT({
+    SetPlayerAnimation(ANIM_THROW);
+    sleep 15;
+    SetPlayerAnimation(ANIM_10002);
+});
+
+Script N(80245B34) = SCRIPT({
+    loop {
+        SetPlayerAnimation(ANIM_10002);
+        sleep 1;
+        SetPlayerAnimation(ANIM_BEFORE_JUMP);
+        sleep 2;
+        SetPlayerAnimation(ANIM_MIDAIR_STILL);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_MIDAIR);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_10009);
+        sleep 2;
+        sleep 1;
+        SetPlayerAnimation(ANIM_BEFORE_JUMP);
+        sleep 2;
+        SetPlayerAnimation(ANIM_MIDAIR_STILL);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_MIDAIR);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_10009);
+        sleep 2;
+        sleep 1;
+        SetPlayerAnimation(ANIM_BEFORE_JUMP);
+        sleep 2;
+        SetPlayerAnimation(ANIM_MIDAIR_STILL);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_MIDAIR);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_10009);
+        sleep 2;
+    }
+    SetPlayerAnimation(ANIM_10002);
+    SetPlayerPos(SI_VAR(0), SI_ARRAY(2), SI_VAR(2));
+    sleep 1;
+});
+
+Script N(8024667C) = SCRIPT({
+    SetPlayerAnimation(ANIM_SHOCK_STILL);
+    loop {
+        sleep 1;
+    }
+});
+
+Script N(802466BC) = SCRIPT({
+    spawn {
+        N(UnkCameraFunc)(SI_ARRAY(1), SI_ARRAY(3), 25, SI_VAR(0), SI_VAR(1));
+        SI_VAR(2) = (float) SI_ARRAY(1);
+        SI_VAR(2) += (float) SI_VAR(0);
+        SI_VAR(3) = (float) SI_ARRAY(3);
+        SI_VAR(3) += (float) SI_VAR(1);
+        SetNpcAnimation(NPC_PARTNER, 0x102);
+        NpcMoveTo(NPC_PARTNER, SI_VAR(2), SI_VAR(3), 40);
+        SetNpcAnimation(NPC_PARTNER, 0x106);
+    }
+    PlayerMoveTo(SI_ARRAY(1), SI_ARRAY(3), 40);
+});
+
+Script N(80246798) = SCRIPT({
+    SI_VAR(1) = spawn N(80245B34);
+    sleep 60;
+    kill SI_VAR(1);
+    loop 5 {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 2;
+    }
+    sleep 20;
+    await N(802466BC);
+});
+
+Script N(80246848) = SCRIPT({
+    SI_VAR(1) = spawn N(8024667C);
+    sleep 60;
+    loop 5 {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 2;
+    }
+    sleep 20;
+    kill SI_VAR(1);
+    await N(802466BC);
+});
+
+// *INDENT-OFF*
+Script N(802468F8) = {
+    SI_CMD(ScriptOpcode_IF_GT, SI_SAVE_VAR(352), 63),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_ARRAY(1), SI_ARRAY(2), SI_ARRAY(3)),
+    SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, -1, 16),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(352), 63),
+        SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524298),
+    SI_CMD(ScriptOpcode_ELSE),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1767), 1),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524297),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524296),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1767), 1),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, ShowChoice, 1966093),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 1),
+        SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 11468804, 11468801, 0, 524300),
+        SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802452AC)),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1793), 1),
+    SI_CMD(ScriptOpcode_CALL, N(Set80151310_1)),
+    SI_CMD(ScriptOpcode_CALL, N(UnkAlphaFunc)),
+    SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(8024535C)),
+    SI_CMD(ScriptOpcode_CALL, DisablePartnerAI, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, -4, 512, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 10, 512, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, -4, 328, 1),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 10, 256, 1),
+    SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, -4, 262),
+    SI_CMD(ScriptOpcode_SPAWN_GET_ID, N(80245A84), SI_VAR(1)),
+    SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 11468804, 11468801, 0, 524299),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 137),
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+            SI_CMD(ScriptOpcode_BREAK_LOOP),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241BE0_95CDE0)),
+    SI_CMD(ScriptOpcode_LOOP, 5),
+        SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 1),
+        SI_CMD(ScriptOpcode_CALL, SetPlayerPos, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), 2883584),
+    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), SI_SAVE_VAR(352)),
+    SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468805, 11468806, 0, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerAnimation, 65576),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), 2949120),
+    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), SI_SAVE_VAR(352)),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 142),
+    SI_CMD(ScriptOpcode_CALL, ShowChoice, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_KILL_SCRIPT, SI_VAR(1)),
+    SI_CMD(ScriptOpcode_CALL, StopSound, 142),
+    SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80245AF8)),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 141),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241EE0_95D0E0), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 0),
+    SI_CMD(ScriptOpcode_CALL, N(func_802424D4_95D6D4)),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 40),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241B5C_95CD5C)),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 110),
+        SI_CMD(ScriptOpcode_CALL, CloseChoice),
+        SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 0),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 1),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468807),
+        SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 1),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_CALL, N(func_80241EAC_95D0AC), 1),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, N(func_80241EAC_95D0AC), 2),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 138),
+        SI_CMD(ScriptOpcode_CALL, N(func_80241F78_95D178)),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+            SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 50),
+            SI_CMD(ScriptOpcode_CALL, N(UnkCameraFunc), 0, 0, 83, SI_VAR(0), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 7, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 68, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 60, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(1), -3),
+            SI_CMD(ScriptOpcode_CALL, N(UnkCameraFunc), 0, 0, 58, SI_VAR(0), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 7, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 68, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 60, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 30),
+            SI_CMD(ScriptOpcode_CALL, N(UnkCameraFunc), 0, 0, 93, SI_VAR(0), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 7, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 68, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 60, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+        SI_CMD(ScriptOpcode_SPAWN_GET_ID, N(80246798), SI_VAR(1)),
+        SI_CMD(ScriptOpcode_ADD, SI_SAVE_VAR(352), 1),
+        SI_CMD(ScriptOpcode_IF_GT, SI_SAVE_VAR(352), 63),
+            SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, -1, -1, 0, 524304),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468806),
+            SI_CMD(ScriptOpcode_LOOP, 0),
+                SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+                    SI_CMD(ScriptOpcode_BREAK_LOOP),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468805),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(0), 348),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(1), 3),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802451BC)),
+            SI_CMD(ScriptOpcode_CALL, AddStarPieces, 1),
+            SI_CMD(ScriptOpcode_CALL, N(func_80241EAC_95D0AC), 15),
+            SI_CMD(ScriptOpcode_CALL, N(func_80241F60_95D160)),
+            SI_CMD(ScriptOpcode_CALL, SetMessageValue, SI_SAVE_VAR(352), 0),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524305),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, -1, -1, 0, 524302),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468806),
+            SI_CMD(ScriptOpcode_LOOP, 0),
+                SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+                    SI_CMD(ScriptOpcode_BREAK_LOOP),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468805),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(0), 348),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(1), 1),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802451BC)),
+            SI_CMD(ScriptOpcode_CALL, AddStarPieces, 1),
+            SI_CMD(ScriptOpcode_CALL, N(func_80241EAC_95D0AC), 15),
+            SI_CMD(ScriptOpcode_CALL, N(func_80241F60_95D160)),
+            SI_CMD(ScriptOpcode_CALL, SetMessageValue, SI_SAVE_VAR(352), 0),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(352), 1),
+                SI_CMD(ScriptOpcode_CALL, SetMessageString, &MessageSingular, 1),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_CALL, SetMessageString, &MessagePlural, 1),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524303),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 1),
+    SI_CMD(ScriptOpcode_ELSE),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468809),
+        SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 2),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 541),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 139),
+        SI_CMD(ScriptOpcode_SPAWN_GET_ID, N(80246848), SI_VAR(1)),
+        SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(2), SI_VAR(3), SI_VAR(4)),
+        SI_CMD(ScriptOpcode_CALL, PlayEffect, 43, 0, SI_VAR(2), SI_VAR(3), SI_VAR(4), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+        SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, -1, -1, 0, 524301),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468810),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 0),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241EE0_95D0E0), -1),
+    SI_CMD(ScriptOpcode_CALL, EnablePartnerAI),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 143),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 45),
+        SI_CMD(ScriptOpcode_CALL, StopSound, 137),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241F94_95D194)),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241DF8_95CFF8)),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802452AC)),
+    SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(802455F4)),
+    SI_CMD(ScriptOpcode_CALL, N(UnkFunc29)),
+    SI_CMD(ScriptOpcode_CALL, N(Set80151310_0)),
+    SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1793), 0),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80247628) = SCRIPT({
+    N(func_802415AC_95C7AC)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    SetNpcFlagBits(NPC_SELF, ((0x01000000)), FALSE);
+    SetNpcSprite(-1, 0xAF0001);
+    N(UnkFunc31)();
+});
+
+Script N(8024769C) = {
+    SI_CMD(ScriptOpcode_USE_ARRAY, 0x8024DFC8),
+    SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1769), 1),
+    SI_CMD(ScriptOpcode_CALL, DisablePlayerPhysics, 1),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerFlagBits, 4194304, 1),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802468F8)),
+    SI_CMD(ScriptOpcode_CALL, DisablePlayerPhysics, 0),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerFlagBits, 4194304, 0),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(8024771C) = SCRIPT({
+    N(GetNpcUnsafeOwner2)();
+});
+
+NpcAISettings N(npcAISettings_80247738) = {
+    .moveSpeed = 0.7f,
+    .moveTime = 30,
+    .waitTime = 20,
+    .unk_14 = -1,
+    .unk_2C = 1,
+};
+
+Script N(80247768) = SCRIPT({
+    DoBasicAI(N(npcAISettings_80247738));
+});
+
+NpcSettings N(npcSettings_80247788) = {
+    .unk_00 = { 0x00, 0xAF, 0x00, 0x01 },
+    .height = 35,
+    .radius = 28,
+    .otherAI = &N(80247628),
+    .onInteract = &N(8024769C),
+    .aux = &N(8024771C),
+    .flags = 0x00000D01,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_802477B4) = {
+    .unk_00 = { 0x00, 0xAF, 0x00, 0x01 },
+    .height = 35,
+    .radius = 28,
+    .otherAI = &N(80247628),
+    .onInteract = &N(8024769C),
+    .ai = &N(80247768),
+    .aux = &N(8024771C),
+    .flags = 0x00000C01,
+    .level = 99,
+    .unk_2A = 16,
+};
+
+s32 N(D_802477E0_9629E0) = {
+    0x00000000,
+};
+
+s32 N(D_802477E4_9629E4) = {
+    0x00000000,
+};
+
+Script N(802477E8) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D6420();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveKeyItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            SI_VAR(0) |= (const)  0x50000;
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_80242784_95D984)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(8024792C) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_802427BC_95D9BC), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(802477E8), 0x10, 0, N(D_8024DFF0), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_80242730_95D930), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(8024797C) = SCRIPT({
+    loop {
+        GetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+        N(UnkYawFunc)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+        SetItemPos(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5));
+        sleep 1;
+    }
+});
+
+Script N(802479FC) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D6420();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveKeyItemAt(SI_VAR(1));
+            DisablePartnerAI(0);
+            GetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(UnkYawFunc)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            SI_VAR(0) |= (const)  0x50000;
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SI_VAR(10) = spawn N(8024797C);
+            SetNpcAnimation(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_2));
+            GetAngleBetweenNPCs(SI_VAR(9), -4, SI_VAR(11));
+            GetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            GetNpcPos(SI_VAR(9), SI_VAR(6), SI_VAR(7), SI_VAR(8));
+            SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
+            if (SI_VAR(11) <= 180) {
+                SI_VAR(6) += 20;
+            } else {
+                SI_VAR(6) += -20;
+            }
+            SI_VAR(7) += 10;
+            SetNpcJumpscale(NPC_PARTNER, 0.0);
+            NpcJump1(NPC_PARTNER, SI_VAR(6), SI_VAR(7), SI_VAR(8), 20);
+            kill SI_VAR(10);
+            RemoveItemEntity(SI_VAR(0));
+            sleep 20;
+            GetNpcYaw(-4, SI_VAR(10));
+            SI_VAR(10) += 180;
+            InterpNpcYaw(NPC_PARTNER, SI_VAR(10), 0);
+            sleep 5;
+            NpcJump1(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5), 20);
+            SetNpcAnimation(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_1));
+            NpcFaceNpc(NPC_PARTNER, SI_VAR(9), 0);
+            sleep 5;
+            SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), FALSE);
+            EnablePartnerAI();
+            sleep 5;
+        }
+    }
+    N(func_80242784_95D984)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(80247D20) = {
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), SI_VAR(11)),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(1), SI_VAR(2)),
+    SI_CMD(ScriptOpcode_CALL, N(func_802427BC_95D9BC), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(802479FC), 0x10, 0, N(D_8024DFF0), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_80242730_95D930), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(80247D90) = SCRIPT({
+    SI_VAR(12) = 0;
+    if (STORY_PROGRESS < STORY_CH2_PARAKARRY_JOINED_PARTY) {
+        return;
+    }
+    N(func_80243014_95E214)();
+    GetCurrentPartnerID(SI_VAR(0));
+    FindKeyItem(SI_VAR(5), SI_VAR(1));
+    if (SI_VAR(0) == 4) {
+        if (SI_VAR(1) != -1) {
+            DisablePartnerAI(0);
+            PlayerFaceNpc(SI_VAR(2), 0);
+            sleep 1;
+            GetNpcPos(SI_VAR(2), SI_VAR(13), SI_VAR(0), SI_VAR(14));
+            GetNpcPos(NPC_PARTNER, SI_VAR(13), SI_VAR(14), SI_VAR(15));
+            SetNpcJumpscale(NPC_PARTNER, 0.0);
+            SI_VAR(0) += 10;
+            NpcJump1(NPC_PARTNER, SI_VAR(13), SI_VAR(0), SI_VAR(15), 10);
+            SpeakToNpc(-4, 262150, 262145, 0, SI_VAR(2), SI_VAR(7));
+            EnablePartnerAI();
+            await N(80247D20);
+            match SI_VAR(0) {
+                == -1 {
+                    DisablePartnerAI(0);
+                    sleep 1;
+                    SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 5, SI_VAR(8));
+                    EnablePartnerAI();
+                    SI_VAR(12) = 1;
+                }
+                else {
+                    DisablePartnerAI(0);
+                    sleep 1;
+                    SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 5, SI_VAR(9));
+                    if (SI_VAR(10) != 0) {
+                        SpeakToPlayer(SI_VAR(2), SI_VAR(3), SI_VAR(4), 0, SI_VAR(10));
+                    }
+                    EnablePartnerAI();
+                    if (SI_VAR(6) != 0) {
+                        SI_VAR(0) = SI_VAR(6);
+                        SI_VAR(1) = 1;
+                        await N(802451BC);
+                        AddKeyItem(SI_VAR(6));
+                    }
+                    SI_VAR(12) = 2;
+                }
+            }
+        }
+    }
+    N(func_80243058_95E258)();
+});
+
+s32 N(D_80248088_963288)[] = {
+    0x0000004C, 0x00000000,
+};
+
+Script N(80248090) = SCRIPT({
+    N(SetManyVars)(6, 9699589, 9699585, 76, 69, 852105, 852106, 852107, 852108, N(D_80248088_963288));
+    await N(80247D90);
+});
+
+Script N(interact_802480E0) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH2_STAR_SPRIT_DEPARTED) {
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0062));
+        return;
+    }
+    match SI_AREA_VAR(0) {
+        == 0 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x005F));
+            SI_AREA_VAR(0) += 1;
+        }
+        == 1 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0060));
+            SI_AREA_VAR(0) += 1;
+        }
+        == 2 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0061));
+            SI_AREA_VAR(0) -= 1;
+        }
+    }
+});
+
+Script N(init_802481F8) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_802480E0));
+});
+
+Script N(interact_8024821C) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
+                if (SI_AREA_VAR(1) == 2) {
+                    SI_AREA_VAR(1) = 0;
+                }
+            }
+            match SI_AREA_VAR(1) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0063));
+                    SI_AREA_VAR(1) += 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0064));
+                    SI_AREA_VAR(1) += 1;
+                }
+                == 2 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0065));
+                    SI_AREA_VAR(1) = 0;
+                }
+            }
+        }
+        < 39 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0066));
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0067));
+        }
+    }
+});
+
+Script N(init_802483A8) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024821C));
+});
+
+Script N(interact_802483CC) = SCRIPT({
+    match SI_AREA_VAR(2) {
+        == 0 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x0068));
+            SI_AREA_VAR(2) += 1;
+        }
+        == 1 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x0069));
+            SI_AREA_VAR(2) += 1;
+        }
+        == 2 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x006A));
+            SI_AREA_VAR(2) += 1;
+        }
+        == 3 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x006B));
+            SI_AREA_VAR(2) = 0;
+        }
+    }
+});
+
+Script N(init_802484E0) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_802483CC));
+});
+
+Script N(80248504) = SCRIPT({
+    loop {
+        N(GetFloorCollider)(SI_VAR(0));
+        if (SI_VAR(0) == 8) {
+            break loop;
+        }
+        sleep 1;
+    }
+    DisablePlayerInput(TRUE);
+    func_802CF56C(1);
+    spawn {
+        sleep 20;
+        func_802CF56C(0);
+        NpcFacePlayer(NPC_PARTNER, 0);
+    }
+    PlayerFaceNpc(3, 0);
+    SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0078));
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetNpcPos(NPC_DRYITE2, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += (float) SI_VAR(3);
+    SI_VAR(1) += (float) SI_VAR(4);
+    SI_VAR(2) += (float) SI_VAR(5);
+    SI_VAR(0) /= 2.0;
+    SI_VAR(1) /= 2.0;
+    SI_VAR(2) /= 2.0;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, -300.0);
+    SetCamSpeed(0, 5.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SetPlayerAnimation(ANIM_10002);
+    SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0079));
+    SetPlayerAnimation(ANIM_80007);
+    sleep 30;
+    SetPlayerAnimation(ANIM_10002);
+    SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x007A));
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 4.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    PanToTarget(0, 0, 0);
+    N(func_80243084_95E284)();
+    SI_SAVE_FLAG(761) = 1;
+    DisablePlayerInput(FALSE);
+});
+
+s32 N(D_8024884C_963A4C)[] = {
+    0x0000007D, 0x00000000, 0xFFFFFFD6, 0x0000004B, 0x0000004B, N(func_802430C8_95E2C8),
+};
+
+Script N(interact_80248864) = SCRIPT({
+    if (SI_SAVE_FLAG(253) == 1) {
+        if (SI_SAVE_FLAG(761) == 1) {
+            N(func_802431B4_95E3B4)();
+            if (SI_VAR(0) == 1) {
+                SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x007B));
+                return;
+            }
+        }
+    }
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (SI_AREA_FLAG(1) == 0) {
+                SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x006C));
+                SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x006D));
+                SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x006E));
+                SI_AREA_FLAG(1) = 1;
+            } else {
+                SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x006F));
+                SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0070));
+                SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0071));
+                SI_AREA_FLAG(1) = 0;
+            }
+        }
+        < STORY_CH5_STAR_SPRIT_DEPARTED {
+            SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0072));
+            SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0073));
+            SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0074));
+        }
+        else {
+            SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0075));
+            SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0076));
+            SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0077));
+        }
+    }
+});
+
+Script N(init_80248AE4) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    match SI_VAR(0) {
+        3, 4 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_4));
+            return;
+        }
+    }
+    BindNpcInteract(NPC_SELF, N(interact_80248864));
+    if (SI_SAVE_FLAG(253) == 1) {
+        spawn {
+            N(func_80242858_95DA58)(N(D_8024884C_963A4C));
+        }
+    }
+});
+
+Script N(interact_80248BA0) = SCRIPT({
+    parallel {
+        loop {
+            NpcFaceNpc(NPC_DRYITE2, NPC_DRYITE3, 1);
+        }
+    }
+    N(func_802431FC_95E3FC)();
+    SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE);
+    SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_3));
+    SetNpcSpeed(NPC_SELF, 3.5);
+    NpcMoveTo(NPC_SELF, SI_VAR(0), SI_VAR(1), 0);
+    SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_1));
+    SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), FALSE);
+    sleep 5;
+    GetNpcYaw(-1, SI_VAR(0));
+    SI_VAR(0) += 180;
+    InterpNpcYaw(NPC_SELF, SI_VAR(0), 0);
+});
+
+Script N(init_80248CC8) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    match SI_VAR(0) {
+        3, 4 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_4));
+            return;
+        }
+    }
+    BindNpcInteract(NPC_SELF, N(interact_80248BA0));
+});
+
+s32 N(D_80248D4C_963F4C)[] = {
+    0x00000067, 0x00000000,
+};
+
+Script N(interact_80248D54) = SCRIPT({
+    if (SI_SAVE_FLAG(754) == 1) {
+        FindKeyItem(ITEM_MELODY, SI_VAR(0));
+        if (SI_VAR(0) != -1) {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0084));
+            return;
+        } else {
+            if (SI_SAVE_FLAG(755) == 0) {
+                if (STORY_PROGRESS < STORY_CH7_BEGAN_PEACH_MISSION) {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0085));
+                    SetPlayerAnimation(ANIM_NOD_YES);
+                    sleep 30;
+                    SetPlayerAnimation(ANIM_10002);
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0086));
+                    SI_SAVE_FLAG(755) = 1;
+                    return;
+                }
+            }
+        }
+    }
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (SI_AREA_FLAG(2) == 0) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x007C));
+                SI_AREA_FLAG(2) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x007D));
+                SI_AREA_FLAG(2) = 0;
+            }
+        }
+        < STORY_CH5_STAR_SPRIT_DEPARTED {
+            if (SI_AREA_FLAG(2) == 0) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x007E));
+                SI_AREA_FLAG(2) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x007F));
+                SI_AREA_FLAG(2) = 0;
+            }
+        }
+        else {
+            if (SI_AREA_FLAG(2) == 0) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0080));
+                SI_AREA_FLAG(2) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0081));
+                SI_AREA_FLAG(2) = 0;
+            }
+        }
+    }
+    SI_VAR(0) = N(D_80248D4C_963F4C);
+    SI_VAR(1) = 5;
+    await N(8024792C);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0082));
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_3));
+            sleep 60;
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_1));
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0083));
+            SI_VAR(0) = 104;
+            SI_VAR(1) = 1;
+            await N(802451BC);
+            AddKeyItem(ITEM_MELODY);
+            SI_SAVE_FLAG(754) = 1;
+            return;
+        }
+    }
+});
+
+Script N(init_80249168) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80248D54));
+});
+
+Script N(idle_8024918C) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_SHADY_MOUSE_LEFT_SHOP {
+            N(func_80243350_95E550)(16, 190, -134, -131);
+            DisablePlayerInput(TRUE);
+            SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE);
+            SetNpcPos(NPC_SELF, 0, 0, -180);
+            await N(8024C41C);
+            sleep 10;
+            GetPlayerPos(SI_VAR(10), SI_VAR(11), SI_VAR(12));
+            UseSettingsFrom(0, SI_VAR(10), SI_VAR(11), SI_VAR(12));
+            SetPanTarget(0, 32, 0, -67);
+            SetCamDistance(0, -210);
+            SetCamPitch(0, 20, -12);
+            SetCamSpeed(0, 90.0);
+            PanToTarget(0, 0, 1);
+            sleep 20;
+            UseSettingsFrom(0, SI_VAR(10), SI_VAR(11), SI_VAR(12));
+            SetCamDistance(0, -350);
+            SetCamSpeed(0, 0.80078125);
+            PanToTarget(0, 0, 1);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4));
+            NpcMoveTo(NPC_SELF, -23, -105, 20);
+            sleep 10;
+            InterpNpcYaw(NPC_SELF, 65, 0);
+            sleep 10;
+            await N(8024C4C8);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4));
+            NpcMoveTo(NPC_SELF, 37, -27, 20);
+            UseSettingsFrom(0, SI_VAR(10), SI_VAR(11), SI_VAR(12));
+            SetPanTarget(0, 142, 0, -67);
+            PanToTarget(0, 0, 1);
+            NpcMoveTo(NPC_SELF, 62, -6, 20);
+            NpcMoveTo(NPC_SELF, 103, 11, 20);
+            NpcMoveTo(NPC_SELF, 150, 18, 20);
+            EnableNpcBlur(-1, 1);
+            PlaySoundAtNpc(NPC_SELF, 0x174, 0);
+            NpcMoveTo(NPC_SELF, 554, -12, 20);
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+            sleep 30;
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamSpeed(0, 2.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            PanToTarget(0, 0, 0);
+            DisablePlayerInput(FALSE);
+            STORY_PROGRESS = STORY_CH2_SHADY_MOUSE_LEFT_SHOP;
+        }
+        < STORY_CH2_SPOKE_WITH_SHEEK {}
+        < STORY_CH2_SHADY_MOUSE_ENTERED_SHOP {
+            EnableNpcBlur(-1, 1);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4));
+            PlaySoundAtNpc(NPC_SELF, 0x174, 0);
+            SetNpcPos(NPC_SELF, 470, 0, 18);
+            NpcMoveTo(NPC_SELF, 287, 9, 20);
+            NpcMoveTo(NPC_SELF, 102, -14, 20);
+            NpcMoveTo(NPC_SELF, -32, -96, 20);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1));
+            await N(8024C41C);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4));
+            NpcMoveTo(NPC_SELF, 20, -375, 30);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1));
+            await N(8024C4C8);
+            EnableNpcBlur(-1, 0);
+            STORY_PROGRESS = STORY_CH2_SHADY_MOUSE_ENTERED_SHOP;
+        }
+        else {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1));
+            SetNpcPos(NPC_SELF, 20, 0, -375);
+        }
+    }
+});
+
+Script N(interact_80249750) = SCRIPT({
+    if (SI_AREA_VAR(4) == 4) {
+        if (SI_AREA_VAR(5) == 1) {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0088));
+            await N(80248090);
+            if (SI_VAR(12) != 0) {
+                return;
+            }
+            return;
+        }
+    }
+    await 0x80284054;
+    await N(80248090);
+    if (SI_VAR(12) != 0) {
+        return;
+    }
+});
+
+Script N(init_8024981C) = SCRIPT({
+    BindNpcIdle(NPC_SELF, N(idle_8024918C));
+    BindNpcInteract(NPC_SELF, N(interact_80249750));
+});
+
+Script N(interact_80249854) = SCRIPT({
+    SpeakToPlayer(NPC_THREE_SISTERS0, NPC_ANIM(three_sisters, Palette_01, Anim_4), NPC_ANIM(three_sisters, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x008E));
+    SpeakToPlayer(NPC_THREE_SISTERS1, NPC_ANIM(three_sisters, Palette_01, Anim_4), NPC_ANIM(three_sisters, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x008F));
+    SpeakToPlayer(NPC_THREE_SISTERS2, NPC_ANIM(three_sisters, Palette_01, Anim_4), NPC_ANIM(three_sisters, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0090));
+});
+
+Script N(init_802498C4) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80249854));
+});
+
+Script N(interact_802498E8) = SCRIPT({
+    FindKeyItem(ITEM_FIRST_DEGREE_CARD, SI_VAR(1));
+    FindKeyItem(ITEM_SECOND_DEGREE_CARD, SI_VAR(2));
+    FindKeyItem(ITEM_THIRD_DEGREE_CARD, SI_VAR(3));
+    FindKeyItem(ITEM_FOURTH_DEGREE_CARD, SI_VAR(4));
+    FindKeyItem(ITEM_DIPLOMA, SI_VAR(5));
+    if (SI_VAR(1) != -1) {
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x009A));
+        return;
+    }
+    if (SI_VAR(2) != -1) {
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x009B));
+        return;
+    }
+    if (SI_VAR(3) != -1) {
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x009C));
+        return;
+    }
+    if (SI_VAR(4) != -1) {
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x009D));
+        return;
+    }
+    if (SI_VAR(5) != -1) {
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x009E));
+        return;
+    }
+    SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0099));
+});
+
+Script N(init_80249ABC) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_802498E8));
+});
+
+Script N(interact_80249AE0) = SCRIPT({
+    SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x009F));
+});
+
+Script N(init_80249B10) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80249AE0));
+});
+
+StaticNpc N(npcGroup_80249B34)[] = {
+    {
+        .id = NPC_MOUSER0,
+        .settings = &N(npcSettings_80245134),
+        .pos = { -332.0f, 0.0f, 188.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_802481F8),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0090),
+    },
+    {
+        .id = NPC_DRYITE0,
+        .settings = &N(npcSettings_80245060),
+        .pos = { -235.0f, 0.0f, 160.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_802483A8),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { -235, 0, 160, 30, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_2),
+            NPC_ANIM(dryite, Palette_03, Anim_3),
+            NPC_ANIM(dryite, Palette_03, Anim_3),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_0),
+            NPC_ANIM(dryite, Palette_03, Anim_0),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+            NPC_ANIM(dryite, Palette_03, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0091),
+    },
+    {
+        .id = NPC_DRYITE1,
+        .settings = &N(npcSettings_80245108),
+        .pos = { -380.0f, 0.0f, -15.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_802484E0),
+        .yaw = 61,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_2),
+            NPC_ANIM(dryite, Palette_02, Anim_3),
+            NPC_ANIM(dryite, Palette_02, Anim_3),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_0),
+            NPC_ANIM(dryite, Palette_02, Anim_0),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0094),
+    },
+    {
+        .id = NPC_DRYITE2,
+        .settings = &N(npcSettings_80245108),
+        .pos = { 195.0f, 0.0f, -75.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80248AE4),
+        .yaw = 74,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_2),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0092),
+    },
+    {
+        .id = NPC_DRYITE3,
+        .settings = &N(npcSettings_80245108),
+        .pos = { 225.0f, 0.0f, -83.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80248CC8),
+        .yaw = 257,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_2),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0093),
+    },
+    {
+        .id = NPC_ARTIST_TOAD,
+        .settings = &N(npcSettings_80245108),
+        .pos = { 285.0f, 0.0f, -274.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80249168),
+        .yaw = 271,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(artist_toad, Palette_01, Anim_1),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+            NPC_ANIM(artist_toad, Palette_01, Anim_0),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0095),
+    },
+    {
+        .id = NPC_MOUSER1,
+        .settings = &N(npcSettings_80245134),
+        .pos = { 31.0f, 0.0f, -374.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024981C),
+        .yaw = 180,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_4),
+            NPC_ANIM(mouser, Palette_01, Anim_4),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x008F),
+    },
+    {
+        .id = NPC_CHUCK_QUIZMO,
+        .settings = &N(npcSettings_80247788),
+        .pos = { -400.0f, 0.0f, 100.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 00},
+        .yaw = 263,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_1),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_2),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_1),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_1),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_0),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_0),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0002),
+    },
+    {
+        .id = NPC_DRYITE4,
+        .settings = &N(npcSettings_80245060),
+        .pos = { -120.0f, 0.0f, 134.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80249ABC),
+        .yaw = 257,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { -120, 0, 134, 40, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_2),
+            NPC_ANIM(dryite, Palette_01, Anim_3),
+            NPC_ANIM(dryite, Palette_01, Anim_3),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_0),
+            NPC_ANIM(dryite, Palette_01, Anim_0),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0096),
+    },
+    {
+        .id = NPC_DRYITE5,
+        .settings = &N(npcSettings_802450DC),
+        .pos = { 40.0f, 0.0f, 105.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80249B10),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { 2, 40, 0, 105, -30, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_2),
+            NPC_ANIM(dryite, Palette_01, Anim_3),
+            NPC_ANIM(dryite, Palette_01, Anim_3),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_0),
+            NPC_ANIM(dryite, Palette_01, Anim_0),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+            NPC_ANIM(dryite, Palette_01, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0097),
+    },
+};
+
+StaticNpc N(npcGroup_8024AE94)[] = {
+    {
+        .id = NPC_THREE_SISTERS0,
+        .settings = &N(npcSettings_80245160),
+        .pos = { -141.0f, 0.0f, -18.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_802498C4),
+        .yaw = 62,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_2),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_6),
+            NPC_ANIM(three_sisters, Palette_01, Anim_6),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0003),
+    },
+    {
+        .id = NPC_THREE_SISTERS1,
+        .settings = &N(npcSettings_80245160),
+        .pos = { -124.0f, 0.0f, -61.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_802498C4),
+        .yaw = 63,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_2),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_6),
+            NPC_ANIM(three_sisters, Palette_01, Anim_6),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0004),
+    },
+    {
+        .id = NPC_THREE_SISTERS2,
+        .settings = &N(npcSettings_80245160),
+        .pos = { -80.0f, 0.0f, -35.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_802498C4),
+        .yaw = 244,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_2),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_1),
+            NPC_ANIM(three_sisters, Palette_01, Anim_6),
+            NPC_ANIM(three_sisters, Palette_01, Anim_6),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+            NPC_ANIM(three_sisters, Palette_01, Anim_3),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0005),
+    },
+};
+
+NpcGroupList N(npcGroupList_8024B464) = {
+    NPC_GROUP(N(npcGroup_80249B34), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+NpcGroupList N(npcGroupList_8024B47C) = {
+    NPC_GROUP(N(npcGroup_80249B34), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_8024AE94), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+s32 N(intTable_8024B4A0)[] = {
+    MESSAGE_ID(0x27, 0x0049), MESSAGE_ID(0x27, 0x004A), MESSAGE_ID(0x27, 0x004B), MESSAGE_ID(0x27, 0x004C),
+    MESSAGE_ID(0x27, 0x004D), MESSAGE_ID(0x27, 0x004E), MESSAGE_ID(0x27, 0x004F), MESSAGE_ID(0x27, 0x0050),
+    MESSAGE_ID(0x27, 0x0051), MESSAGE_ID(0x27, 0x0052), MESSAGE_ID(0x27, 0x0053), MESSAGE_ID(0x27, 0x0054),
+    MESSAGE_ID(0x27, 0x0055), MESSAGE_ID(0x27, 0x0056), MESSAGE_ID(0x27, 0x0057), MESSAGE_ID(0x27, 0x0058),
+    MESSAGE_ID(0x27, 0x0059), MESSAGE_ID(0x27, 0x005A), MESSAGE_ID(0x27, 0x005B), MESSAGE_ID(0x27, 0x005C),
+    MESSAGE_ID(0x27, 0x005D), MESSAGE_ID(0x27, 0x005E), MESSAGE_ID(0x27, 0x005F),
+};
+
+N(shopInventory) N(shopInventory_8024B4FC)[] = {
+    { ITEM_THUNDER_BOLT,    5, MESSAGE_ID(0x24, 0x0003) },
+    { ITEM_DUSTY_HAMMER,    2, MESSAGE_ID(0x24, 0x0005) },
+    { ITEM_HONEY_SYRUP,     5, MESSAGE_ID(0x24, 0x0016) },
+    { ITEM_DRIED_SHROOM,    2, MESSAGE_ID(0x24, 0x000D) },
+    { ITEM_DRIED_PASTA,     3, MESSAGE_ID(0x24, 0x001D) },
+    { ITEM_MUSHROOM,        3, MESSAGE_ID(0x24, 0x0009) },
+    {},
+};
+
+N(shopPrice) N(shopPriceList_8024B550)[] = {
+    { ITEM_SNOWMAN_DOLL,    12, 0x00000000 },
+    { ITEM_MELON,           10, 0x00000000 },
+    { ITEM_ICED_POTATO,     10, 0x00000000 },
+    { ITEM_TASTY_TONIC,      5, 0x00000000 },
+    { ITEM_SUPER_SODA,       6, 0x00000000 },
+    { ITEM_SPECIAL_SHAKE,   15, 0x00000000 },
+    { ITEM_DRIED_PASTA,      2, 0x00000000 },
+    {},
+};
+
+s32** N(D_8024B5B0_9667B0) = NULL;
+
+Script N(8024B5B4) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 0);
+    return;
+});
+
+Script N(8024B5E4) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 16);
+    return;
+});
+
+Script N(8024B614) = SCRIPT({
+    NpcJump0(NPC_MOUSER1, -31, 0, -283, 10);
+    NpcJump0(NPC_MOUSER1, -30, 0, -283, 8);
+});
+
+Script N(8024B664) = SCRIPT({
+    NpcJump0(NPC_MOUSER1, 20, 0, -259, 10);
+    NpcJump0(NPC_MOUSER1, 20, 0, -259, 4);
+});
+
+// extra END_IF
 /*
+Script N(8024B6B4) = SCRIPT({
+    N(func_80243578_95E778)();
+    func_802D2C14(1);
+    await N(8024B614);
+    if (STORY_PROGRESS < STORY_CH2_BOUGHT_SECRET_ITEMS) {
+        SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0087));
+        SetPlayerAnimation(ANIM_10002);
+        sleep 10;
+        SetPlayerAnimation(ANIM_80007);
+        sleep 30;
+    }
+    SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0088));
+    STORY_PROGRESS = STORY_CH2_BOUGHT_SECRET_ITEMS;
+    func_802D2C14(0);
+    await N(8024B664);
+    }
+});
+*/
+
+// *INDENT-OFF*
+Script N(8024B6B4) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_80243578_95E778)),
+    SI_CMD(ScriptOpcode_CALL, func_802D2C14, 1),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(8024B614)),
+    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), -64),
+        SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, 6, 9699589, 9699585, 0, 852103),
+        SI_CMD(ScriptOpcode_CALL, SetPlayerAnimation, 65538),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+        SI_CMD(ScriptOpcode_CALL, SetPlayerAnimation, 524295),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, 6, 9699589, 9699585, 0, 852104),
+    SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(0), -64),
+    SI_CMD(ScriptOpcode_CALL, func_802D2C14, 0),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(8024B664)),
+SI_CMD(ScriptOpcode_END_IF),
+SI_CMD(ScriptOpcode_RETURN),
+SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(8024B7B0) = SCRIPT({
+    if (SI_SAVE_FLAG(758) == 0) {
+        N(func_80243578_95E778)();
+        func_802D2C14(1);
+        await N(8024B614);
+        SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x008D));
+        SI_VAR(0) = 119;
+        SI_VAR(1) = 1;
+        await N(8024B5B4);
+        AddKeyItem(ITEM_RED_JAR);
+        SI_SAVE_FLAG(758) = 1;
+        sleep 20;
+        func_802D2C14(0);
+        await N(8024B664);
+    }
+});
+
+Script N(8024B894) = SCRIPT({
+    match SI_VAR(0) {
+        == 3 {}
+        == 4 {}
+        == 1 {
+            SI_VAR(2) = SI_AREA_VAR(4);
+            SI_VAR(3) = SI_AREA_VAR(5);
+            SI_VAR(4) = SI_AREA_VAR(6);
+            SI_AREA_VAR(5) = SI_VAR(2);
+            SI_AREA_VAR(6) = SI_VAR(3);
+            match SI_VAR(1) {
+                == 141 {
+                    SI_AREA_VAR(4) = 1;
+                    if (SI_VAR(2) == 2) {
+                        if (SI_VAR(3) == 3) {
+                            if (SI_VAR(4) == 2) {
+                                await N(8024B7B0);
+                                SI_AREA_VAR(4) = 0;
+                            }
+                        }
+                    }
+                }
+                == 134 {
+                    SI_AREA_VAR(4) = 2;
+                    if (SI_VAR(2) == 1) {
+                        if (STORY_PROGRESS < STORY_CH2_GOT_PULSE_STONE) {
+                            await N(8024B6B4);
+                            SI_AREA_VAR(4) = 0;
+                        }
+                    }
+                }
+                == 167 {
+                    SI_AREA_VAR(4) = 3;
+                }
+                else {
+                    SI_AREA_VAR(4) = 0;
+                }
+            }
+        }
+        == 2 {
+        }
+    }
+});
+
+s32 N(shopItemPositions_8024BA68)[] = {
+    0x004C0021, 0x004B0022, 0x00490023, 0x004A0024, 0x00480025, 0x00470026,
+};
+
+s32 N(shopOwnerNPC_8024BA80)[] = {
+    0x00000006, 0x00940101, 0x00940105, N(8024B894), 0x00000000, 0x00000000, N(intTable_8024B4A0),
+};
+
+s32 N(pad_BA9C) = {
+    0x00000000,
+};
+
+Script N(openDoor_8024BAA0) = SCRIPT({
+    RotateModel(103, SI_VAR(0), 0, 1, 0);
+});
+
+Script N(moveWalls_8024BAD0) = SCRIPT({
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= (float) 50;
+    TranslateModel(98, 0, SI_VAR(1), 0);
+    TranslateModel(97, 0, SI_VAR(1), 0);
+    RotateModel(98, SI_VAR(0), 1, 0, 0);
+    RotateModel(97, SI_VAR(0), 1, 0, 0);
+    RotateModel(100, SI_VAR(0), -1, 0, 0);
+    RotateModel(101, SI_VAR(0), -1, 0, 0);
+});
+
+Script N(dropDoor_8024BBB8) = SCRIPT({
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= (float) 50;
+    TranslateModel(103, 0, SI_VAR(1), 0);
+    RotateModel(103, SI_VAR(0), 1, 0, 0);
+});
+
+Script N(openDoor_8024BC24) = SCRIPT({
+    RotateModel(83, SI_VAR(0), 0, 1, 0);
+});
+
+Script N(moveWalls_8024BC54) = SCRIPT({
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= (float) 50;
+    TranslateModel(47, 0, SI_VAR(1), 0);
+    TranslateModel(48, 0, SI_VAR(1), 0);
+    RotateModel(47, SI_VAR(0), 1, 0, 0);
+    RotateModel(48, SI_VAR(0), 1, 0, 0);
+    RotateModel(41, SI_VAR(0), -1, 0, 0);
+    RotateModel(42, SI_VAR(0), -1, 0, 0);
+    RotateModel(43, SI_VAR(0), -1, 0, 0);
+    RotateModel(44, SI_VAR(0), -1, 0, 0);
+    RotateModel(45, SI_VAR(0), -1, 0, 0);
+});
+
+Script N(openDoor_8024BD9C) = SCRIPT({
+    RotateModel(157, SI_VAR(0), 0, 1, 0);
+});
+
+Script N(dropDoor_8024BDCC) = SCRIPT({
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= 45;
+    TranslateModel(157, 0, SI_VAR(1), 0);
+    RotateModel(157, SI_VAR(0), 1, 0, 0);
+});
+
+Script N(moveWalls_8024BE38) = SCRIPT({
+    if (SI_VAR(0) == 90) {
+        EnableModel(142, 0);
+    } else {
+        EnableModel(142, 1);
+    }
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= 45;
+    SI_VAR(2) = SI_VAR(0);
+    SI_VAR(2) -= -90;
+    SI_VAR(2) /= -90;
+    TranslateModel(140, 0, SI_VAR(1), 0);
+    RotateModel(140, SI_VAR(0), 1, 0, 0);
+    RotateModel(138, SI_VAR(0), -1, 0, 0);
+    RotateModel(137, SI_VAR(0), -1, 0, 0);
+    RotateModel(136, SI_VAR(0), -1, 0, 0);
+    RotateModel(135, SI_VAR(0), -1, 0, 0);
+    RotateModel(143, SI_VAR(0), 1, 0, 0);
+    RotateModel(142, SI_VAR(0), 1, 0, 0);
+});
+
+Script N(toggleVis_8024BFDC) = SCRIPT({
+    match SI_VAR(0) {
+        == 0 {
+            SetGroupEnabled(127, 1);
+        }
+        == 3 {
+            SetGroupEnabled(127, 0);
+        }
+    }
+});
+
+Script N(toggleVis_8024C040) = SCRIPT({
+    match SI_VAR(0) {
+        == 0 {
+            match STORY_PROGRESS {
+                < STORY_CH2_SPOKE_WITH_SHEEK {
+                    ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x017B), 160, 40);
+                    SI_VAR(0) = -1;
+                    return;
+                }
+                < STORY_CH2_SHADY_MOUSE_ENTERED_SHOP {
+                    SI_VAR(0) = -1;
+                    return;
+                }
+            }
+            SetGroupEnabled(82, 1);
+        }
+        == 2 {
+            spawn {
+                sleep 45;
+                SetNpcPos(NPC_MOUSER1, 33, 0, -375);
+                SetNpcYaw(NPC_MOUSER1, 180);
+            }
+        }
+        == 3 {
+            SetGroupEnabled(82, 0);
+            SI_AREA_VAR(4) = 0;
+            SI_AREA_VAR(5) = 0;
+        }
+    }
+});
+
+Script N(toggleVis_8024C190) = SCRIPT({
+    match SI_VAR(0) {
+        == 0 {
+            SetGroupEnabled(156, 1);
+        }
+        == 2 {}
+        == 3 {
+            SetGroupEnabled(156, 0);
+        }
+    }
+});
+
+s32 N(npcList_8024C200)[] = {
+    0x00000002, 0xFFFFFFFF,
+};
+
+s32 N(npcList_8024C208)[] = {
+    0x00000006, 0xFFFFFFFF,
+};
+
+s32 N(npcList_8024C210)[] = {
+    0x00000005, 0xFFFFFFFF,
+};
+
+Script N(8024C218) = SCRIPT({
+    MakeDoorAdvanced(5, N(openDoor_8024BAA0), N(moveWalls_8024BAD0), N(dropDoor_8024BBB8), N(toggleVis_8024BFDC), 15, 16, 128, N(npcList_8024C200));
+    MakeDoorAdvanced(5, N(openDoor_8024BC24), N(moveWalls_8024BC54), 0, N(toggleVis_8024C040), 23, 24, 91, N(npcList_8024C208));
+    MakeDoorAdvanced(5, N(openDoor_8024BD9C), N(moveWalls_8024BE38), N(dropDoor_8024BDCC), N(toggleVis_8024C190), 29, 30, 159, N(npcList_8024C210));
+    SI_VAR(0) = 3;
+    spawn N(toggleVis_8024BFDC);
+    spawn N(toggleVis_8024C040);
+    spawn N(toggleVis_8024C190);
+});
+
+Script N(8024C2EC) = SCRIPT({
+9:
+    MakeLerp(10, -10, 30, 10);
+10:
+    UpdateLerp();
+    RotateModel(34, SI_VAR(0), 1, 0, 0);
+    sleep 1;
+    if (SI_VAR(1) == 1) {
+        goto 10;
+    }
+    MakeLerp(-10, 10, 30, 10);
+11:
+    UpdateLerp();
+    RotateModel(34, SI_VAR(0), 1, 0, 0);
+    sleep 1;
+    if (SI_VAR(1) == 1) {
+        goto 11;
+    }
+    goto 9;
+});
+
+Script N(8024C41C) = SCRIPT({
+    SetGroupEnabled(82, 1);
+    PlaySoundAtCollider(23, 449, 0);
+    MakeLerp(0, 100, 15, 4);
+10:
+    UpdateLerp();
+    spawn N(openDoor_8024BC24);
+    sleep 1;
+    if (SI_VAR(1) == 1) {
+        goto 10;
+    }
+});
+
+Script N(8024C4C8) = SCRIPT({
+    MakeLerp(100, 0, 15, 4);
+10:
+    UpdateLerp();
+    spawn N(openDoor_8024BC24);
+    sleep 1;
+    if (SI_VAR(1) == 1) {
+        goto 10;
+    }
+    PlaySoundAtCollider(23, 450, 0);
+    SetGroupEnabled(82, 0);
+});
+
+s32 N(pad_C574)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(8024C580) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    DisablePartnerAI(0);
+    HidePlayerShadow(TRUE);
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        EnableNpcShadow(NPC_PARTNER, FALSE);
+        SetNpcPos(NPC_PARTNER, 0, -1000, 0);
+    }
+    GetEntryID(SI_VAR(0));
+    N(dup_GetEntryPos)();
+    SI_VAR(2) -= 40;
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    InterpPlayerYaw(SI_VAR(4), 0);
+    PlaySound(0x163);
+    func_802D286C(256);
+    func_802D2520(ANIM_STAND_STILL, 5, 2, 1, 1, 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    loop 40 {
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+    }
+    sleep 3;
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        spawn {
+            DisablePartnerAI(0);
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(2) -= 3;
+            SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetNpcFlagBits(NPC_PARTNER, ((0x00000002)), FALSE);
+            EnablePartnerAI();
+            EnableNpcShadow(NPC_PARTNER, TRUE);
+        }
+    }
+    sleep 2;
+    func_802D2520(ANIM_STAND_STILL, 0, 0, 0, 0, 0);
+    sleep 1;
+    SetPlayerAnimation(ANIM_10002);
+    DisablePlayerPhysics(FALSE);
+    DisablePlayerInput(FALSE);
+    HidePlayerShadow(FALSE);
+0:
+    N(dup_GetCurrentFloor)();
+    sleep 1;
+    if (SI_VAR(0) != -1) {
+        goto 0;
+    }
+    spawn 0xFE363C8A;
+});
+
+Script N(8024C8D4) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    HidePlayerShadow(TRUE);
+    ModifyColliderFlags(0, SI_VAR(11), 0x7FFFFE00);
+    GetEntryID(SI_VAR(0));
+    N(dup_GetEntryPos)();
+    SI_VAR(5) = SI_VAR(1);
+    SI_VAR(6) = SI_VAR(2);
+    SI_VAR(7) = SI_VAR(3);
+    SI_VAR(2) += 2;
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    InterpPlayerYaw(SI_VAR(4), 0);
+    if (SI_VAR(4) == 90) {
+        SI_VAR(5) += 40;
+    } else {
+        SI_VAR(5) -= 40;
+    }
+    UseSettingsFrom(0, SI_VAR(5), SI_VAR(6), SI_VAR(7));
+    SetPanTarget(0, SI_VAR(5), SI_VAR(6), SI_VAR(7));
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        DisablePartnerAI(0);
+        EnableNpcShadow(NPC_PARTNER, FALSE);
+        SetNpcPos(NPC_PARTNER, 0, -1000, 0);
+        InterpNpcYaw(NPC_PARTNER, SI_VAR(0), 0);
+    }
+    sleep 1;
+    PlaySound(0x163);
+    spawn {
+        sleep 25;
+        HidePlayerShadow(FALSE);
+    }
+    func_802D286C(2304);
+    func_802D2520(ANIM_10002, 5, 3, 1, 1, 0);
+    loop 40 {
+        N(dup_SomeXYZFunc2)(1.0);
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+    }
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        spawn {
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(2) -= 3;
+            SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EnableNpcShadow(NPC_PARTNER, TRUE);
+            EnablePartnerAI();
+        }
+    }
+    sleep 5;
+    func_802D2520(ANIM_10002, 0, 0, 0, 0, 0);
+    ModifyColliderFlags(1, SI_VAR(11), 0x7FFFFE00);
+    DisablePlayerInput(FALSE);
+    DisablePlayerPhysics(FALSE);
+    PanToTarget(0, 0, 0);
+    spawn 0xFE363C8A;
+});
+
+Script N(8024CCC4) = SCRIPT({
+    N(dup_UnkFunc25)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        GetCurrentPartnerID(SI_VAR(1));
+        if (SI_VAR(1) != 6) {
+            return;
+        } else {
+            func_802D2B6C();
+            DisablePlayerInput(TRUE);
+        }
+    } else {
+        DisablePlayerInput(TRUE);
+    }
+    await N(8024CDA0);
+});
+
+Script N(8024CDA0) = SCRIPT({
+    N(dup_SetPlayerStatusAnimFlags100000)();
+    group 27;
+    DisablePlayerPhysics(TRUE);
+    HidePlayerShadow(TRUE);
+    SI_VAR(0) = SI_VAR(10);
+    N(dup_GetEntryPos)();
+    PlayerMoveTo(SI_VAR(1), SI_VAR(3), 3);
+    SI_VAR(0) = SI_VAR(10);
+    N(dup_GetEntryPos)();
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    SetPlayerFlagBits(2097152, 1);
+    N(dup_GetCurrentCameraYawClamped180)();
+    InterpPlayerYaw(SI_VAR(0), 0);
+    sleep 2;
+    SetPlayerFlagBits(2097152, 0);
+    PlaySound(0x163);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    spawn {
+        sleep 4;
+        loop 40 {
+            SI_VAR(1) -= 1;
+            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+    }
+    func_802D286C(2048);
+    func_802D2520(ANIM_10002, 5, 2, 1, 1, 0);
+    sleep 25;
+    await 0xFE363C8C;
+});
+
+Script N(8024CF7C) = SCRIPT({
+    IsPlayerOnValidFloor(SI_VAR(0));
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    GetPlayerActionState(SI_VAR(0));
+    if (SI_VAR(0) == 26) {
+        return;
+    }
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        GetCurrentPartnerID(SI_VAR(1));
+        if (SI_VAR(1) != 6) {
+            return;
+        } else {
+            func_802D2B6C();
+            DisablePlayerInput(TRUE);
+        }
+    } else {
+        DisablePlayerInput(TRUE);
+    }
+    group 27;
+    N(dup_SetPlayerStatusAnimFlags100000)();
+    DisablePlayerPhysics(TRUE);
+    ModifyColliderFlags(0, SI_VAR(11), 0x7FFFFE00);
+    SI_VAR(0) = SI_VAR(10);
+    N(dup_GetEntryPos)();
+    SI_VAR(5) = SI_VAR(1);
+    SI_VAR(6) = SI_VAR(2);
+    SI_VAR(6) += 2;
+    SI_VAR(7) = SI_VAR(3);
+    SI_VAR(8) = SI_VAR(4);
+    SI_VAR(8) += 180;
+    if (SI_VAR(4) >= 360) {
+        SI_VAR(4) -= 360;
+    }
+    InterpPlayerYaw(SI_VAR(8), 1);
+    sleep 1;
+    PlaySound(0x163);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPlayerPos(SI_VAR(0), SI_VAR(6), SI_VAR(7));
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    func_802D286C(2048);
+    func_802D2520(ANIM_STAND_STILL, 5, 3, 1, 1, 0);
+    spawn {
+        sleep 8;
+        HidePlayerShadow(TRUE);
+    }
+    spawn {
+        sleep 3;
+        loop 40 {
+            N(dup_SomeXYZFunc2)(1.0);
+            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+    }
+    sleep 25;
+    await 0xFE363C8C;
+});
+
+const char N(dro_01_name_hack)[];
+
+Script N(8024D2B0) = SCRIPT({
+    SI_SAVE_FLAG(761) = 0;
+    GotoMap(N(dro_01_name_hack), 4);
+    sleep 100;
+});
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802E9A18, -211, 60, -50, 30, MAKE_ENTITY_END);
+    if (SI_SAVE_FLAG(1939) == 0) {
+        if (SI_SAVE_FLAG(1933) == 1) {
+            GetEntryID(SI_VAR(0));
+            if (SI_VAR(0) != 2) {
+                SI_SAVE_FLAG(1939) = 1;
+            }
+        }
+    }
+    MakeEntity(0x802EAF80, 430, 0, -120, 0, ITEM_SPIN_JUMP, N(8024D2B0), 1939, MAKE_ENTITY_END);
+});
+
 ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
@@ -38,7 +2879,6 @@ ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, NpcAISettings* aiSetti
     script->functionTemp[0].s = 1;
     return ApiStatus_DONE1;
 }
-*/
 
 #include "world/common/UnkFunc13.inc.c"
 
@@ -46,8 +2886,6 @@ ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkFunc14.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240C5C_95BE5C);
-/*
 ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -65,7 +2903,6 @@ ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, NpcAISettings* aiSetti
     script->functionTemp[0].s = 1;
     return ApiStatus_DONE1;
 }
-*/
 
 #include "world/common/NpcJumpFunc2.inc.c"
 
@@ -79,8 +2916,6 @@ ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkFunc16.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241174_95C374);
-/*
 ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -96,7 +2931,7 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -116,7 +2951,7 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -133,12 +2968,12 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
         case 0:
             N(func_802405E0_95B7E0)(script, npcAISettings, territoryPtr);
         case 1:
-            N(func_80240738_95B938)(script, npcAISettings, territoryPtr);
+            N(UnkFunc13)(script, npcAISettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_80240AA0_95BCA0)(script, npcAISettings, territoryPtr);
+            N(UnkFunc14)(script, npcAISettings, territoryPtr);
             break;
         case 4:
             N(func_80240C5C_95BE5C)(script, npcAISettings, territoryPtr);
@@ -151,77 +2986,216 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_80240F2C_95C12C)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
             break;
         case 15:
-            N(func_802410B4_95C2B4)(script, npcAISettings, territoryPtr);
+            N(UnkFunc16)(script, npcAISettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
     }
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670);
-/*
 ApiStatus N(func_80241470_95C670)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802451B8_9603B8) == NULL) {
+        N(D_802451B8_9603B8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802451B8_9603B8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802451B8_9603B8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802451B8_9603B8));
+        N(D_802451B8_9603B8) = NULL;
     }
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC);
+// Ok good luck.
+ApiStatus N(func_802415AC_95C7AC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802417D0_95C9D0);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024183C_95CA3C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802419E8_95CBE8);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241B5C_95CD5C);
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241BE0_95CDE0);
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241DF8_95CFF8);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241EAC_95D0AC);
+#include "world/common/UnkFunc31.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241EE0_95D0E0);
+ApiStatus N(func_80241B5C_95CD5C)(ScriptInstance *script, s32 isInitialCall) {
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F60_95D160);
+    if (quizzesAnswered < 999) {
+        gPlayerData.quizzesAnswered++;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F78_95D178);
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        gPlayerData.quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94_95D194);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241BE0_95CDE0)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        N(D_8024DFE0) = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        N(D_8024DFE4) = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        N(D_8024DFE8) = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = N(D_8024DFE0)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = N(D_8024DFE0)->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_80241DF8_95CFF8)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        N(D_8024DFE4)->flags |= 0x10;
+        N(D_8024DFE8)->flags |= 0x10;
+    }
+
+    effectPtr = N(D_8024DFE0)->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(N(D_8024DFE0), effectPtr);
+        free_dynamic_entity(N(D_8024DFC0));
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_80241EAC_95D0AC)(ScriptInstance *script, s32 isInitialCall) {
+    N(D_8024DFE0)->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241EE0_95D0E0)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = N(D_8024DFE0)->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241F60_95D160)(ScriptInstance *script, s32 isInitialCall) {
+    N(D_8024DFE8)->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241F78_95D178)(ScriptInstance *script, s32 isInitialCall) {
+    N(D_8024DFE8)->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241F94_95D194)(ScriptInstance *script, s32 isInitialCall) {
+    N(D_8024DFE8)->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -235,68 +3209,294 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94_95D194);
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468_95D668);
+void N(func_80242468_95D668)(void) {
+    s32 var = get_variable(NULL, N(D_8024DFD8));
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802424D4_95D6D4);
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+
+ApiStatus N(func_802424D4_95D6D4)(ScriptInstance *script, s32 isInitialCall) {
+    N(D_8024DFC0) = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242730_95D930);
-/*
 ApiStatus N(func_80242730_95D930)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
+        ptr = &N(D_802477E0_9629E0);
         *ptr = 0;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
+    ptr = &N(D_802477E0_9629E0);
     if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
+        ptr = &N(D_802477E0_9629E0);
         *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+        set_variable(script, *args, N(D_802477E4_9629E4));
         return ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242784_95D984);
-/*
 ApiStatus N(func_80242784_95D984)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802477E4_9629E4) = get_variable(script, *args);
+    N(D_802477E0_9629E0) = 1;
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802427BC_95D9BC);
+ApiStatus N(func_802427BC_95D9BC)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242858_95DA58);
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_8024DFF0)[i] = ptr[i];
+        }
+        N(D_8024DFF0)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_8024DFF0)[i] = i + 16;
+            N(D_8024DFF0)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80242858_95DA58)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    N(Unk_Struct_2)* temp_s1 = get_variable(script, *script->ptrReadPos);
+    N(Unk_Struct_1)* ptr;
+    s32 atan_res1, atan_res2;
+    s32 clamp;
+    s32 res;
+
+    if (isInitialCall) {
+        script->functionTemp[1].s = (N(Unk_Struct_1)*)heap_malloc(0x3C);
+        ptr = script->functionTemp[1].s;
+        ptr->unk_00 = temp_s1->unk_00;
+        ptr->unk_04 = temp_s1->unk_04;
+        ptr->unk_08 = temp_s1->unk_08;
+        ptr->unk_0C = temp_s1->unk_0C;
+        ptr->unk_10 = temp_s1->unk_10;
+        ptr->unk_14 = temp_s1->unk_14;
+        ptr->unk_18 = 0;
+        ptr->unk_1C = 0;
+        ptr->unk_20 = 0;
+        ptr->unk_24 = 0;
+        ptr->unk_28 = 0;
+        ptr->unk_2C = 0;
+        ptr->unk_30 = 0;
+        ptr->unk_34 = 0;
+        ptr->unk_38 = 0;
+    }
+
+    ptr = script->functionTemp[1].s;
+    switch (ptr->unk_20) {
+        case 0:
+            res = func_800E0088(ptr->unk_00, ptr->unk_08);
+            if (res < ptr->unk_0C) {
+                ptr->unk_24 = playerStatus->position.x;
+                ptr->unk_28 = playerStatus->position.z;
+                ptr->unk_20++;
+            }
+            break;
+
+        case 1:
+            res = func_800E0088(ptr->unk_00, ptr->unk_08);
+            if (res < ptr->unk_0C) {
+                atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_24, ptr->unk_28);
+                atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z);
+                clamp = get_clamped_angle_diff(atan_res1, atan_res2);
+                ptr->unk_34 = signF(clamp);
+                ptr->unk_20++;
+                break;
+            }
+            ptr->unk_20 = 0;
+            break;
+
+        case 2:
+            res = func_800E0088(ptr->unk_00, ptr->unk_08);
+            if (res < ptr->unk_0C) {
+                atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_2C, ptr->unk_30);
+                atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z);
+                clamp = get_clamped_angle_diff(atan_res1, atan_res2);
+                if (ptr->unk_34 == signF(clamp)) {
+                    atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_24, ptr->unk_28);
+                    atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z);
+                    clamp = get_clamped_angle_diff(atan_res1, atan_res2);
+                    if (fabsf(clamp) > 90.0f) {
+                        if (ptr->unk_14 != NULL) {
+                            ptr->unk_14(ptr, 0);
+                        }
+                        ptr->unk_18 = ptr->unk_18 + fabsf(clamp);
+                        ptr->unk_20++;
+                    }
+                    break;
+                }
+            }
+            ptr->unk_20 = 0;
+            break;
+
+        case 3:
+            res = func_800E0088(ptr->unk_00, ptr->unk_08);
+            if (res < ptr->unk_10) {
+                atan_res1 = atan2(ptr->unk_00, ptr->unk_08, ptr->unk_2C, ptr->unk_30);
+                atan_res2 = atan2(ptr->unk_00, ptr->unk_08, playerStatus->position.x, playerStatus->position.z);
+                clamp = get_clamped_angle_diff(atan_res1, atan_res2);
+                if (ptr->unk_34 != signF(clamp)) {
+                    if (ptr->unk_14 != NULL) {
+                        ptr->unk_14(ptr, 3);
+                    }
+                    ptr->unk_20++;
+                } else {
+                    ptr->unk_18 = ptr->unk_18 + fabsf(clamp);
+                    ptr->unk_1C = ptr->unk_18 / 360;
+                    if (ptr->unk_1C != ptr->unk_38) {
+                        if (ptr->unk_14 != NULL) {
+                            ptr->unk_14(ptr, 1);
+                        }
+                        ptr->unk_38 = ptr->unk_1C;
+                    }
+                }
+                if (ptr->unk_14 != NULL) {
+                    ptr->unk_14(ptr, 2);
+                }
+            } else {
+                if (ptr->unk_14 != NULL) {
+                    ptr->unk_14(ptr, 4);
+                }
+                ptr->unk_20++;
+            }
+            break;
+
+        case 4:
+            ptr->unk_18 = 0.0f;
+            ptr->unk_1C = 0;
+            ptr->unk_38 = 0;
+            ptr->unk_20 = 0;
+            break;
+    }
+
+    ptr->unk_2C = playerStatus->position.x;
+    ptr->unk_30 = playerStatus->position.z;
+
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243014_95E214);
+ApiStatus N(func_80243014_95E214)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243058_95E258);
+    N(D_8024E1B4) = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243084_95E284);
+ApiStatus N(func_80243058_95E258)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = N(D_8024E1B4);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024309C_95E29C);
+ApiStatus N(func_80243084_95E284)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802430C8_95E2C8);
+    playerData->unk_328 = playerData->frameCounter;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802431B4_95E3B4);
+#include "world/common/GetFloorCollider.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802431FC_95E3FC);
+void N(func_802430C8_95E2C8)(N(Unk_Struct_1)* ptr, s32 arg1) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243350_95E550);
+    switch (arg1) {
+        case 2:
+            if (ptr->unk_1C >= 6) {
+                if (fabsf(get_clamped_angle_diff(atan2(125.0f, -42.0f, 152.0f, -61.0f), atan2(125.0f, -42.0f, playerStatus->position.x, playerStatus->position.z))) < 30.0f) {
+                    start_script(N(80248504), 1, 0);
+                    ptr->unk_20 = 4;
+                }
+            }
+            break;
+
+        case 0:
+        case 1:
+        case 3:
+        case 4:
+            break;
+    }
+}
+
+ApiStatus N(func_802431B4_95E3B4)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    s32 val = (playerData->frameCounter - playerData->unk_328) / 3600;
+
+    if (val < 30) {
+        script->varTable[0] = 1;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_802431FC_95E3FC)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Npc *npc = get_npc_safe(script->owner2.npcID);
+    s32 rand;
+    f32 temp_f22;
+    f32 temp_f24;
+
+    temp_f24 = atan2(183.0f, -75.0f, playerStatus->position.x, playerStatus->position.z);
+    temp_f22 = atan2(183.0f, -75.0f, npc->pos.x, npc->pos.z);
+    temp_f24 = get_clamped_angle_diff(temp_f22, temp_f24);
+    rand = rand_int(10) + 30;
+    if (temp_f24 < 0.0f) {
+        temp_f22 += rand;
+    } else {
+        temp_f22 -= rand;
+    }
+    rand = rand_int(20) + 30;
+    script->varTable[0] = (sin_deg(temp_f22) * rand) + 183.0f;
+    script->varTable[1] = -75.0f - (cos_deg(temp_f22) * rand);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80243350_95E550)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Bytecode *args = script->ptrReadPos;
+    f32 var1 = get_variable(script, *args++);
+    f32 var2 = get_variable(script, *args++);
+    f32 var3 = get_variable(script, *args++);
+    f32 var4 = get_variable(script, *args++);
+    f32 temp_f0 = (var4 - var2) / (var3 - var1);
+
+    if (playerStatus->position.z < ((temp_f0 * playerStatus->position.x) + (var2 - (temp_f0 * var1)))) {
+        script->varTable[0] = 0;
+        return ApiStatus_DONE2;
+    }
+
+    script->varTable[0] = 1;
+    return ApiStatus_BLOCK;
+}
+
+const s32 N(pad_XXX)[] = { 0 };
+
+const char N(dro_01_name_hack)[] = "tik_01";
diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c
index 53f91693cc..972ec7b70f 100644
--- a/src/world/area_dro/dro_01/95E660.c
+++ b/src/world/area_dro/dro_01/95E660.c
@@ -1,32 +1,28 @@
 #include "dro_01.h"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243460_95E660);
-/*
 ApiStatus N(func_80243460_95E660)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_8024B5B0_9667B0) == NULL) {
+        N(D_8024B5B0_9667B0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_8024B5B0_9667B0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_8024B5B0_9667B0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_8024B5B0_9667B0));
+        N(D_8024B5B0_9667B0) = NULL;
     }
     return ApiStatus_DONE2;
 }
-*/
 
-#define NAMESPACE dup_dro_01
+#define NAMESPACE dro_01_dup
 #include "world/common/GetItemName.inc.c"
 #define NAMESPACE dro_01
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243578_95E778);
+ApiStatus N(func_80243578_95E778)(ScriptInstance* script, s32 isInitialCall) {
+    func_800E96C8();
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c
index ea7ca1aaf7..a9424b846a 100644
--- a/src/world/area_dro/dro_01/95E7A0.c
+++ b/src/world/area_dro/dro_01/95E7A0.c
@@ -1,25 +1,63 @@
 #include "dro_01.h"
 
-#define NAMESPACE dup_dro_01
+#define NAMESPACE dro_01_dup
 #include "world/common/SetPlayerStatusAnimFlags100000.inc.c"
 #define NAMESPACE dro_01
 
-#define NAMESPACE dup_dro_01
+#define NAMESPACE dro_01_dup
 #include "world/common/GetCurrentFloor.inc.c"
 #define NAMESPACE dro_01
 
-INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4);
+#define NAMESPACE dro_01_dup
+#include "world/common/UnkFunc25.inc.c"
+#define NAMESPACE dro_01
 
-#define NAMESPACE dup_dro_01
+#define NAMESPACE dro_01_dup
 #include "world/common/GetEntryPos.inc.c"
 #define NAMESPACE dro_01
 
-#define NAMESPACE dup_dro_01
+#define NAMESPACE dro_01_dup
 #include "world/common/GetCurrentCameraYawClamped180.inc.c"
 #define NAMESPACE dro_01
 
-#define NAMESPACE dup_dro_01
+#define NAMESPACE dro_01_dup
 #include "world/common/SomeXYZFunc2.inc.c"
 #define NAMESPACE dro_01
 
 #include "world/common/foliage.inc.c"
+
+FoliageModelList N(tree1_Leaves) = {
+    .count = 1,
+    .models = { 13 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 14 }
+};
+
+FoliageDropList N(tree1_Drops) = {
+    .count = 1,
+    .drops = {
+        {
+            .itemID = ITEM_COIN,
+            .pos = { 120, 92, -18 },
+            .spawnMode = 0xF,
+            .pickupFlag = SI_SAVE_FLAG(760),
+        },
+    }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .drops = &N(tree1_Drops),
+};
+
+Vec4f N(triggerCoord_8024DD68) = { 120.0f, 0.0f, -43.0f, 0.0f };
+
+Script N(8024DD78) = SCRIPT({
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 11;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_8024DD68);
+});
diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h
index febd5e2e28..65ba3efc85 100644
--- a/src/world/area_dro/dro_01/dro_01.h
+++ b/src/world/area_dro/dro_01/dro_01.h
@@ -2,3 +2,90 @@
 #include "map.h"
 
 #define NAMESPACE dro_01
+
+typedef struct {
+    u32 itemID;
+    u32 buyPrice;
+    u32 descriptionID;
+} N(shopInventory);
+
+typedef struct {
+    u32 itemID;
+    u32 sellPrice;
+    u32 unk_08;
+} N(shopPrice);
+
+ApiStatus N(GetCamVfov)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetCurrentCameraYawClamped180)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetCurrentFloor)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetEntryPos)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetGameStatus75)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetNpcUnsafeOwner2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(Set80151310_0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(Set80151310_1)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SetCamVfov)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SetManyVars)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SetPlayerStatusAnimFlags100000)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SomeXYZFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkAlphaFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkCameraFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkMovePartner)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkRotatePartner)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkRotatePlayer)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkYawFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc25)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc27)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc26)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802415AC_95C7AC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc31)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc29)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241B5C_95CD5C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241BE0_95CDE0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241DF8_95CFF8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241EAC_95D0AC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241EE0_95D0E0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241F60_95D160)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241F78_95D178)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241F94_95D194)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802424D4_95D6D4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242730_95D930)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242784_95D984)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802427BC_95D9BC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242858_95DA58)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243014_95E214)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243058_95E258)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243084_95E284)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetFloorCollider)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802431B4_95E3B4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802431FC_95E3FC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243350_95E550)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243578_95E778)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(dup_UnkFunc25)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(dup_GetCurrentCameraYawClamped180)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(dup_GetCurrentFloor)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(dup_GetEntryPos)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(dup_SetPlayerStatusAnimFlags100000)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(dup_SomeXYZFunc2)(ScriptInstance* script, s32 isInitialCall);
+
+extern s32** N(D_8024B5B0_9667B0);
+extern N(shopInventory) N(shopInventory_8024B4FC)[];
+extern N(shopPrice) N(shopPriceList_8024B550)[];
+
+extern NpcGroupList N(npcGroupList_8024B464);
+extern NpcGroupList N(npcGroupList_8024B47C);
+extern Script N(80244450);
+extern Script N(8024C218);
+extern Script N(8024C2EC);
+extern Script N(8024C41C);
+extern Script N(8024C4C8);
+extern Script N(8024CDA0);
+extern Script N(8024DD78);
+extern Script N(main);
+extern Script N(makeEntities);
+extern Script N(shopItemPositions_8024BA68);
+extern Script N(shopOwnerNPC_8024BA80);
+extern Script N(unk_80248088);
+extern Script N(unk_8024884C);
diff --git a/src/world/area_dro/dro_02/9691C0.c b/src/world/area_dro/dro_02/9691C0.c
index d0df353995..9110f0e622 100644
--- a/src/world/area_dro/dro_02/9691C0.c
+++ b/src/world/area_dro/dro_02/9691C0.c
@@ -1,5 +1,5 @@
 #include "dro_02.h"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9691C0", func_80240000_9691C0);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9691C0", func_80240124_9692E4);
+#include "world/common/UnkFunc26.inc.c"
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 35d4eb2b7d..2309f1f6fe 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -1,63 +1,3302 @@
 #include "dro_02.h"
+#include "script_api/battle.h"
+#include "message_ids.h"
+#include "sprite/npc/archeologist.h"
+#include "sprite/npc/chuck_quizmo.h"
+#include "sprite/npc/disguised_moustafa.h"
+#include "sprite/npc/dryite.h"
+#include "sprite/npc/mouser.h"
+#include "sprite/npc/moustafa.h"
+#include "sprite/npc/toad.h"
+#include "sprite/npc/world_merlee.h"
 
 #define UNK_ALPHA_FUNC_NPC 10
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0);
-/*
-ApiStatus N(func_80240300_9694C0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
-    s32 i;
-    s32* test;
+extern s16 MessagePlural;
+extern s16 MessageSingular;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+enum {
+    NPC_ARCHEOLOGIST,
+    NPC_DRYITE0,
+    NPC_DISGUISED_MOUSTAFA,
+    NPC_TOAD,
+    NPC_WORLD_MERLEE,
+    NPC_MOUSTAFA,
+    NPC_DRYITE1,
+    NPC_MOUSER0,
+    NPC_MOUSER1,
+    NPC_MOUSER2,
+    NPC_CHUCK_QUIZMO,
+    NPC_DRYITE2,
+};
+
+// BSS
+
+typedef struct {
+    s32 flags;
+    char unk_04[0x4];
+    s32 unk_08;
+    EffectInstanceDataThing* unk_0C;
+} N(temp);
+
+typedef struct {
+    s32 unk_00;
+    f32 unk_04;
+    f32 unk_08;
+    f32 unk_0C;
+    f32 unk_10;
+    s32 unk_14;
+    s32 unk_18;
+    s32 unk_1C;
+    s32 unk_20;
+} D_8024F010_Struct; // size = 0x24
+
+static s8 N(pad_D_8024EF80)[0x4];
+static f32 N(D_8024EF84);
+static s32 N(D_8024EF88);
+static s8 N(pad_D_8024EF8C)[0x4];
+static N(temp)* N(D_8024EF90)[4]; // possibly bigger?
+static s8 N(pad_D_8024EF94)[0x18];
+static s32 N(D_8024EFB8);
+static s8 N(pad_D_8024EFBC)[0x4];
+static Effect* N(D_8024EFC0);
+static Effect* N(D_8024EFC4);
+static Effect* N(D_8024EFC8);
+static ScriptInstance* N(D_8024EFCC);
+static s32 N(D_8024EFD0)[16];
+static D_8024F010_Struct N(D_8024F010)[3];
+static s8 N(pad_D_8024F07C)[0x4];
+static s32 N(D_8024F080)[112];
+static s8 N(pad_D_8024F244)[0x4]; // likely conencted to the above
+static s32 N(D_8024F248)[91];
+static s8 N(pad_D_8024F3B4)[0x4]; // likely conencted to the above
+static s32 N(D_8024F3B8);
+
+// DATA
+
+EntryList N(entryList) = {
+    { -473.0f, 0.0f, 12.0f, 90.0f },
+    { 415.0f, 35.0f, -15.0f, 180.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+    { 0.0f, 0.0f, 0.0f, 0.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_dro_02_tattle },
+};
+
+// *INDENT-OFF*
+Script N(80243AF0) = {
+    SI_CMD(ScriptOpcode_CALL, GetEntryID, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_MATCH, SI_VAR(0)),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 2),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 3),
+        SI_CMD(ScriptOpcode_END_CASE_MULTI),
+        SI_CMD(ScriptOpcode_CASE_ELSE),
+            SI_CMD(ScriptOpcode_CALL, SetMusicTrack, 0, 21, 0, 8),
+        SI_CMD(ScriptOpcode_END_CASE_MULTI),
+    SI_CMD(ScriptOpcode_END_MATCH),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80243B70) = SCRIPT({
+    SetMusicTrack(0, SONG_TAKING_REST, 0, 8);
+});
+
+Script N(80243B9C) = SCRIPT({
+    SetMusicTrack(0, SONG_MOUSTAFA_THEME, 0, 8);
+});
+
+static s32 N(pad_3BC8)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(makeEntities) = SCRIPT({
+    MakeItemEntity(ITEM_LETTER08, -135, 160, -245, 17, SI_SAVE_FLAG(757));
+    MakeEntity(0x802EAB04, 180, 173, -200, 0, ITEM_STOREROOM_KEY, MAKE_ENTITY_END);
+    AssignPanelFlag(SI_SAVE_FLAG(756));
+});
+
+static s32 N(pad_3C3C) = {
+    0x00000000,
+};
+
+Script N(exitWalk_80243C40) = EXIT_WALK_SCRIPT(60,  0, "dro_01",  1);
+
+Script N(80243C9C) = SCRIPT({
+    bind N(exitWalk_80243C40) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+Script N(80243CC8) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x017C), 160, 40);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80243D10) = SCRIPT({
+    PlaySound(0x80000060);
+    UseSettingsFrom(0, 190, 0, -37);
+    SetPanTarget(0, 190, 0, -37);
+    SetCamDistance(0, 200.0);
+    SetCamPitch(0, 13.0, -10.0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    N(UnkFunc27)(2, 0, 3);
+    N(UnkFunc27)(1, -1, 3);
+    N(UnkFunc26)(3, 44, 32, 177, 0, 0, 0, 0, 0, 0);
+    DisablePlayerInput(TRUE);
+    spawn {
+        ShakeCam(0, 0, 300, 0.2001953125);
+    }
+    spawn {
+        sleep 60;
+        GetEntryID(SI_VAR(0));
+        if (SI_VAR(0) == 2) {
+            GotoMap("sbk_02", 6);
+        } else {
+            GotoMap("sbk_02", 7);
+        }
+        sleep 100;
+    }
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_DRY_DRY_OUTPOST;
+    SetSpriteShading(-1);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    SetCamLeadPlayer(0, 0);
+    MakeNpcs(0, N(npcGroupList_8024EEF4));
+    func_802D3398();
+    await N(makeEntities);
+    await N(80244C78);
+    spawn N(80243AF0);
+    GetEntryID(SI_VAR(0));
+    match SI_VAR(0) {
+        2, 3 {
+            await N(80243D10);
+        }
+        else {
+            SI_VAR(0) = N(80243C9C);
+            spawn EnterWalk;
+        }
+    }
+    sleep 1;
+    spawn {
+        SetTexPanner(162, 1);
+        SI_VAR(0) = 0;
+    123:
+        SI_VAR(0) += 420;
+        if (SI_VAR(0) > 65536) {
+            SI_VAR(0) += -65536;
+        }
+        SetTexPanOffset(1, 0, 0, SI_VAR(0));
+        sleep 1;
+        goto 123;
+    }
+    SI_MAP_FLAG(0) = 0;
+    bind N(80243CC8) to TRIGGER_WALL_PRESS_A 56;
+    spawn {
+        loop {
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            if (SI_VAR(2) < -200) {
+                EnableGroup(163, 1);
+            } else {
+                EnableGroup(163, 0);
+            }
+            sleep 1;
+        }
+    }
+    SetCamSpeed(0, 1.333984375);
+});
+
+static s32 N(pad_41B4)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(802441C0) = SCRIPT({
+9:
+    MakeLerp(10, -10, 30, 10);
+10:
+    UpdateLerp();
+    RotateModel(48, SI_VAR(0), 1, 0, 0);
+    sleep 1;
+    if (SI_VAR(1) == 1) {
+        goto 10;
+    }
+    MakeLerp(-10, 10, 30, 10);
+11:
+    UpdateLerp();
+    RotateModel(48, SI_VAR(0), 1, 0, 0);
+    sleep 1;
+    if (SI_VAR(1) == 1) {
+        goto 11;
+    }
+    goto 9;
+});
+
+Script N(802442F0) = SCRIPT({
+    SI_VAR(0) /= 2;
+    SI_VAR(0) += 18;
+    RotateModel(21, SI_VAR(0), 0, 1, 0);
+});
+
+Script N(openDoor_80244340) = SCRIPT({
+    RotateModel(108, SI_VAR(0), 0, -1, 0);
+    RotateModel(110, SI_VAR(0), 0, 1, 0);
+});
+
+Script N(moveWalls_80244390) = SCRIPT({
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= (float) 50;
+    TranslateModel(104, 0, SI_VAR(1), 0);
+    TranslateModel(105, 0, SI_VAR(1), 0);
+    TranslateModel(106, 0, SI_VAR(1), 0);
+    RotateModel(104, SI_VAR(0), 1, 0, 0);
+    RotateModel(105, SI_VAR(0), 1, 0, 0);
+    RotateModel(106, SI_VAR(0), 1, 0, 0);
+});
+
+Script N(dropDoor_80244474) = SCRIPT({
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= (float) 50;
+    TranslateModel(108, 0, SI_VAR(1), 0);
+    TranslateModel(110, 0, SI_VAR(1), 0);
+    RotateModel(108, SI_VAR(0), 1, 0, 0);
+    RotateModel(110, SI_VAR(0), 1, 0, 0);
+});
+
+Script N(openDoor_8024451C) = SCRIPT({
+    RotateModel(62, SI_VAR(0), 0, 1, 0);
+});
+
+Script N(moveWalls_8024454C) = SCRIPT({
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(1) /= (float) 50;
+    RotateGroup(61, SI_VAR(0), 0, 0, -1);
+});
+
+Script N(8024459C) = SCRIPT({
+    match SI_VAR(0) {
+        == 0 {
+            SetCamSpeed(0, 3.0);
+        }
+        == 3 {
+            SetCamSpeed(0, 1.333984375);
+        }
+    }
+});
+
+Script N(toggleVis_80244600) = SCRIPT({
+    match SI_VAR(0) {
+        == 0 {
+            SetGroupEnabled(87, 1);
+            SetCamSpeed(0, 3.0);
+        }
+        == 3 {
+            SetGroupEnabled(87, 0);
+            SetCamSpeed(0, 1.333984375);
+        }
+    }
+});
+
+Script N(toggleVis_8024468C) = SCRIPT({
+    match SI_VAR(0) {
+        == 0 {
+            SetGroupEnabled(132, 1);
+            SetCamType(0, 0, 0);
+            SetCamDistance(0, 260);
+            SetCamPitch(0, 22, -13);
+            SetCamPosA(0, 0, 290);
+            SetCamPosB(0, 0, -290);
+            SetCamPosC(0, 0, 0);
+            SetPanTarget(0, -395, 140, -150);
+            SetCamSpeed(0, 4.0);
+            PanToTarget(0, 0, 1);
+        }
+        == 2 {
+            SetPanTarget(0, -365, 140, -145);
+            SetCamPitch(0, 20, -7);
+            SetCamDistance(0, 400);
+            SetCamSpeed(0, 4.0);
+            WaitForCam(0, 1.0);
+        }
+        == 3 {
+            SetGroupEnabled(132, 0);
+            PanToTarget(0, 0, 0);
+            SetCamSpeed(0, 1.333984375);
+        }
+    }
+});
+
+Script N(8024486C) = SCRIPT({
+    group 0;
+    DisablePlayerInput(TRUE);
+    func_802D2C14(1);
+    PlayerMoveTo(230, 10, 20);
+    ModifyColliderFlags(0, 8, 0x7FFFFE00);
+    PlaySoundAtCollider(8, 449, 0);
+    MakeLerp(18, 80, 10, 0);
+    loop {
+        UpdateLerp();
+        RotateModel(21, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    PlayerMoveTo(230, -70, 15);
+    MakeLerp(80, 18, 10, 0);
+    loop {
+        UpdateLerp();
+        RotateModel(21, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    PlaySoundAtCollider(8, 450, 0);
+    ModifyColliderFlags(1, 8, 0x7FFFFE00);
+    func_802D2C14(0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80244A68) = SCRIPT({
+    group 0;
+    DisablePlayerInput(TRUE);
+    func_802D2C14(1);
+    PlayerMoveTo(230, -70, 20);
+    ModifyColliderFlags(0, 10, 0x7FFFFE00);
+    PlaySoundAtCollider(10, 449, 0);
+    MakeLerp(18, 80, 10, 0);
+    loop {
+        UpdateLerp();
+        RotateModel(21, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    PlayerMoveTo(230, 10, 15);
+    MakeLerp(80, 18, 10, 0);
+    loop {
+        UpdateLerp();
+        RotateModel(21, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    PlaySoundAtCollider(10, 450, 0);
+    ModifyColliderFlags(1, 10, 0x7FFFFE00);
+    func_802D2C14(0);
+    DisablePlayerInput(FALSE);
+});
+
+s32 N(npcList_80244C64)[] = {
+    0x00000002, 0x00000005, 0xFFFFFFFF,
+};
+
+s32 N(npcList_80244C70)[] = {
+    0x00000003, 0xFFFFFFFF,
+};
+
+Script N(80244C78) = SCRIPT({
+    spawn N(802441C0);
+    ParentColliderToModel(8, 21);
+    if (STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
+        RotateModel(21, 18, 0, 1, 0);
+        UpdateColliderTransform(8);
+    }
+    MakeDoorAdvanced(4, N(openDoor_80244340), N(moveWalls_80244390), N(dropDoor_80244474), N(toggleVis_8024468C), 15, 16, 133, N(npcList_80244C64));
+    if (STORY_PROGRESS >= STORY_CH2_BOUGHT_SECRET_ITEMS) {
+        bind N(8024486C) to TRIGGER_WALL_PRESS_A 8;
+        bind N(80244A68) to TRIGGER_WALL_PRESS_A 10;
+    }
+    MakeDoorAdvanced(4101, N(openDoor_8024451C), N(moveWalls_8024454C), 0, N(toggleVis_80244600), 12, 13, 94, N(npcList_80244C70));
+    SI_VAR(0) = 3;
+    spawn N(toggleVis_8024468C);
+    spawn N(8024459C);
+    spawn N(toggleVis_80244600);
+});
+
+static s32 N(pad_4DD4)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+s32** N(D_80244DE0_96DFA0) = NULL;
+
+Script N(80244DE4) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 0);
+    return;
+});
+
+Script N(80244E14) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 16);
+    return;
+});
+
+u8 N(quizAnswers)[] = {
+    0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00,
+    0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02,
+    0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00,
+    0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01,
+    0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01,
+    0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01,
+    0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02,
+    0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01,
+};
+
+typedef struct {
+    s32 unk_00;
+    s32 unk_04;
+} N(quizReqStruct);
+
+N(quizReqStruct) N(quizRequirements)[] = {
+    { -108, 0 }, { -76, 10 },
+    { -54, 20 }, { -14, 30 },
+    {   6, 37 }, {  39, 44 },
+    {  58, 52 }, {  88, 60 },
+    {  96, 64 }, {   0, 64 },
+};
+
+Script N(80244ED4) = SCRIPT({
+    N(GetGameStatus75)();
+    if (SI_VAR(0) <= 1) {
+        GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 300;
+        SetNpcJumpscale(NPC_SELF, 1);
+        SetNpcAnimation(NPC_SELF, 0xAF000C);
+        sleep 40;
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(80244F84) = SCRIPT({
+    N(GetCamVfov)(0, SI_ARRAY(0));
+    N(SetCamVfov)(0, 25);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetCamType(0, SI_VAR(1), SI_VAR(2));
+    SetCamType(0, SI_VAR(1), 0);
+    GetCamDistance(0, SI_VAR(0));
+    if (SI_VAR(0) > 0) {
+        SI_VAR(0) = (float) 370;
+    } else {
+        SI_VAR(0) = (float) -370;
+    }
+    SetCamDistance(0, SI_VAR(0));
+    GetCamPitch(0, SI_VAR(0), SI_VAR(1));
+    SI_VAR(0) = (float) 13.0;
+    SI_VAR(1) = (float) -10.0;
+    SetCamPitch(0, SI_VAR(0), SI_VAR(1));
+    PanToTarget(0, 0, 1);
+    SetCamLeadPlayer(0, 0);
+});
+
+Script N(80245120) = SCRIPT({
+    GetNpcPos(NPC_CHUCK_QUIZMO, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(1) += 30;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetCamDistance(0, SI_VAR(0));
+    if (SI_VAR(0) > 0) {
+        SI_VAR(0) = (float) 17;
+    } else {
+        SI_VAR(0) = (float) -17;
+    }
+    SetCamDistance(0, SI_VAR(0));
+    SetCamSpeed(0, 90.0);
+    WaitForCam(0, 1.0);
+    SetCamSpeed(0, 1);
+});
+
+Script N(8024521C) = SCRIPT({
+    N(SetCamVfov)(0, SI_ARRAY(0));
+    PanToTarget(0, 0, 0);
+});
+
+Script N(80245258) = SCRIPT({
+    sleep 20;
+    N(UnkCameraFunc)(SI_ARRAY(1), SI_ARRAY(3), 83, SI_VAR(0), SI_VAR(1));
+    spawn {
+        SI_VAR(2) = (float) 0;
+        loop 60 {
+            SI_VAR(3) = (float) SI_VAR(0);
+            SI_VAR(4) = (float) SI_VAR(1);
+            SI_VAR(3) *= (float) SI_VAR(2);
+            SI_VAR(4) *= (float) SI_VAR(2);
+            SI_VAR(3) /= (float) 60;
+            SI_VAR(4) /= (float) 60;
+            SI_VAR(3) += (float) SI_ARRAY(1);
+            SI_VAR(4) += (float) SI_ARRAY(3);
+            SetPlayerPos(SI_VAR(3), SI_ARRAY(2), SI_VAR(4));
+            SI_VAR(2) += (float) 1;
+            sleep 1;
+        }
+        SI_VAR(3) = (float) SI_VAR(0);
+        SI_VAR(4) = (float) SI_VAR(1);
+        SI_VAR(3) += (float) SI_ARRAY(1);
+        SI_VAR(4) += (float) SI_ARRAY(3);
+        SetPlayerPos(SI_VAR(3), SI_ARRAY(2), SI_VAR(4));
+    }
+    N(UnkRotatePlayer)();
+    func_802D2884(SI_ARRAY(1), SI_ARRAY(3), 0);
+    SetPlayerAnimation(ANIM_10002);
+});
+
+Script N(80245408) = SCRIPT({
+    GetNpcPos(NPC_PARTNER, SI_VAR(10), SI_VAR(11), SI_VAR(12));
+    N(UnkCameraFunc)(SI_VAR(10), SI_VAR(12), 108, SI_VAR(0), SI_VAR(1));
+    SI_VAR(5) = (float) SI_ARRAY(2);
+    SI_VAR(5) -= (float) SI_VAR(11);
+    spawn {
+        N(UnkMovePartner)();
+        SI_VAR(3) = (float) SI_VAR(0);
+        SI_VAR(4) = (float) SI_VAR(1);
+        SI_VAR(6) = (float) SI_VAR(5);
+        SI_VAR(3) += (float) SI_VAR(10);
+        SI_VAR(4) += (float) SI_VAR(12);
+        SI_VAR(6) += (float) SI_VAR(11);
+        SetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(6), SI_VAR(4));
+    }
+    N(UnkRotatePartner)();
+    NpcFacePlayer(NPC_PARTNER, 0);
+    SetNpcAnimation(NPC_PARTNER, 0x106);
+});
+
+Script N(80245540) = SCRIPT({
+    GetNpcPos(NPC_CHUCK_QUIZMO, SI_VAR(10), SI_VAR(11), SI_VAR(12));
+    N(UnkCameraFunc)(SI_VAR(10), SI_VAR(12), -70, SI_VAR(0), SI_VAR(1));
+    spawn {
+        SI_VAR(2) = (float) 0;
+        loop 60 {
+            SI_VAR(3) = (float) SI_VAR(0);
+            SI_VAR(4) = (float) SI_VAR(1);
+            SI_VAR(3) *= (float) SI_VAR(2);
+            SI_VAR(4) *= (float) SI_VAR(2);
+            SI_VAR(3) /= (float) 60;
+            SI_VAR(4) /= (float) 60;
+            SI_VAR(3) += (float) SI_VAR(10);
+            SI_VAR(4) += (float) SI_VAR(12);
+            SetNpcPos(NPC_CHUCK_QUIZMO, SI_VAR(3), SI_ARRAY(2), SI_VAR(4));
+            SI_VAR(2) += (float) 1;
+            sleep 1;
+        }
+    }
+    sleep 60;
+    NpcFacePlayer(NPC_CHUCK_QUIZMO, 0);
+    SetNpcAnimation(NPC_CHUCK_QUIZMO, 0xAF0001);
+});
+
+Script N(802456AC) = SCRIPT({
+    spawn N(80245258);
+    spawn N(80245408);
+    await N(80245540);
+});
+
+Script N(802456E0) = SCRIPT({
+    loop {
+        SetPlayerAnimation(ANIM_QUESTION);
+        sleep 20;
+    }
+});
+
+Script N(80245720) = SCRIPT({
+    SetPlayerAnimation(ANIM_THROW);
+    sleep 15;
+    SetPlayerAnimation(ANIM_10002);
+});
+
+Script N(8024575C) = SCRIPT({
+    loop {
+        SetPlayerAnimation(ANIM_10002);
+        sleep 1;
+        SetPlayerAnimation(ANIM_BEFORE_JUMP);
+        sleep 2;
+        SetPlayerAnimation(ANIM_MIDAIR_STILL);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_MIDAIR);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_10009);
+        sleep 2;
+        sleep 1;
+        SetPlayerAnimation(ANIM_BEFORE_JUMP);
+        sleep 2;
+        SetPlayerAnimation(ANIM_MIDAIR_STILL);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_MIDAIR);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_10009);
+        sleep 2;
+        sleep 1;
+        SetPlayerAnimation(ANIM_BEFORE_JUMP);
+        sleep 2;
+        SetPlayerAnimation(ANIM_MIDAIR_STILL);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_MIDAIR);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += 0;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -2;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SI_VAR(1) += -3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        SetPlayerAnimation(ANIM_10009);
+        sleep 2;
+    }
+    SetPlayerAnimation(ANIM_10002);
+    SetPlayerPos(SI_VAR(0), SI_ARRAY(2), SI_VAR(2));
+    sleep 1;
+});
+
+Script N(802462A4) = SCRIPT({
+    SetPlayerAnimation(ANIM_SHOCK_STILL);
+    loop {
+        sleep 1;
+    }
+});
+
+Script N(802462E4) = SCRIPT({
+    spawn {
+        N(UnkCameraFunc)(SI_ARRAY(1), SI_ARRAY(3), 25, SI_VAR(0), SI_VAR(1));
+        SI_VAR(2) = (float) SI_ARRAY(1);
+        SI_VAR(2) += (float) SI_VAR(0);
+        SI_VAR(3) = (float) SI_ARRAY(3);
+        SI_VAR(3) += (float) SI_VAR(1);
+        SetNpcAnimation(NPC_PARTNER, 0x102);
+        NpcMoveTo(NPC_PARTNER, SI_VAR(2), SI_VAR(3), 40);
+        SetNpcAnimation(NPC_PARTNER, 0x106);
+    }
+    PlayerMoveTo(SI_ARRAY(1), SI_ARRAY(3), 40);
+});
+
+Script N(802463C0) = SCRIPT({
+    SI_VAR(1) = spawn N(8024575C);
+    sleep 60;
+    kill SI_VAR(1);
+    loop 5 {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 2;
+    }
+    sleep 20;
+    await N(802462E4);
+});
+
+Script N(80246470) = SCRIPT({
+    SI_VAR(1) = spawn N(802462A4);
+    sleep 60;
+    loop 5 {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += -1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 2;
+    }
+    sleep 20;
+    kill SI_VAR(1);
+    await N(802462E4);
+});
+
+// *INDENT-OFF*
+Script N(80246520) = {
+    SI_CMD(ScriptOpcode_IF_GT, SI_SAVE_VAR(352), 63),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_ARRAY(1), SI_ARRAY(2), SI_ARRAY(3)),
+    SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, -1, 16),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(352), 63),
+        SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524298),
+    SI_CMD(ScriptOpcode_ELSE),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1767), 1),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524297),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524296),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1767), 1),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, ShowChoice, 1966093),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 1),
+        SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 11468804, 11468801, 0, 524300),
+        SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80244ED4)),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1793), 1),
+    SI_CMD(ScriptOpcode_CALL, N(Set80151310_1)),
+    SI_CMD(ScriptOpcode_CALL, N(UnkAlphaFunc)),
+    SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80244F84)),
+    SI_CMD(ScriptOpcode_CALL, DisablePartnerAI, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, -4, 512, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 10, 512, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, -4, 328, 1),
+    SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 10, 256, 1),
+    SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, -4, 262),
+    SI_CMD(ScriptOpcode_SPAWN_GET_ID, N(802456AC), SI_VAR(1)),
+    SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 11468804, 11468801, 0, 524299),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 137),
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+            SI_CMD(ScriptOpcode_BREAK_LOOP),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_CALL, N(func_80240A70_969C30)),
+    SI_CMD(ScriptOpcode_LOOP, 5),
+        SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 1),
+        SI_CMD(ScriptOpcode_CALL, SetPlayerPos, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), 2883584),
+    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), SI_SAVE_VAR(352)),
+    SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468805, 11468806, 0, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerAnimation, 65576),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), 2949120),
+    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), SI_SAVE_VAR(352)),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 142),
+    SI_CMD(ScriptOpcode_CALL, ShowChoice, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_KILL_SCRIPT, SI_VAR(1)),
+    SI_CMD(ScriptOpcode_CALL, StopSound, 142),
+    SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80245720)),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 141),
+    SI_CMD(ScriptOpcode_CALL, N(func_80240D70_969F30), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 0),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241364_96A524)),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 40),
+    SI_CMD(ScriptOpcode_CALL, N(func_802409EC_969BAC)),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 110),
+        SI_CMD(ScriptOpcode_CALL, CloseChoice),
+        SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 0),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 1),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468807),
+        SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 1),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_CALL, N(func_80240D3C_969EFC), 1),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, N(func_80240D3C_969EFC), 2),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+            SI_CMD(ScriptOpcode_CALL, PlaySound, 540),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 138),
+        SI_CMD(ScriptOpcode_CALL, N(func_80240E08_969FC8)),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+            SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 50),
+            SI_CMD(ScriptOpcode_CALL, N(UnkCameraFunc), 0, 0, 83, SI_VAR(0), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 7, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 68, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 60, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(1), -3),
+            SI_CMD(ScriptOpcode_CALL, N(UnkCameraFunc), 0, 0, 58, SI_VAR(0), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 7, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 68, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 60, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 30),
+            SI_CMD(ScriptOpcode_CALL, N(UnkCameraFunc), 0, 0, 93, SI_VAR(0), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 7, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 68, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 60, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+        SI_CMD(ScriptOpcode_SPAWN_GET_ID, N(802463C0), SI_VAR(1)),
+        SI_CMD(ScriptOpcode_ADD, SI_SAVE_VAR(352), 1),
+        SI_CMD(ScriptOpcode_IF_GT, SI_SAVE_VAR(352), 63),
+            SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, -1, -1, 0, 524304),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468806),
+            SI_CMD(ScriptOpcode_LOOP, 0),
+                SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+                    SI_CMD(ScriptOpcode_BREAK_LOOP),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468805),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(0), 348),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(1), 3),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80244DE4)),
+            SI_CMD(ScriptOpcode_CALL, AddStarPieces, 1),
+            SI_CMD(ScriptOpcode_CALL, N(func_80240D3C_969EFC), 15),
+            SI_CMD(ScriptOpcode_CALL, N(func_80240DF0_969FB0)),
+            SI_CMD(ScriptOpcode_CALL, SetMessageValue, SI_SAVE_VAR(352), 0),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524305),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, -1, -1, 0, 524302),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468806),
+            SI_CMD(ScriptOpcode_LOOP, 0),
+                SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+                    SI_CMD(ScriptOpcode_BREAK_LOOP),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468805),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(0), 348),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(1), 1),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80244DE4)),
+            SI_CMD(ScriptOpcode_CALL, AddStarPieces, 1),
+            SI_CMD(ScriptOpcode_CALL, N(func_80240D3C_969EFC), 15),
+            SI_CMD(ScriptOpcode_CALL, N(func_80240DF0_969FB0)),
+            SI_CMD(ScriptOpcode_CALL, SetMessageValue, SI_SAVE_VAR(352), 0),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(352), 1),
+                SI_CMD(ScriptOpcode_CALL, SetMessageString, &MessageSingular, 1),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_CALL, SetMessageString, &MessagePlural, 1),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 11468804, 11468801, 0, 524303),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 1),
+    SI_CMD(ScriptOpcode_ELSE),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468809),
+        SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), 2),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 541),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 139),
+        SI_CMD(ScriptOpcode_SPAWN_GET_ID, N(80246470), SI_VAR(1)),
+        SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(2), SI_VAR(3), SI_VAR(4)),
+        SI_CMD(ScriptOpcode_CALL, PlayEffect, 43, 0, SI_VAR(2), SI_VAR(3), SI_VAR(4), 0, 0, 0, 0, 0, 0, 0, 0, 0),
+        SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, -1, -1, 0, 524301),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 10, 11468810),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(1), SI_VAR(0)),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 0),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, N(func_80240D70_969F30), -1),
+    SI_CMD(ScriptOpcode_CALL, EnablePartnerAI),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 143),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 45),
+        SI_CMD(ScriptOpcode_CALL, StopSound, 137),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_CALL, N(func_80240E24_969FE4)),
+    SI_CMD(ScriptOpcode_CALL, N(func_80240C88_969E48)),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80244ED4)),
+    SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(8024521C)),
+    SI_CMD(ScriptOpcode_CALL, N(UnkFunc29)),
+    SI_CMD(ScriptOpcode_CALL, N(Set80151310_0)),
+    SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1793), 0),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80247250) = SCRIPT({
+    N(func_8024043C_9695FC)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    SetNpcFlagBits(NPC_SELF, ((0x01000000)), FALSE);
+    SetNpcSprite(-1, 0x00AF0001);
+    N(UnkFunc31)();
+});
+
+Script N(802472C4) = {
+    SI_CMD(ScriptOpcode_USE_ARRAY, &gPauseMenuTargetPosX),
+    SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1769), 1),
+    SI_CMD(ScriptOpcode_CALL, DisablePlayerPhysics, 1),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerFlagBits, 4194304, 1),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80246520)),
+    SI_CMD(ScriptOpcode_CALL, DisablePlayerPhysics, 0),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerFlagBits, 4194304, 0),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(80247344) = SCRIPT({
+    N(GetNpcUnsafeOwner2)();
+});
+
+NpcAISettings N(npcAISettings_80247360) = {
+    .moveSpeed = 0.7f,
+    .moveTime = 30,
+    .waitTime = 20,
+    .unk_14 = -1,
+    .unk_2C = 1,
+};
+
+Script N(80247390) = SCRIPT({
+    DoBasicAI(N(npcAISettings_80247360));
+});
+
+NpcSettings N(npcSettings_802473B0) = {
+    .unk_00 = { 0x00, 0xAF, 0x00, 0x01 },
+    .height = 35,
+    .radius = 28,
+    .otherAI = &N(80247250),
+    .onInteract = &N(802472C4),
+    .aux = &N(80247344),
+    .flags = 0x00000D01,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_802473DC) = {
+    .unk_00 = { 0x00, 0xAF, 0x00, 0x01 },
+    .height = 35,
+    .radius = 28,
+    .otherAI = &N(80247250),
+    .onInteract = &N(802472C4),
+    .ai = &N(80247390),
+    .aux = &N(80247344),
+    .flags = 0x00000C01,
+    .level = 99,
+    .unk_2A = 0x10,
+};
+
+NpcAISettings N(npcAISettings_80247408) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 60,
+    .waitTime = 30,
+    .unk_14 = -1,
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80247438) = SCRIPT({
+    DoBasicAI(N(npcAISettings_80247408));
+});
+
+NpcSettings N(npcSettings_80247458) = {
+    .height = 35,
+    .radius = 24,
+    .ai = &N(npcAI_80247438),
+    .level = 99,
+    .unk_2A = 0x10,
+};
+
+NpcSettings N(npcSettings_80247484) = {
+    .height = 42,
+    .radius = 24,
+    .ai = &N(npcAI_80247438),
+    .level = 99,
+};
+
+NpcAISettings N(npcAISettings_802474B0) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 60,
+    .waitTime = 30,
+    .unk_14 = -1,
+    .unk_2C = 1,
+};
+
+Script N(npcAI_802474E0) = SCRIPT({
+    DoBasicAI(N(npcAISettings_802474B0));
+});
+
+NpcSettings N(npcSettings_80247500) = {
+    .height = 26,
+    .radius = 23,
+    .ai = &N(npcAI_802474E0),
+    .level = 99,
+    .unk_2A = 16,
+};
+
+NpcSettings N(npcSettings_8024752C) = {
+    .height = 26,
+    .radius = 23,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80247558) = {
+    .height = 22,
+    .radius = 25,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80247584) = {
+    .height = 30,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_802475B0) = {
+    .height = 23,
+    .radius = 19,
+    .level = 99,
+};
+
+s8 N(D_802475DC_97079C)[] = {
+    0x14, 0x0A, 0x05, 0x00,
+};
+
+s8 N(D_802475E0_9707A0)[] = {
+    0x32, 0x14, 0x05, 0x00,
+};
+
+s32 N(pad_XX111)[] = { 0 };
+
+// 32x32 Ci4
+s32 N(image1)[] = {
+    0x66000000, 0x00000000, 0x00000000, 0x00000000, 0x60000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000333, 0x33333333, 0x33333333, 0x33333333,
+    0x00000333, 0x33333333, 0x33333333, 0x33333333, 0x00000334, 0x44442024, 0x44444444, 0x20244444,
+    0x00000334, 0x41120202, 0x11444112, 0x02021144, 0x00000334, 0x11202120, 0x21141120, 0x21202114,
+    0x00000334, 0x12021112, 0x02141202, 0x11120214, 0x00000334, 0x20211511, 0x20242021, 0x15112024,
+    0x00000332, 0x02115551, 0x12020211, 0x55511202, 0x00000330, 0x21155555, 0x11202115, 0x55551120,
+    0x00000332, 0x02115551, 0x12020211, 0x55511202, 0x00000334, 0x20211511, 0x20212021, 0x15112021,
+    0x00000334, 0x12021112, 0x02111202, 0x11120211, 0x00000334, 0x11202120, 0x21131120, 0x21202113,
+    0x00000334, 0x41120202, 0x11333112, 0x02021133, 0x00000334, 0x44442021, 0x13333311, 0x20211333,
+    0x00000334, 0x44442021, 0x13333311, 0x20211333, 0x00000334, 0x44442021, 0x13333311, 0x20211333,
+    0x00000334, 0x41120202, 0x11333112, 0x02021133, 0x00000334, 0x11202120, 0x21131120, 0x21202113,
+    0x00000334, 0x12021112, 0x02111202, 0x11120211, 0x00000334, 0x20211511, 0x20212021, 0x12112021,
+    0x00000332, 0x02115551, 0x12020211, 0x22211202, 0x00000330, 0x21155555, 0x11202112, 0x22221120,
+    0x00000332, 0x02115551, 0x12020211, 0x22211202, 0x00000334, 0x20211511, 0x20212021, 0x12112021,
+    0x00000334, 0x12021112, 0x02111202, 0x11120211, 0x00000334, 0x11202120, 0x21131120, 0x21202113,
+    0x00000334, 0x41120202, 0x11333112, 0x02021133, 0x00000334, 0x44442021, 0x13333311, 0x20211333,
+};
+
+// Above palette
+s32 N(image1_pal)[] = {
+    0xEF7BB18D, 0xCCABCD4F, 0x998DC30F, 0xEF7BEDF2, 0x0D2F0000, 0x00000000, 0x00000000, 0x00000000,
+};
+
+
+Vtx N(D_80247808_9709C8)[] = {
+    { .v = { -24, 2, 0, 0, 0, 60, 0xFF, 0xFF, 0xFF, 0xFF } },
+    { .v = { -22, 0, 0, 0, 85, 0, 0xFF, 0xFF, 0xFF, 0xFF } },
+    { .v = { 22, 0, 0, 0, 1963, 0, 0xFF, 0xFF, 0xFF, 0xFF } },
+    { .v = { 24, 2, 0, 0, 2048, 60, 0xFF, 0xFF, 0xFF, 0xFF } },
+    { .v = { 24, 66, 0, 0, 2048, 1988, 0xFF, 0xFF, 0xFF, 0xFF } },
+    { .v = { 22, 68, 0, 0, 1963, 2048, 0xFF, 0xFF, 0xFF, 0xFF } },
+    { .v = { -22, 68, 0, 0, 85, 2048, 0xFF, 0xFF, 0xFF, 0xFF } },
+    { .v = { -24, 66, 0, 0, 0, 1988, 0xFF, 0xFF, 0xFF, 0xFF } },
+};
+
+Vtx N(D_80247888_970A48)[] = {
+    { .v = { -30, 68, -2, 0, 0, -160, 0x00, 0x00, 0x00, 0x00 } },
+    { .v = { 30, 68, -2, 0, 1920, -160, 0x00, 0x00, 0x00, 0x00 } },
+    { .v = { -30, 0, -2, 0, 0, 2016, 0x00, 0x00, 0x00, 0x00 } },
+    { .v = { 30, 0, -2, 0, 1920, 2016, 0x00, 0x00, 0x00, 0x00 } },
+};
+
+Gfx N(D_802478C8_970A88)[] = {
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsSPClearGeometryMode(G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetTextureLOD(G_TL_TILE),
+    gsDPSetTextureLUT(G_TT_RGBA16),
+    gsDPSetTexturePersp(G_TP_PERSP),
+    gsDPSetTextureFilter(G_TF_BILERP),
+    gsDPSetColorDither(G_CD_DISABLE),
+    gsDPSetTextureDetail(G_TD_CLAMP),
+    gsDPSetTextureConvert(G_TC_FILT),
+    gsDPSetCombineKey(G_CK_NONE),
+    gsDPSetAlphaCompare(G_AC_NONE),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsDPLoadTLUT_pal16(0, N(image1_pal)),
+    gsDPLoadTextureTile_4b(N(image1), G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
+    gsSPEndDisplayList(),
+};
+
+Gfx N(D_802479B8_970B78)[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_CULL_BOTH),
+    gsSPSetGeometryMode(G_CULL_BACK),
+    gsSPVertex(N(D_80247808_9709C8), 8, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0),
+    gsSPClearGeometryMode(G_CULL_BOTH),
+    gsSPSetGeometryMode(G_CULL_FRONT),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0),
+    gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
+    gsSPEndDisplayList(),
+};
+
+Gfx N(D_80247A38_970BF8)[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPClearGeometryMode(G_CULL_BOTH),
+    gsSPSetGeometryMode(G_CULL_FRONT),
+    gsSPVertex(N(D_80247888_970A48), 4, 0),
+    gsSP2Triangles(0, 2, 1, 0, 1, 2, 3, 0),
+    gsSPSetGeometryMode(G_CULL_BACK),
+    gsDPPipeSync(),
+    gsSPEndDisplayList(),
+};
+
+Script N(init_80247A80) = SCRIPT({
+
+});
+
+Script N(npcAI_80247A90) = SCRIPT({
+
+});
+
+// *INDENT-OFF*
+Script N(80247AA0) = {
+    SI_CMD(ScriptOpcode_USE_ARRAY, N(D_8024EFD0)),
+    SI_CMD(ScriptOpcode_SET, SI_ARRAY(9), 0),
+    SI_CMD(ScriptOpcode_CALL, GetNpcPos, 4, SI_ARRAY(4), SI_ARRAY(5), SI_ARRAY(6)),
+    SI_CMD(ScriptOpcode_ADD, SI_ARRAY(4), 60),
+    SI_CMD(ScriptOpcode_ADD, SI_ARRAY(6), 0),
+    SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 4, 513, 0),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_CALL, MakeLerp, 720, 0, 60, 0),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+            SI_CMD(ScriptOpcode_CALL, SetNpcRotation, 4, 0, SI_VAR(0), 0),
+            SI_CMD(ScriptOpcode_IF_GT, SI_VAR(0), 360),
+                SI_CMD(ScriptOpcode_ADD, SI_VAR(0), -360),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_MATCH, SI_VAR(0)),
+                SI_CMD(ScriptOpcode_CASE_RANGE, 90, 270),
+                    SI_CMD(ScriptOpcode_SET, SI_VAR(2), 12189697),
+                SI_CMD(ScriptOpcode_CASE_ELSE),
+                    SI_CMD(ScriptOpcode_SET, SI_VAR(2), 12189698),
+            SI_CMD(ScriptOpcode_END_MATCH),
+            SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, SI_VAR(2)),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_CALL, SetNpcRotation, 4, 0, 0, 0),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, 12189706),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 200),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, 12189705),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 40),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, 12189706),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 75),
+        SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, 12189707),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 60),
+    SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 4, 514, 0),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), SI_ARRAY(5)),
+    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 25),
+    SI_CMD(ScriptOpcode_CALL, PlayEffect, 79, 0, SI_ARRAY(4), SI_VAR(0), SI_ARRAY(6), 1, -1, 0, 0, 0, 0, 0, 0, 0),
+    SI_CMD(ScriptOpcode_SET, SI_ARRAY(8), SI_VAR(15)),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+        SI_CMD(ScriptOpcode_CALL, func_802D7B10, SI_ARRAY(8)),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_CALL, N(func_802414C0_96A680)),
+    SI_CMD(ScriptOpcode_CALL, DisablePlayerPhysics, 1),
+    SI_CMD(ScriptOpcode_CALL, InterpPlayerYaw, 0, 0),
+    SI_CMD(ScriptOpcode_CALL, N(func_802416FC_96A8BC)),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_ARRAY(9), 2),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 9),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 4),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 4),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 3),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 3),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 6),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 3),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 3),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 3),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 3),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, -1342177251),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_IF_GE, SI_ARRAY(9), 3),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 9),
+        SI_CMD(ScriptOpcode_CALL, N(func_8024303C_96C1FC)),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+        SI_CMD(ScriptOpcode_CALL, N(func_80243068_96C228)),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_IF_GE, SI_ARRAY(9), 10),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 3),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 516),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_IF_GE, SI_ARRAY(9), 11),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+        SI_CMD(ScriptOpcode_CALL, PlaySound, 517),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_ARRAY(9), 13),
+            SI_CMD(ScriptOpcode_BREAK_LOOP),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerPos, SI_ARRAY(4), SI_ARRAY(5), SI_ARRAY(6)),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerAnimation, 65567),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_CALL, SetPlayerPos, SI_ARRAY(4), SI_ARRAY(5), SI_ARRAY(6)),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_CALL, DisablePlayerPhysics, 0),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241874_96AA34)),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_CALL, N(func_802415CC_96A78C)),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(802481D8) = SCRIPT({
+    GetNpcPos(NPC_WORLD_MERLEE, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 200);
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 8.0);
+    SetCamPitch(0, 20, -15);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+});
+
+Script N(802482A8) = SCRIPT({
+    PanToTarget(0, 0, 0);
+    SetCamSpeed(0, 3.0);
+    WaitForCam(0, 1.0);
+});
+
+// *INDENT-OFF*
+Script N(802482F8) = {
+    SI_CMD(ScriptOpcode_CALL, func_802D2C14, 1),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802481D8)),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), 0),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(348), 8),
+        SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(536), 1),
+        SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(759), 0),
+        SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 3),
+        SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 12189703, 12189700, 0, 852188),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(0), 39),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 1),
+        SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80244DE4)),
+        SI_CMD(ScriptOpcode_CALL, AddKeyItem, 39),
+        SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(759), 1),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+        SI_CMD(ScriptOpcode_CALL, func_802D2C14, 0),
+        SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802482A8)),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 12189703, 12189700, 0, 852182),
+    SI_CMD(ScriptOpcode_CALL, ShowChoice, 1966097),
+    SI_CMD(ScriptOpcode_IF_NE, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 12189703, 12189700, 0, 852183),
+        SI_CMD(ScriptOpcode_CALL, func_802D2C14, 0),
+        SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802482A8)),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 12189703, 12189700, 0, 852184),
+    SI_CMD(ScriptOpcode_CALL, ShowCoinCounter, 1),
+    SI_CMD(ScriptOpcode_CALL, ShowChoice, 1966104),
+    SI_CMD(ScriptOpcode_CALL, ShowCoinCounter, 0),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 3),
+        SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 12189703, 12189700, 0, 852183),
+        SI_CMD(ScriptOpcode_CALL, func_802D2C14, 0),
+        SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802482A8)),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241394_96A554), SI_VAR(0), SI_VAR(1)),
+    SI_CMD(ScriptOpcode_IF_NE, SI_VAR(1), 0),
+        SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 12189703, 12189700, 0, 852185),
+        SI_CMD(ScriptOpcode_CALL, func_802D2C14, 0),
+        SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802482A8)),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, ContinueSpeech, -1, 12189703, 12189700, 0, 852186),
+    SI_CMD(ScriptOpcode_CALL, SetMusicTrack, 0, 124, 0, 8),
+    SI_CMD(ScriptOpcode_CALL, DisablePartnerAI, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, -4, 262),
+    SI_CMD(ScriptOpcode_SPAWN_GET_ID, N(80247AA0), SI_VAR(9)),
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_SCRIPT_EXISTS, SI_VAR(9), SI_VAR(1)),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+            SI_CMD(ScriptOpcode_BREAK_LOOP),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 60),
+    SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, 12189700),
+    SI_CMD(ScriptOpcode_CALL, PlayerMoveTo, -100, -370, 8),
+    SI_CMD(ScriptOpcode_CALL, SpeakToPlayer, -1, 12189703, 12189700, 0, 852187),
+    SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80243AF0)),
+    SI_CMD(ScriptOpcode_CALL, EnablePartnerAI),
+    SI_CMD(ScriptOpcode_CALL, func_802D2C14, 0),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802482A8)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+NpcSettings N(npcSettings_80248754) = {
+    .height = 32,
+    .radius = 32,
+    .otherAI = &N(init_80247A80),
+    .onInteract = &N(802482F8),
+    .ai = &N(npcAI_80247A90),
+    .level = 99,
+};
+
+s32 N(D_80248780_971940) = {
+    0x00000000,
+};
+
+s32 N(D_80248784_971944) = {
+    0x00000000,
+};
+
+Script N(80248788) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D6420();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveKeyItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            SI_VAR(0) |= (const)  0x50000;
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_80243314_96C4D4)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(802488CC) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_8024334C_96C50C), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80248788), 0x10, 0, N(D_8024F080), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_802432C0_96C480), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(8024891C) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D663C();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_80243314_96C4D4)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(80248A50) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_802433E8_96C5A8), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(8024891C), 0x10, 0, N(D_8024F248), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_802432C0_96C480), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Gfx N(D_8024A3B8_973578)[];
+s32 N(D_80248DD8_971F98)[];
+
+s32 N(D_80248AA0_971C60)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x02EE0000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248ACC_971C8C)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248AA0_971C60), 0x00000000,
+    0x02BC0000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248AF8_971CB8)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248ACC_971C8C), 0x00000000,
+    0x028A0000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248B24_971CE4)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248AF8_971CB8), 0x00000000,
+    0x02580000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248B50_971D10)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248B24_971CE4), 0x00000000,
+    0x02260000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248B7C_971D3C)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248B50_971D10), 0x00000000,
+    0x01F40000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248BA8_971D68)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248B7C_971D3C), 0x00000000,
+    0x01C20000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248BD4_971D94)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248BA8_971D68), 0x00000000,
+    0x01900000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248C00_971DC0)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248BD4_971D94), 0x00000000,
+    0x015E0000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248C2C_971DEC)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248C00_971DC0), 0x00000000,
+    0x012C0000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248C58_971E18)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248C2C_971DEC), 0x00000000,
+    0x00FA0000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248C84_971E44)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248C58_971E18), 0x00000000,
+    0x00C80000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248CB0_971E70)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248C84_971E44), 0x00000000,
+    0x00960000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248CDC_971E9C)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248CB0_971E70), 0x00000000,
+    0x00640000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248D08_971EC8)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248CDC_971E9C), 0x00000000,
+    0x00320000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248D34_971EF4)[] = {
+    N(D_8024A3B8_973578), 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, N(D_80248D08_971EC8), 0x00000000,
+    0x00000000, N(D_80248DD8_971F98), 0x00000000,
+};
+
+s32 N(D_80248D60_971F20)[] = {
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, N(D_80248D34_971EF4),
+    0xFFFF0000, 0x00000000, 0x00000000, N(D_80248D60_971F20),
+    N(D_80248D34_971EF4), N(D_80248D08_971EC8), N(D_80248CDC_971E9C), N(D_80248CB0_971E70),
+    N(D_80248C84_971E44), N(D_80248C58_971E18), N(D_80248C2C_971DEC), N(D_80248C00_971DC0),
+    N(D_80248BD4_971D94), N(D_80248BA8_971D68), N(D_80248B7C_971D3C), N(D_80248B50_971D10),
+    N(D_80248B24_971CE4), N(D_80248AF8_971CB8), N(D_80248ACC_971C8C), N(D_80248AA0_971C60),
+    0x00000000, 0x00000000,
+};
+
+// Vertexes?
+s32 N(D_80248DD8_971F98)[] = {
+    0x00000000, 0x00000000, 0x04000000, 0xDB1396FF, 0x00000000, 0x00000000, 0x04120038, 0xB615A5FF,
+    0x00000000, 0x00000000, 0x04000038, 0xD05CC5FF, 0x00000000, 0x00000000, 0x03ED0000, 0xF94FB2FF,
+    0x00000000, 0x00000000, 0x04000071, 0xBB15A1FF, 0x00000000, 0x00000000, 0x03ED0071, 0xD75CC0FF,
+    0x00000000, 0x00000000, 0x041200AA, 0xB615A5FF, 0x00000000, 0x00000000, 0x040000AA, 0xD05CC5FF,
+    0x00000000, 0x00000000, 0x040000E3, 0xAE15ACFF, 0x00000000, 0x00000000, 0x03ED00E3, 0xC65BCFFF,
+    0x00000000, 0x00000000, 0x0412011C, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400011C, 0xD05CC5FF,
+    0x00000000, 0x00000000, 0x04000155, 0xBF159FFF, 0x00000000, 0x00000000, 0x03ED0155, 0xDC5BBDFF,
+    0x00000000, 0x00000000, 0x0412018E, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400018E, 0xD05CC5FF,
+    0x00000000, 0x00000000, 0x040001C7, 0xA515BAFF, 0x00000000, 0x00000000, 0x03ED01C7, 0xBB56DEFF,
+    0x00000000, 0x00000000, 0x0400041C, 0x8E20F5FF, 0x00000000, 0x00000000, 0x03ED0400, 0xAC55F8FF,
+    0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x001203FF, 0xF85554FF,
+    0x00000000, 0x00000000, 0x0000041C, 0xF52072FF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF,
+    0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF,
+    0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF,
+    0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF,
+    0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF,
+    0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF,
+    0x00000000, 0x00000000, 0xFFEE0038, 0x4A155BFF, 0x00000000, 0x00000000, 0x00000000, 0x601339FF,
+    0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x00000071, 0x4F1557FF,
+    0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE00AA, 0x4A155BFF,
+    0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x000000E3, 0x411561FF,
+    0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE011C, 0x4A155BFF,
+    0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x00000155, 0x521554FF,
+    0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE018E, 0x4A155BFF,
+    0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF,
+};
+
+// vertexes but vtxdis ignores the flag entirely, and it's set here
+s32 N(D_802490F8_9722B8)[] = {
+    0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F,
+    0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C,
+    0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8,
+    0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84,
+    0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE,
+    0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B,
+    0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E,
+    0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8,
+    0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053,
+    0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75,
+    0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C,
+    0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E,
+    0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B,
+    0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8,
+    0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F,
+    0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4,
+    0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE,
+    0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038,
+    0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D,
+    0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C,
+    0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C,
+    0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8,
+    0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C,
+    0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5,
+    0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA,
+    0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8,
+    0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027,
+    0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6,
+    0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C,
+    0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C,
+    0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7,
+    0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE,
+    0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE,
+    0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E,
+    0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE,
+    0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005,
+    0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14,
+    0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8,
+    0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51,
+    0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4,
+    0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C,
+    0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D,
+    0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43,
+    0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C,
+    0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC,
+    0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23,
+    0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C,
+    0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47,
+    0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED,
+    0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C,
+    0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD,
+    0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79,
+    0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE,
+    0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2,
+    0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49,
+    0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE,
+    0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B,
+    0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12,
+    0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C,
+    0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B,
+    0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE,
+    0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE,
+    0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6,
+    0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61,
+    0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8,
+    0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21,
+    0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22,
+    0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C,
+    0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3,
+    0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6,
+    0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE,
+    0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD,
+    0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F,
+    0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE,
+    0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D,
+    0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F,
+    0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C,
+    0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8,
+    0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84,
+    0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE,
+    0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B,
+    0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E,
+    0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8,
+    0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053,
+    0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75,
+    0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C,
+    0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E,
+    0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B,
+    0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8,
+    0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F,
+    0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4,
+    0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE,
+    0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038,
+    0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D,
+    0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C,
+    0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C,
+    0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8,
+    0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C,
+    0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5,
+    0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA,
+    0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8,
+    0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027,
+    0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6,
+    0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C,
+    0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C,
+    0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7,
+    0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE,
+    0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE,
+    0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E,
+    0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE,
+    0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005,
+    0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14,
+    0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8,
+    0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51,
+    0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4,
+    0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C,
+    0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D,
+    0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43,
+    0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C,
+    0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC,
+    0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23,
+    0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C,
+    0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47,
+    0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED,
+    0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C,
+    0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD,
+    0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79,
+    0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE,
+    0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2,
+    0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49,
+    0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE,
+    0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B,
+    0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12,
+    0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C,
+    0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B,
+    0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE,
+    0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE,
+    0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6,
+    0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61,
+    0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8,
+    0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21,
+    0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22,
+    0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C,
+    0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3,
+    0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6,
+    0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE,
+    0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD,
+    0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F,
+    0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE,
+    0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D,
+};
+
+s32 N(image2)[];
+
+Gfx N(D_8024A3B8_973578)[] = {
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPLoadTextureBlock(N(image2), G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPSetGeometryMode(G_LIGHTING),
+    gsSPVertex(N(D_802490F8_9722B8), 32, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(3, 2, 24, 0, 3, 24, 25, 0),
+    gsSP2Triangles(2, 5, 26, 0, 2, 26, 24, 0),
+    gsSP2Triangles(5, 7, 27, 0, 5, 27, 26, 0),
+    gsSP2Triangles(7, 9, 28, 0, 7, 28, 27, 0),
+    gsSP2Triangles(9, 11, 29, 0, 9, 29, 28, 0),
+    gsSP2Triangles(11, 13, 30, 0, 11, 30, 29, 0),
+    gsSP2Triangles(13, 15, 31, 0, 13, 31, 30, 0),
+    gsSP2Triangles(15, 17, 20, 0, 15, 20, 31, 0),
+    gsSP2Triangles(17, 19, 21, 0, 17, 21, 20, 0),
+    gsSP2Triangles(19, 18, 22, 0, 19, 22, 21, 0),
+    gsSPVertex(N(D_802490F8_9722B8), 18, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
+    gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0),
+    gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0),
+    gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0),
+    gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0),
+    gsSP2Triangles(12, 14, 15, 0, 12, 15, 13, 0),
+    gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0),
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0),
+    gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
+    gsSPEndDisplayList(),
+};
+
+// 16x32 RGA16 texture
+s32 N(image2)[] = {
+    0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D,
+    0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5,
+    0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB,
+    0x9D1DBDE5, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7,
+    0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB,
+    0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5,
+    0x33E93C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B,
+    0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F144F1,
+    0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x5D735D73, 0x5D735D73, 0x44F144F1, 0x44F144F1, 0x3C6B33E9,
+    0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D,
+    0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D9D1D,
+    0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0x9D1D9B01,
+    0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1DBDE5, 0x9B01C405,
+    0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x23659D1D, 0xBDE59D1D, 0x9B01C405,
+    0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B2365, 0x9D1DBDE5, 0x9D1D9B01, 0xC405D48B,
+    0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x23659D1D, 0x9D1D9D1D, 0x9D1D9B01, 0xC405D48B,
+    0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D9B01, 0x9B019B01, 0x9B019B01, 0x9B01C405, 0xD48BD48B,
+    0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E99B01, 0xC405C405, 0xC405C405, 0xC405D48B, 0xD48BD48B,
+    0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xD48BD48B, 0x9B01D48B,
+    0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F13C6B, 0x33E99B01, 0x9B01C405, 0xC405D48B, 0x9B01D48B,
+    0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0x9B01D48B,
+    0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC405D48B, 0xD48BD48B,
+    0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0xD48BD48B,
+    0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xC405C405,
+    0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0x9B019B01,
+    0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F13C6B, 0x33E99B01, 0xC405C405, 0xC4059B01, 0x23659D1D,
+    0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC4059B01, 0x9B012365, 0x9D1DBDE5,
+    0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x33E99B01, 0x9B0133E9, 0x23659D1D, 0xBDE5BDE5,
+    0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x3C6B33E9, 0x33E92365, 0x9D1DBDE5, 0xBDE5BDE5,
+    0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x3C6B3C6B, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB,
+    0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B33E9, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABD6AB,
+    0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6AB05EF,
+    0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6,
+    0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005,
+    0x00030000, 0x00000000, 0x00080003, 0x00000000, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004,
+    0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000,
+    0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000,
+    0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000,
+    0x00080007, 0x00000000, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008,
+    0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009,
+    0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000,
+    0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000,
+    0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000,
+    0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011,
+    0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E,
+    0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6,
+    0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6,
+    0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001,
+    0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000,
+};
+
+Script N(8024AC14) = SCRIPT({
+    EnableModel(SI_VAR(4), 0);
+    EnableModel(SI_VAR(5), 1);
+    RotateModel(SI_VAR(6), 0, 0, 0, 1);
+    RotateModel(SI_VAR(7), 0, 0, 0, 1);
+});
+
+Script N(8024AC8C) = SCRIPT({
+    SI_VAR(9) = SI_VAR(7);
+    SI_VAR(8) = SI_VAR(6);
+    SI_VAR(7) = SI_VAR(5);
+    SI_VAR(6) = SI_VAR(4);
+    sleep 70;
+    EnableModel(SI_VAR(6), 0);
+    spawn {
+        sleep 5;
+        EnableModel(SI_VAR(6), 1);
+    }
+    MakeLerp(0, 180, 20, 2);
+1:
+    UpdateLerp();
+    RotateModel(SI_VAR(8), SI_VAR(0), 0, 0, -1);
+    RotateModel(SI_VAR(9), SI_VAR(0), 0, 0, -1);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+    EnableModel(SI_VAR(7), 0);
+});
+
+Script N(interact_8024ADE4) = SCRIPT({
+    N(UnkFunc35)(0, 0, 0);
+    await N(8024D434);
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    SI_VAR(9) = SI_VAR(1);
+    SI_VAR(10) = SI_VAR(2);
+    SI_VAR(11) = SI_VAR(3);
+    N(DoesPlayerNeedSleep)();
+    if (SI_VAR(1) == 0) {
+        SI_VAR(8) = SI_VAR(0);
+    }
+    SpeakToPlayer(NPC_SELF, 0x830004, 0x830001, 0, SI_VAR(8));
+    ShowChoice(MESSAGE_ID(0x1E, 0x0006));
+    sleep 3;
+    if (SI_VAR(0) == 1) {
+        ContinueSpeech(-1, 0x830004, 0x830001, 0, SI_VAR(9));
+        return;
+    }
+    ContinueSpeech(-1, 0x830004, 0x830001, 0, SI_VAR(10));
+    SetPlayerJumpscale(1);
+    DisablePlayerPhysics(TRUE);
+    SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE);
+    N(Call800E9894)();
+    if (SI_VAR(4) != 0) {
+        spawn N(8024AC8C);
+    }
+    N(GetPartnerCall800EB168)(SI_VAR(10));
+    sleep 20;
+    await N(8024D494);
+    spawn {
+        MakeLerp(0, 255, 60, 0);
+    0:
+        UpdateLerp();
+        N(UnkFunc32)(3, SI_VAR(0));
+        sleep 1;
+        if (SI_VAR(1) == 1) {
+            goto 0;
+        }
+        FullyRestoreHPandFP();
+        FullyRestoreSP();
+        if (SI_VAR(4) != 0) {
+            spawn N(8024AC14);
+        }
+        N(Call800EB168)(SI_VAR(10));
+        sleep 45;
+        MakeLerp(255, 0, 30, 0);
+    1:
+        UpdateLerp();
+        N(UnkFunc32)(0, SI_VAR(0));
+        sleep 1;
+        if (SI_VAR(1) == 1) {
+            goto 1;
+        }
+    }
+    sleep 105;
+    await N(8024D700);
+    DisablePlayerPhysics(FALSE);
+    SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), FALSE);
+    SpeakToPlayer(NPC_SELF, 0x830004, 0x830001, 0, SI_VAR(11));
+    N(Call800E98C4SyncStatusMenu)();
+});
+
+Script N(8024B18C) = SCRIPT({
+    loop {
+        GetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+        N(UnkYawFunc)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+        SetItemPos(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5));
+        sleep 1;
+    }
+});
+
+Script N(8024B20C) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D6420();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveKeyItemAt(SI_VAR(1));
+            DisablePartnerAI(0);
+            GetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(UnkYawFunc)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            SI_VAR(0) |= (const)  0x50000;
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SI_VAR(10) = spawn N(8024B18C);
+            SetNpcAnimation(NPC_PARTNER, 0x40002);
+            GetAngleBetweenNPCs(SI_VAR(9), -4, SI_VAR(11));
+            GetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            GetNpcPos(SI_VAR(9), SI_VAR(6), SI_VAR(7), SI_VAR(8));
+            SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
+            if (SI_VAR(11) <= 180) {
+                SI_VAR(6) += 20;
+            } else {
+                SI_VAR(6) += -20;
+            }
+            SI_VAR(7) += 10;
+            SetNpcJumpscale(NPC_PARTNER, 0.0);
+            NpcJump1(NPC_PARTNER, SI_VAR(6), SI_VAR(7), SI_VAR(8), 20);
+            kill SI_VAR(10);
+            RemoveItemEntity(SI_VAR(0));
+            sleep 20;
+            GetNpcYaw(-4, SI_VAR(10));
+            SI_VAR(10) += 180;
+            InterpNpcYaw(NPC_PARTNER, SI_VAR(10), 0);
+            sleep 5;
+            NpcJump1(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5), 20);
+            SetNpcAnimation(NPC_PARTNER, 0x40001);
+            NpcFaceNpc(NPC_PARTNER, SI_VAR(9), 0);
+            sleep 5;
+            SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), FALSE);
+            EnablePartnerAI();
+            sleep 5;
+        }
+    }
+    N(func_80243314_96C4D4)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(8024B530) = {
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), SI_VAR(11)),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(1), SI_VAR(2)),
+    SI_CMD(ScriptOpcode_CALL, N(func_8024334C_96C50C), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(8024B20C), 0x10, 0, N(D_8024F080), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_802432C0_96C480), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(8024B5A0) = SCRIPT({
+    SI_VAR(12) = 0;
+    if (STORY_PROGRESS < STORY_CH2_PARAKARRY_JOINED_PARTY) {
+        return;
+    }
+    N(func_802439FC_96CBBC)();
+    GetCurrentPartnerID(SI_VAR(0));
+    FindKeyItem(SI_VAR(5), SI_VAR(1));
+    if (SI_VAR(0) == 4) {
+        if (SI_VAR(1) != -1) {
+            DisablePartnerAI(0);
+            PlayerFaceNpc(SI_VAR(2), 0);
+            sleep 1;
+            GetNpcPos(SI_VAR(2), SI_VAR(13), SI_VAR(0), SI_VAR(14));
+            GetNpcPos(NPC_PARTNER, SI_VAR(13), SI_VAR(14), SI_VAR(15));
+            SetNpcJumpscale(NPC_PARTNER, 0.0);
+            SI_VAR(0) += 10;
+            NpcJump1(NPC_PARTNER, SI_VAR(13), SI_VAR(0), SI_VAR(15), 10);
+            SpeakToNpc(-4, 262150, 262145, 0, SI_VAR(2), SI_VAR(7));
+            EnablePartnerAI();
+            await N(8024B530);
+            match SI_VAR(0) {
+                == -1 {
+                    DisablePartnerAI(0);
+                    sleep 1;
+                    SpeakToPlayer(NPC_PARTNER, 0x40006, 0x40001, 5, SI_VAR(8));
+                    EnablePartnerAI();
+                    SI_VAR(12) = 1;
+                }
+                else {
+                    DisablePartnerAI(0);
+                    sleep 1;
+                    SpeakToPlayer(NPC_PARTNER, 0x40006, 0x40001, 5, SI_VAR(9));
+                    if (SI_VAR(10) != 0) {
+                        SpeakToPlayer(SI_VAR(2), SI_VAR(3), SI_VAR(4), 0, SI_VAR(10));
+                    }
+                    EnablePartnerAI();
+                    if (SI_VAR(6) != 0) {
+                        SI_VAR(0) = SI_VAR(6);
+                        SI_VAR(1) = 1;
+                        await N(80244DE4);
+                        AddKeyItem(SI_VAR(6));
+                    }
+                    SI_VAR(12) = 2;
+                }
+            }
+        }
+    }
+    N(func_80243A40_96CC00)();
+});
+
+s32 N(D_8024B898_974A58)[] = {
+    0x0000004A, 0x00000000,
+};
+
+Script N(8024B8A0) = SCRIPT({
+    N(SetManyVars)(1, 9634308, 9634305, 74, 75, 852117, 852118, 852119, 852120, N(D_8024B898_974A58));
+    await N(8024B5A0);
+});
+
+Script N(interact_8024B8F0) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (SI_SAVE_FLAG(787) == 1) {
+                SpeakToPlayer(NPC_SELF, 0xB80004, 0xB80001, 0, MESSAGE_ID(0x0D, 0x00B2));
+            } else {
+                match SI_AREA_VAR(3) {
+                    == 0 {
+                        SpeakToPlayer(NPC_SELF, 0xB80004, 0xB80001, 0, MESSAGE_ID(0x0D, 0x00AF));
+                        SI_AREA_VAR(3) = 1;
+                    }
+                    == 1 {
+                        SpeakToPlayer(NPC_SELF, 0xB80004, 0xB80001, 0, MESSAGE_ID(0x0D, 0x00B0));
+                        SI_AREA_VAR(3) = 2;
+                    }
+                    == 2 {
+                        SpeakToPlayer(NPC_SELF, 0xB80004, 0xB80001, 0, MESSAGE_ID(0x0D, 0x00B1));
+                        SI_AREA_VAR(3) = 1;
+                    }
+                }
+            }
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, 0xB80004, 0xB80001, 0, MESSAGE_ID(0x0D, 0x00B3));
+        }
+    }
+});
+
+Script N(init_8024BA50) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024B8F0));
+    if (STORY_PROGRESS >= STORY_UNUSED_FFFFFFCC) {
+        RemoveNpc(NPC_SELF);
+    }
+});
+
+Script N(interact_8024BA9C) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (SI_SAVE_FLAG(747) == 0) {
+                SpeakToPlayer(NPC_SELF, 0x930204, 0x930201, 0, MESSAGE_ID(0x0D, 0x0091));
+            } else {
+                SpeakToPlayer(NPC_SELF, 0x930204, 0x930201, 0, MESSAGE_ID(0x0D, 0x0092));
+            }
+        }
+        < STORY_CH5_STAR_SPRIT_DEPARTED {
+            SpeakToPlayer(NPC_SELF, 0x930204, 0x930201, 0, MESSAGE_ID(0x0D, 0x0093));
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, 0x930204, 0x930201, 0, MESSAGE_ID(0x0D, 0x0094));
+        }
+    }
+    await N(8024B8A0);
+    if (SI_VAR(12) != 0) {
+        return;
+    }
+});
+
+Script N(init_8024BBAC) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024BA9C));
+});
+
+Script N(interact_8024BBD0) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (SI_AREA_FLAG(3) == 0) {
+                SpeakToPlayer(NPC_SELF, 0x930004, 0x930001, 0, MESSAGE_ID(0x0D, 0x00A1));
+                SI_AREA_FLAG(3) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, 0x930004, 0x930001, 0, MESSAGE_ID(0x0D, 0x00A2));
+                SI_AREA_FLAG(3) = 0;
+            }
+        }
+        < STORY_CH5_STAR_SPRIT_DEPARTED {
+            SpeakToPlayer(NPC_SELF, 0x930004, 0x930001, 0, MESSAGE_ID(0x0D, 0x00A3));
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, 0x930004, 0x930001, 0, MESSAGE_ID(0x0D, 0x00A4));
+        }
+    }
+});
+
+Script N(init_8024BCD4) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024BBD0));
+});
+
+Script N(interact_8024BCF8) = SCRIPT({
+    SpeakToPlayer(NPC_SELF, 0x930004, 0x930001, 0, MESSAGE_ID(0x0D, 0x00A0));
+});
+
+Script N(init_8024BD28) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024BCF8));
+});
+
+Script N(interact_8024BD4C) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (SI_AREA_FLAG(4) == 0) {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00A5));
+                SI_AREA_FLAG(4) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00A6));
+                SI_AREA_FLAG(4) = 0;
+            }
+        }
+        < STORY_CH5_STAR_SPRIT_DEPARTED {
+            if (SI_AREA_FLAG(4) == 0) {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00A7));
+                SI_AREA_FLAG(4) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00A8));
+                SI_AREA_FLAG(4) = 0;
+            }
+        }
+        else {
+            if (SI_AREA_FLAG(4) == 0) {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00A9));
+                SI_AREA_FLAG(4) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00AA));
+                SI_AREA_FLAG(4) = 0;
+            }
+        }
+    }
+});
+
+Script N(init_8024BF10) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024BD4C));
+});
+
+Script N(interact_8024BF34) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_STAR_SPRIT_DEPARTED {
+            if (SI_AREA_FLAG(5) == 0) {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00AB));
+                SI_AREA_FLAG(5) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00AC));
+                SI_AREA_FLAG(5) = 0;
+            }
+        }
+        < STORY_CH5_STAR_SPRIT_DEPARTED {
+            SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00AD));
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, 0x940005, 0x940001, 0, MESSAGE_ID(0x0D, 0x00AE));
+        }
+    }
+});
+
+Script N(init_8024C038) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024BF34));
+});
+
+Script N(8024C05C) = SCRIPT({
+    loop {
+        PlayerFaceNpc(5, 0);
+        NpcFaceNpc(NPC_PARTNER, NPC_MOUSTAFA, 0);
+        sleep 1;
+    }
+});
+
+Script N(8024C0B8) = SCRIPT({
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 275);
+    GetNpcPos(NPC_DISGUISED_MOUSTAFA, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    SI_VAR(0) += SI_VAR(3);
+    SI_VAR(1) += SI_VAR(4);
+    SI_VAR(2) += SI_VAR(5);
+    SI_VAR(0) /= 2;
+    SI_VAR(1) /= 2;
+    SI_VAR(2) /= 2;
+    SI_VAR(1) += 15;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 8.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+});
+
+Script N(8024C1F8) = SCRIPT({
+    PanToTarget(0, 0, 0);
+    SetCamSpeed(0, 3.0);
+    WaitForCam(0, 1.0);
+});
+
+Script N(8024C248) = SCRIPT({
+    SetNpcYaw(NPC_MOUSTAFA, 270);
+    SetNpcFlagBits(NPC_DISGUISED_MOUSTAFA, ((NPC_FLAG_100)), TRUE);
+    SetNpcFlagBits(NPC_MOUSTAFA, ((NPC_FLAG_100)), TRUE);
+    SetNpcAnimation(NPC_DISGUISED_MOUSTAFA, 0xBC0005);
+    sleep 30;
+    SetNpcAnimation(NPC_DISGUISED_MOUSTAFA, 0xBC0006);
+    SetNpcAnimation(NPC_MOUSTAFA, 0xBD0007);
+    SetNpcPos(NPC_MOUSTAFA, -335, 163, -260);
+    spawn N(80243B9C);
+    MakeLerp(0, 80, 30, 5);
+10:
+    UpdateLerp();
+    SI_VAR(2) = -335;
+    SI_VAR(3) = 163;
+    SI_VAR(2) -= SI_VAR(0);
+    SI_VAR(3) += SI_VAR(0);
+    SetNpcPos(NPC_DISGUISED_MOUSTAFA, SI_VAR(2), SI_VAR(3), -260);
+    sleep 1;
+    if (SI_VAR(1) == 1) {
+        goto 10;
+    }
+    SetNpcFlagBits(NPC_DISGUISED_MOUSTAFA, ((NPC_FLAG_100)), FALSE);
+    SetNpcPos(NPC_DISGUISED_MOUSTAFA, 0, -1000, -250);
+    SetNpcAnimation(NPC_MOUSTAFA, 0xBD0001);
+    SetNpcFlagBits(NPC_DISGUISED_MOUSTAFA, ((NPC_FLAG_100)), FALSE);
+    SetNpcFlagBits(NPC_MOUSTAFA, ((NPC_FLAG_100)), FALSE);
+    sleep 30;
+});
+
+Script N(idle_8024C450) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH2_BOUGHT_SECRET_ITEMS {}
+        < STORY_CH2_GOT_PULSE_STONE {
+            SetNpcPos(NPC_SELF, -335, 163, -260);
+        }
+        >= STORY_CH2_GOT_PULSE_STONE {
+            SetNpcPos(NPC_SELF, 0, -1000, -250);
+            SetNpcPos(NPC_MOUSTAFA, -335, 163, -260);
+        }
+    }
+});
+
+Script N(interact_8024C4EC) = SCRIPT({
+    if (SI_SAVE_FLAG(750) == 1) {
+        SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CF));
+        return;
+    }
+    match STORY_PROGRESS {
+        < STORY_CH2_BOUGHT_SECRET_ITEMS {
+            SI_VAR(11) = 0;
+            SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B4));
+        0:
+            ShowChoice(MESSAGE_ID(0x1E, 0x0019));
+            if (SI_VAR(0) == 1) {
+                ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B6));
+                spawn N(8024C1F8);
+                return;
+            } else {
+                EndSpeech(2, 12320772, 12320769, 0);
+            }
+        1:
+            SI_VAR(0) = 0;
+            SI_VAR(1) = 2;
+            await N(80248A50);
+            match SI_VAR(0) {
+                == 0 {
+                    SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B8));
+                    spawn N(8024C1F8);
+                    return;
+                }
+                == -1 {
+                    SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B7));
+                    spawn N(8024C1F8);
+                    return;
+                }
+            }
+            SI_VAR(10) = SI_VAR(0);
+            if (SI_SAVE_VAR(135) == 0) {
+                if (SI_VAR(10) == 156) {
+                    SI_SAVE_VAR(135) = 1;
+                    SI_SAVE_VAR(134) = 10;
+                    SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00BB));
+                    ShowChoice(MESSAGE_ID(0x1E, 0x001C));
+                } else {
+                    SI_SAVE_VAR(134) += 1;
+                    if (SI_SAVE_VAR(134) <= 2) {
+                        SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B5));
+                        goto 0;
+                    }
+                    if (SI_SAVE_VAR(134) == 3) {
+                        SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B9));
+                        ShowChoice(MESSAGE_ID(0x1E, 0x001B));
+                    } else {
+                        SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00BA));
+                        ShowChoice(MESSAGE_ID(0x1E, 0x001B));
+                        SI_SAVE_VAR(134) = 10;
+                    }
+                }
+            } else {
+                SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00BA));
+                ShowChoice(MESSAGE_ID(0x1E, 0x001C));
+            }
+            match SI_VAR(0) {
+                == 0 {
+                    ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00BC));
+                }
+                == 1 {
+                    await N(8024C0B8);
+                    ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00BD));
+                    SI_SAVE_FLAG(747) = 1;
+                }
+                == 2 {
+                    await N(8024C0B8);
+                    ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00BE));
+                    SI_SAVE_FLAG(748) = 1;
+                }
+                == 3 {
+                    await N(8024C0B8);
+                    ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00BF));
+                }
+                == 4 {
+                    await N(8024C0B8);
+                    ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00C1));
+                    SI_SAVE_FLAG(749) = 1;
+                    SI_VAR(11) = 1;
+                }
+            }
+            SI_SAVE_FLAG(746) = 1;
+            ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00C0));
+            ShowChoice(MESSAGE_ID(0x1E, 0x001A));
+            if (SI_VAR(0) == 0) {
+                EndSpeech(2, 12320772, 12320769, 0);
+                goto 1;
+            } else {
+                ContinueSpeech(2, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00B6));
+            }
+            if (SI_VAR(11) == 1) {
+                if (SI_MAP_FLAG(0) == 0) {
+                    SI_MAP_FLAG(0) = 1;
+                    spawn {
+                        GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                        AwaitPlayerLeave(SI_VAR(0), SI_VAR(2), 50);
+                        DisablePlayerInput(TRUE);
+                        SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00C2));
+                        DisablePlayerInput(FALSE);
+                        SI_MAP_FLAG(0) = 0;
+                    }
+                }
+            }
+            spawn N(8024C1F8);
+        }
+        < -63 {
+            spawn {
+                sleep 10;
+                func_802D2C14(1);
+            }
+            SetNpcFlagBits(NPC_DISGUISED_MOUSTAFA, ((NPC_FLAG_100)), TRUE);
+            SetPlayerSpeed(3.0);
+            PlayerMoveTo(-391, -260, 0);
+            InterpPlayerYaw(90, 3);
+            SetNpcFlagBits(NPC_DISGUISED_MOUSTAFA, ((NPC_FLAG_100)), FALSE);
+            SI_VAR(10) = spawn N(8024C05C);
+            SetNpcFlagBits(NPC_MOUSTAFA, ((NPC_FLAG_100)), TRUE);
+            FadeOutMusic(0, 500);
+            if (SI_SAVE_FLAG(749) == 1) {
+                SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00C3));
+                await N(8024C248);
+                func_802D2C14(0);
+                SetNpcJumpscale(NPC_MOUSTAFA, 1.0);
+                NpcJump0(NPC_MOUSTAFA, -425, 140, -206, 20);
+                SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00C4));
+            } else {
+                SpeakToPlayer(NPC_DISGUISED_MOUSTAFA, 0xBC0004, 0xBC0001, 0, MESSAGE_ID(0x0D, 0x00C5));
+                await N(8024C248);
+                func_802D2C14(0);
+                SetNpcJumpscale(NPC_MOUSTAFA, 1.0);
+                NpcJump0(NPC_MOUSTAFA, -425, 140, -206, 20);
+                SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00C6));
+            }
+            SetNpcJumpscale(NPC_MOUSTAFA, 1.0);
+            NpcJump0(NPC_MOUSTAFA, -337, 140, -200, 20);
+            SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00C7));
+            SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00C8));
+            SetNpcJumpscale(NPC_MOUSTAFA, 1.0);
+            NpcJump0(NPC_MOUSTAFA, -335, 163, -260, 20);
+            SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00C9));
+            SI_VAR(0) = 18;
+            SI_VAR(1) = 1;
+            await N(80244DE4);
+            AddKeyItem(ITEM_PULSE_STONE);
+            STORY_PROGRESS = STORY_CH2_GOT_PULSE_STONE;
+            SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CA));
+            kill SI_VAR(10);
+            spawn N(80243AF0);
+        }
+        >= -63 {
+            match STORY_PROGRESS {
+                < STORY_CH2_UNCOVERED_DRY_DRY_RUINS {
+                    SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CB));
+                }
+                >= STORY_CH2_UNCOVERED_DRY_DRY_RUINS {
+                    if (STORY_PROGRESS >= STORY_CH2_DEFEATED_TUTANKOOPA) {
+                        if (SI_SAVE_FLAG(751) == 0) {
+                            SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CD));
+                            SetPlayerAnimation(ANIM_10002);
+                            sleep 15;
+                            SetPlayerAnimation(ANIM_80007);
+                            sleep 30;
+                            SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CE));
+                            SI_SAVE_FLAG(751) = 1;
+                        } else {
+                            SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00D0));
+                        }
+                    } else {
+                        SpeakToPlayer(NPC_MOUSTAFA, 0xBD0005, 0xBD0001, 0, MESSAGE_ID(0x0D, 0x00CC));
+                    }
+                }
+            }
+        }
+    }
+});
+
+Script N(init_8024D04C) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    match SI_VAR(0) {
+        2, 3 {
+            SetNpcPos(NPC_SELF, 200, 0, -15);
+            InterpNpcYaw(NPC_SELF, 270, 0);
+            SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_200000)), TRUE);
+            SetNpcAnimation(NPC_SELF, 0xBC0005);
+        }
+        else {
+            BindNpcIdle(NPC_SELF, N(idle_8024C450));
+            BindNpcInteract(NPC_SELF, N(interact_8024C4EC));
+        }
+    }
+});
+
+Script N(init_8024D130) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024C4EC));
+});
+
+Script N(idle_8024D154) = SCRIPT({
+    InterpNpcYaw(NPC_DISGUISED_MOUSTAFA, 270, 0);
+10:
+    SetNpcAnimation(NPC_SELF, 0x940107);
+    SetNpcAnimation(NPC_DISGUISED_MOUSTAFA, 0xBC0001);
+    loop 50 {
+        IsPlayerWithin(200, 50, 100, SI_VAR(0));
+        if (SI_VAR(0) == 1) {
+            goto 20;
+        }
+        sleep 1;
+    }
+    SetNpcAnimation(NPC_SELF, 0x940101);
+    SetNpcAnimation(NPC_DISGUISED_MOUSTAFA, 0xBC0007);
+    loop 50 {
+        IsPlayerWithin(200, 50, 100, SI_VAR(0));
+        if (SI_VAR(0) == 1) {
+            goto 20;
+        }
+        sleep 1;
+    }
+    goto 10;
+20:
+    SetNpcAnimation(NPC_DISGUISED_MOUSTAFA, 0xBC0001);
+    SetNpcAnimation(NPC_SELF, 0x940104);
+    SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE);
+    SetNpcAnimation(NPC_SELF, 0x940104);
+    NpcMoveTo(NPC_SELF, 150, 18, 20);
+    EnableNpcBlur(-1, 1);
+    PlaySoundAtNpc(NPC_SELF, 0x174, 0);
+    NpcMoveTo(NPC_SELF, -83, 11, 20);
+    NpcMoveTo(NPC_SELF, -239, 5, 20);
+    NpcMoveTo(NPC_SELF, -371, 5, 20);
+    NpcMoveTo(NPC_SELF, -487, 5, 20);
+    SetNpcPos(NPC_SELF, 0, -1000, 0);
+    STORY_PROGRESS = STORY_CH2_SPOKE_WITH_SHEEK;
+});
+
+Script N(init_8024D3E8) = SCRIPT({
+    BindNpcIdle(NPC_SELF, N(idle_8024D154));
+    if (STORY_PROGRESS >= STORY_CH2_SPOKE_WITH_SHEEK) {
+        RemoveNpc(NPC_SELF);
+    }
+});
+
+Script N(8024D434) = SCRIPT({
+    SI_VAR(0) = 852177;
+    SI_VAR(8) = 852178;
+    SI_VAR(1) = 852179;
+    SI_VAR(2) = 852180;
+    SI_VAR(3) = 852181;
+});
+
+Script N(8024D494) = SCRIPT({
+    spawn N(80243B70);
+    SetPlayerSpeed(3.0);
+    PlayerMoveTo(-179, -198, 0);
+    spawn {
+        sleep 15;
+        N(CamSetFOV)(0, 40);
+        SetCamType(0, 4, 0);
+        SetCamPitch(0, 95, -61);
+        SetCamDistance(0, 108);
+        SetCamPosA(0, 202, 62);
+        SetCamPosB(0, -89, -141);
+        SetCamPosC(0, 0, 0);
+        SetCamSpeed(0, 90.0);
+        PanToTarget(0, 0, 1);
+    }
+    PlayerMoveTo(-187, -267, 0);
+    InterpPlayerYaw(230, 1);
+    HidePlayerShadow(TRUE);
+    SetPlayerAnimation(ANIM_10002);
+    func_802D286C(2048);
+    func_802D2520(ANIM_10002, 5, 7, 1, 1, 0);
+    spawn {
+        sleep 60;
+        SetPlayerAnimation(ANIM_8001D);
+    }
+    sleep 20;
+    spawn {
+        sleep 81;
+        N(CamSetFOV)(0, 25);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+        PanToTarget(0, 0, 0);
+    }
+});
+
+Script N(8024D700) = SCRIPT({
+    HidePlayerShadow(FALSE);
+    func_802D2520(ANIM_10002, 0, 0, 0, 0, 0);
+    SetPlayerPos(-187, 0, -240);
+    SetPlayerSpeed(3.0);
+    PlayerMoveTo(-168, -195, 0);
+    spawn N(80243AF0);
+});
+
+Script N(init_8024D790) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_8024ADE4));
+});
+
+StaticNpc N(npcGroup_8024D7B4)[] = {
+    {
+        .id = NPC_ARCHEOLOGIST,
+        .settings = &N(npcSettings_80247484),
+        .pos = { -320.0f, 0.0f, -14.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024BA50),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_2),
+            NPC_ANIM(archeologist, Palette_00, Anim_3),
+            NPC_ANIM(archeologist, Palette_00, Anim_3),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+            NPC_ANIM(archeologist, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0001),
+    },
+    {
+        .id = NPC_DRYITE0,
+        .settings = &N(npcSettings_80247500),
+        .pos = { -20.0f, 0.0f, 40.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024BBAC),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_2),
+            NPC_ANIM(dryite, Palette_02, Anim_3),
+            NPC_ANIM(dryite, Palette_02, Anim_3),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_0),
+            NPC_ANIM(dryite, Palette_02, Anim_0),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+            NPC_ANIM(dryite, Palette_02, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x009C),
+    },
+    {
+        .id = NPC_DISGUISED_MOUSTAFA,
+        .settings = &N(npcSettings_80247558),
+        .pos = { 245.0f, 0.0f, -35.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024D04C),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+            NPC_ANIM(disguised_moustafa, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0098),
+    },
+    {
+        .id = NPC_TOAD,
+        .settings = &N(npcSettings_80247584),
+        .pos = { -143.0f, 0.0f, -170.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024D790),
+        .yaw = 180,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(toad, Palette_00, Anim_1),
+            NPC_ANIM(toad, Palette_00, Anim_2),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_1),
+            NPC_ANIM(toad, Palette_00, Anim_1),
+            NPC_ANIM(toad, Palette_00, Anim_6),
+            NPC_ANIM(toad, Palette_00, Anim_6),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+            NPC_ANIM(toad, Palette_00, Anim_3),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x009A),
+    },
+    {
+        .id = NPC_WORLD_MERLEE,
+        .settings = &N(npcSettings_80248754),
+        .pos = { -130.0f, 0.0f, -400.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80247A80),
+        .yaw = 180,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_5),
+            NPC_ANIM(world_merlee, Palette_00, Anim_6),
+            NPC_ANIM(world_merlee, Palette_00, Anim_6),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+            NPC_ANIM(world_merlee, Palette_00, Anim_4),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x009B),
+    },
+    {
+        .id = NPC_MOUSTAFA,
+        .settings = &N(npcSettings_80247558),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024D130),
+        .yaw = 0,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_4),
+            NPC_ANIM(moustafa, Palette_00, Anim_4),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+            NPC_ANIM(moustafa, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0099),
+    },
+    {
+        .id = NPC_DRYITE1,
+        .settings = &N(npcSettings_8024752C),
+        .pos = { 25.0f, 0.0f, -38.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024BCD4),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_2),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x009D),
+    },
+    {
+        .id = NPC_DRYITE2,
+        .settings = &N(npcSettings_8024752C),
+        .pos = { -375.0f, 0.0f, -10.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024BD28),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_2),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_3),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_0),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+            NPC_ANIM(dryite, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00A0),
+    },
+    {
+        .id = NPC_MOUSER0,
+        .settings = &N(npcSettings_80247558),
+        .pos = { -50.0f, 0.0f, -470.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024BF10),
+        .yaw = 180,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x009E),
+    },
+    {
+        .id = NPC_MOUSER1,
+        .settings = &N(npcSettings_80247558),
+        .pos = { -270.0f, 0.0f, 91.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024C038),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_4),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+            NPC_ANIM(mouser, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x009F),
+    },
+    {
+        .id = NPC_MOUSER2,
+        .settings = &N(npcSettings_80247558),
+        .pos = { 210.0f, 0.0f, -35.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_8024D3E8),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_4),
+            NPC_ANIM(mouser, Palette_01, Anim_4),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+            NPC_ANIM(mouser, Palette_01, Anim_1),
+        },
+    },
+    {
+        .id = NPC_CHUCK_QUIZMO,
+        .settings = &N(npcSettings_802473B0),
+        .pos = { -335.0f, 0.0f, 90.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 01},
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_1),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_2),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_1),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_1),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_0),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_0),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+            NPC_ANIM(chuck_quizmo, Palette_00, Anim_3),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x0002),
+    },
+};
+
+NpcGroupList N(npcGroupList_8024EEF4) = {
+    NPC_GROUP(N(npcGroup_8024D7B4), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+ApiStatus N(func_80240300_9694C0)(ScriptInstance* script, s32 isInitialCall) {
+    s32 i;
+
+    if (N(D_80244DE0_96DFA0) == NULL) {
+        N(D_80244DE0_96DFA0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80244DE0_96DFA0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80244DE0_96DFA0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80244DE0_96DFA0));
+        N(D_80244DE0_96DFA0) = NULL;
     }
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/GetItemName.inc.c"
 
 #include "world/common/Set80151310.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC);
+ApiStatus N(func_8024043C_9695FC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240660_969820);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406CC_96988C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240878_969A38);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802409EC_969BAC);
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240A70_969C30);
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240C88_969E48);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240D3C_969EFC);
+#include "world/common/UnkFunc31.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240D70_969F30);
+ApiStatus N(func_802409EC_969BAC)(ScriptInstance *script, s32 isInitialCall) {
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240DF0_969FB0);
+    if (quizzesAnswered < 999) {
+        gPlayerData.quizzesAnswered++;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E08_969FC8);
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        gPlayerData.quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24_969FE4);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240A70_969C30)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        N(D_8024EFC0) = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        N(D_8024EFC4) = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        N(D_8024EFC8) = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = N(D_8024EFC0)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = N(D_8024EFC0)->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_80240C88_969E48)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        N(D_8024EFC4)->flags |= 0x10;
+        N(D_8024EFC8)->flags |= 0x10;
+    }
+
+    effectPtr = N(D_8024EFC0)->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(N(D_8024EFC0), effectPtr);
+        free_dynamic_entity(gPauseMenuCursorPosY);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_80240D3C_969EFC)(ScriptInstance *script, s32 isInitialCall) {
+    ((N(temp)*)N(D_8024EFC0))->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240D70_969F30)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = N(D_8024EFC0)->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240DF0_969FB0)(ScriptInstance *script, s32 isInitialCall) {
+    ((N(temp)*)N(D_8024EFC8))->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240E08_969FC8)(ScriptInstance *script, s32 isInitialCall) {
+    ((N(temp)*)N(D_8024EFC8))->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240E24_969FE4)(ScriptInstance *script, s32 isInitialCall) {
+    ((N(temp)*)N(D_8024EFC8))->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -71,98 +3310,721 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24_969FE4);
 
 #include "world/common/UnkPartnerFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802412F8_96A4B8);
+void N(func_802412F8_96A4B8)(void) {
+    s32 var = get_variable(NULL, N(D_8024EFB8));
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241364_96A524);
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241394_96A554);
+ApiStatus N(func_80241364_96A524)(ScriptInstance *script, s32 isInitialCall) {
+    gPauseMenuCursorPosY = create_dynamic_entity_frontUI(NULL, N(func_802412F8_96A4B8));
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802414C0_96A680);
+ApiStatus N(func_80241394_96A554)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = *args;
+    u8 coins1 = N(D_802475E0_9707A0)[var1];
+    u8 coins2 = N(D_802475DC_97079C)[var1];
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802415CC_96A78C);
+    if (playerData->coins < coins1) {
+        set_variable(script, var2, 1);
+    } else {
+        playerData->coins = playerData->coins - coins1;
+        if (playerData->merleeCastsLeft < coins2) {
+            playerData->merleeCastsLeft = coins2;
+        }
+        playerData->merleeTurnCount = rand_int(2) + 1;
+        switch (rand_int(3)) {
+            case 0:
+                playerData->merleeSpellType = 1;
+                break;
+            case 1:
+                playerData->merleeSpellType = 2;
+                break;
+            case 2:
+                playerData->merleeSpellType = 3;
+                break;
+            case 3:
+                playerData->merleeSpellType = 4;
+                break;
+        }
+        set_variable(script, var2, 0);
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802416FC_96A8BC);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241874_96AA34);
+ApiStatus N(func_802414C0_96A680)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024190C_96AACC);
+    if (isInitialCall) {
+        func_8011D82C(1);
+        *D_801512F0 = 1;
+        set_background_color_blend(0, 0, 0, 0);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80242214_96B3D4);
+        for (i = 0; i < 64; i++) {
+            Npc* npc = get_npc_by_index(i);
+            if (npc != 0 && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_WORLD_MERLEE) {
+                npc->flags |= 0x800000;
+            }
+        }
+        script->functionTemp[0].s = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024240C_96B5CC);
+    script->functionTemp[0].s += 8;
+    if (script->functionTemp[0].s >= 0x100) {
+        script->functionTemp[0].s = 255;
+    }
+    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80242EAC_96C06C);
+    return (script->functionTemp[0].s == 255) * ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024303C_96C1FC);
+ApiStatus N(func_802415CC_96A78C)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243068_96C228);
+    if (isInitialCall) {
+        set_background_color_blend(0, 0, 0, 0xFF);
+        script->functionTemp[0].s = 255;
+        script->functionTemp[1].s = 0;
+    }
+    script->functionTemp[0].s -= 8;
+    if (script->functionTemp[0].s < 0) {
+        script->functionTemp[0].s = 0;
+    }
+    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
+
+    if (script->functionTemp[0].s == 0 && script->functionTemp[1].s == 0) {
+        script->functionTemp[1].s = 1;
+    } else if (script->functionTemp[1].s == 1) {
+        func_8011D82C(0);
+        *D_801512F0 = 0;
+        for (i = 0; i < 64; i++) {
+            Npc* npc = get_npc_by_index(i);
+
+            if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_WORLD_MERLEE) {
+                npc->flags &= ~0x00800000;
+            }
+        }
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_802416FC_96A8BC)(ScriptInstance *script, s32 isInitialCall) {
+    s32 ret;
+
+    N(D_8024EFCC) = script;
+
+    ret = func_8013A704(1);
+    func_8013AA9C(ret, 5, 0xF, 1, 1, 0, 0x800);
+    set_variable(script, SI_ARRAY(0), ret);
+    ret = func_8013A704(1);
+    func_8013AA9C(ret, 5, 0x10, 1, 1, 0, 0x800);
+    set_variable(script, SI_ARRAY(1), ret);
+    ret = func_8013A704(1);
+    func_8013AA9C(ret, 5, 0x11, 1, 1, 0, 0x800);
+    set_variable(script, SI_ARRAY(2), ret);
+    ret = func_8013A704(1);
+    func_8013AA9C(ret, 5, 0x12, 1, 1, 0, 0x800);
+    set_variable(script, SI_ARRAY(3), ret);
+
+    set_variable(script, SI_ARRAY(7), create_dynamic_entity_world(N(func_8024240C_96B5CC), N(func_80242EAC_96C06C)));
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241874_96AA34)(ScriptInstance *script, s32 isInitialCall) {
+    func_8013A854(get_variable(script, SI_ARRAY(0)));
+    func_8013A854(get_variable(script, SI_ARRAY(1)));
+    func_8013A854(get_variable(script, SI_ARRAY(2)));
+    func_8013A854(get_variable(script, SI_ARRAY(3)));
+    free_dynamic_entity(get_variable(script, SI_ARRAY(7)));
+    return ApiStatus_DONE2;
+}
+
+//#define NON_MATCHING
+#ifdef NON_MATCHING
+s32 func_8024190C_96AACC(D_8024F010_Struct* ptr, Matrix4f matrix) {
+    Matrix4f subroutine_arg6;
+    Matrix4f subroutine_arg16;
+    s32 subroutine_arg26;
+    s32 subroutine_arg2C;
+    s32 subroutine_arg2D;
+    s32 subroutine_arg2E;
+    s32 subroutine_arg2F;
+
+    if (ptr->unk_00 == 0) {
+        return 1;
+    }
+
+    gSPDisplayList(gMasterGfxPos++, N(D_802478C8_970A88));
+
+    if ((ptr->unk_00 == 1) || (ptr->unk_00 == 4) || (ptr->unk_00 == 5)) {
+        guTranslateF(&subroutine_arg16, ptr->unk_04, ptr->unk_08, ptr->unk_0C);
+        guMtxCatF(&subroutine_arg16, matrix, &subroutine_arg6);
+        guRotateF(&subroutine_arg16, ptr->unk_10, 0.0f, 1.0f, 0.0f);
+        guMtxCatF(&subroutine_arg16, subroutine_arg6, subroutine_arg6);
+        guRotateF(&subroutine_arg16, ptr->unk_14, 1.0f, 0.0f, 0.0f);
+        guMtxCatF(&subroutine_arg16, subroutine_arg6, subroutine_arg6);
+        guMtxF2L(&subroutine_arg6, &gDisplayContext->matrixStack[gMatrixListPos++]);
+
+        gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+        if ((ptr->unk_00 == 1) || (ptr->unk_00 == 4)) {
+            gSPDisplayList(gMasterGfxPos++, N(D_802479B8_970B78));
+        }
+
+        if ((ptr->unk_00 == 1) || (ptr->unk_00 == 5)) {
+            func_802DE044(&subroutine_arg2C, ptr->unk_18, ptr->unk_1C);
+
+            gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16);
+            gDPLoadTLUT_pal16(gMasterGfxPos++, 0, 0xFFFFFFFF);
+            gDPTileSync(gMasterGfxPos++);
+            gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x0100, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+            gDPLoadSync(gMasterGfxPos++);
+            gDPLoadTLUTCmd(gMasterGfxPos++, G_TX_LOADTILE, 15);
+            gDPPipeSync(gMasterGfxPos++);
+
+            gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, subroutine_arg2E, subroutine_arg2C);
+            gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 0, subroutine_arg2E, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD);
+
+            gDPLoadSync(gMasterGfxPos++);
+            gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, subroutine_arg2E, subroutine_arg2F);
+
+            gDPPipeSync(gMasterGfxPos++);
+            gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 0, subroutine_arg2E, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD);
+            gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, subroutine_arg2E, subroutine_arg2F);
+
+            guTranslateF(&subroutine_arg6, ptr->unk_20 - (subroutine_arg2E / 2) - 30, 0.0f, 0.0f);
+            guMtxF2L(&subroutine_arg6, &gDisplayContext->matrixStack[gMatrixListPos++]);
+
+            gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+            gSPDisplayList(gMasterGfxPos++, N(D_80247A38_970BF8));
+            gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+        }
+
+        gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+        return 1;
+    }
+
+    if (ptr->unk_00 == 2) {
+        gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x047C, 0x047C);
+
+        guTranslateF(&subroutine_arg16, N(D_8024F010)[0].unk_04, N(D_8024F010)[0].unk_08, N(D_8024F010)[0].unk_0C);
+        guMtxCatF(&subroutine_arg16, matrix, subroutine_arg6);
+        guMtxF2L(&subroutine_arg6, &gDisplayContext->matrixStack[gMatrixListPos++]);
+
+        gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+        func_8013AF70(get_variable(N(D_8024EFCC), SI_ARRAY(0)), &subroutine_arg26, 0x30, &subroutine_arg6);
+
+        gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+
+        return 1;
+    }
+
+    if (ptr->unk_00 == 3) {
+        gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0x0400, 0x0400, 0x047C, 0x047C);
+
+        guTranslateF(&subroutine_arg16, N(D_8024F010)[0].unk_04, N(D_8024F010)[0].unk_08, N(D_8024F010)[0].unk_0C);
+        guMtxCatF(&subroutine_arg16, matrix, &subroutine_arg6);
+        guMtxF2L(&subroutine_arg6, &gDisplayContext->matrixStack[gMatrixListPos++]);
+
+        gSPMatrix(gMasterGfxPos++, 0xFFFFFFFF, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+        func_8013AF70(get_variable(N(D_8024EFCC), SI_ARRAY(1)), &subroutine_arg26, 0x30, &subroutine_arg6);
+        func_8013AF70(get_variable(N(D_8024EFCC), SI_ARRAY(2)), &subroutine_arg26, 0x30, &subroutine_arg6);
+
+        gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+
+        guTranslateF(&subroutine_arg16, N(D_8024F010)[0].unk_04, N(D_8024F010)[0].unk_08, N(D_8024F010)[0].unk_0C);
+        guMtxCatF(&subroutine_arg16, matrix, &subroutine_arg6);
+        guMtxF2L(&subroutine_arg6, &gDisplayContext->matrixStack[gMatrixListPos++]);
+
+        gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gMatrixListPos++;
+
+        func_802DE044(&subroutine_arg2C, ptr->unk_18, ptr->unk_1C);
+        func_8013AF70(get_variable(N(D_8024EFCC), SI_ARRAY(3)), subroutine_arg2C, subroutine_arg2D, subroutine_arg2E, subroutine_arg2F, -(subroutine_arg2E / 2), subroutine_arg2F / 2, 0xFF, &subroutine_arg26, 0x10, &subroutine_arg6);
+
+        gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+    }
+    return 1;
+}
+#else
+INCLUDE_ASM(u32, "world/area_dro/dro_02/9694C0", dro_02_func_8024190C_96AACC, D_8024F010_Struct* ptr, Matrix4f matrix);
+#endif
+
+void N(func_80242214_96B3D4)(s32 arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4) {
+    s32* CC_ptr = &N(D_8024EFCC);
+    D_8024F010_Struct* F010_ptr;
+    Matrix4f sp20;
+    Matrix4f sp60;
+    Matrix4f spA0;
+
+    guPositionF(&spA0, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 0.71428573f, get_variable(*CC_ptr, SI_ARRAY(4)), get_variable(*CC_ptr, SI_ARRAY(5)), get_variable(*CC_ptr, SI_ARRAY(6)));
+
+    F010_ptr = ({ D_8024F010_Struct* a = &N(D_8024F010); &a[arg0]; });
+    guTranslateF(&sp60, F010_ptr->unk_04, F010_ptr->unk_08, F010_ptr->unk_0C);
+    guMtxCatF(&sp60, &spA0, &sp20);
+    guRotateF(&sp60, F010_ptr->unk_10, 0.0f, 1.0f, 0.0f);
+    guMtxCatF(&sp60, &sp20, &sp20);
+    guTranslateF(&sp60, 0.0f, 0.0f, 1.0f);
+    guMtxCatF(&sp60, &sp20, &sp20);
+    *arg1 = sp20[3][0];
+    *arg2 = sp20[3][1];
+    *arg3 = sp20[3][2];
+    *arg4 = clamp_angle(F010_ptr->unk_10);
+}
+
+// Too much work, maybe try again later
+#ifdef NON_MATCHING
+void func_8024240C_96B5CC(ScriptInstance *script, s32 isInitialCall) {
+    N(temp)** effect;
+    N(temp)** effect2;
+    N(temp)** effect3;
+    EffectInstanceDataThing* effectPtr;
+    s32 var = get_variable(N(D_8024EFCC), SI_ARRAY(9));
+    s32 i, j, x;
+    f32 subroutine_arg6;
+    f32 subroutine_arg7;
+    f32 subroutine_arg8;
+    f32 subroutine_arg9;
+
+    f32 subroutine_argA;
+    f32 subroutine_argB;
+    f32 subroutine_argC;
+    f32 subroutine_argD;
+
+    f32 subroutine_argE;
+    f32 subroutine_argF;
+    f32 subroutine_arg10;
+    f32 subroutine_arg11;
+
+    f32 subroutine_arg12;
+    f32 subroutine_arg13;
+    f32 subroutine_arg14;
+    f32 subroutine_arg15;
+
+    f32 subroutine_arg16;
+    f32 subroutine_arg17;
+    f32 subroutine_arg18;
+    f32 subroutine_arg19;
+
+    f32 subroutine_arg1A;
+    f32 subroutine_arg1B;
+    f32 subroutine_arg1C;
+    f32 subroutine_arg1D;
+
+    D_8024F010_Struct* ptr;
+    s32* ptr2;
+    s32* ptr3;
+    s32* ptr4;
+    s32* ptr5;
+    s32* ptr6;
+    s32* ptr7;
+    s32* ptr8;
+    s32* ptr9;
+    s32* ptr10;
+    f32* ptr11;
+    D_8024F010_Struct* ptr12;
+
+    f32 testf1;
+    f32 testf2;
+
+    switch (var) {
+        case 0:
+            N(D_8024EF88) = 0;
+            set_variable(N(D_8024EFCC), SI_ARRAY(9), 1);
+
+            N(D_8024F010)[0].unk_00 = 1;
+            N(D_8024F010)[0].unk_04 = -200.0f;
+            N(D_8024F010)[0].unk_08 = 0;
+            N(D_8024F010)[0].unk_0C = 0;
+            N(D_8024F010)[0].unk_14 = 0;
+            N(D_8024F010)[0].unk_10 = 0;
+            N(D_8024F010)[0].unk_18 = 1;
+            N(D_8024F010)[0].unk_1C = 0xC;
+            N(D_8024F010)[0].unk_20 = 2;
+
+            N(D_8024F010)[1].unk_00 = 1;
+            N(D_8024F010)[1].unk_04 = 200.0f;
+            N(D_8024F010)[1].unk_08 = 0;
+            N(D_8024F010)[1].unk_0C = 1.0f;
+            N(D_8024F010)[1].unk_14 = 0;
+            N(D_8024F010)[1].unk_10 = 0;
+            N(D_8024F010)[1].unk_18 = 1;
+            N(D_8024F010)[1].unk_1C = 0x30;
+            N(D_8024F010)[1].unk_20 = 0;
+
+            N(D_8024F010)[2].unk_00 = 1;
+            N(D_8024F010)[2].unk_04 = 0;
+            N(D_8024F010)[2].unk_08 = 200.0f;
+            N(D_8024F010)[2].unk_0C = 2.0f;
+            N(D_8024F010)[2].unk_14 = 0;
+            N(D_8024F010)[2].unk_10 = 0;
+            N(D_8024F010)[2].unk_18 = 8;
+            N(D_8024F010)[2].unk_1C = 5;
+            N(D_8024F010)[2].unk_20 = 4;
+            break;
+
+        case 1:
+            N(D_8024F010)[0].unk_04 += 10.0f;
+            N(D_8024F010)[1].unk_04 += -10.0f;
+            N(D_8024F010)[2].unk_08 += -10.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 0x12) {
+                gPlayerStatus.position.y = -1000.0f;
+            }
+            if (N(D_8024EF88) == 0x14) {
+                set_variable(N(D_8024EFCC), SI_ARRAY(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;
+            N(D_8024F010)[0].unk_08 = 0;
+            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_8024F010)[0].unk_04 -= 10.0f;
+            N(D_8024F010)[1].unk_04 += 10.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 0xA) {
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 4);
+            }
+            break;
+
+        case 4:
+            N(D_8024F010)[0].unk_08 = 0;
+            N(D_8024F010)[0].unk_0C = 0;
+            N(D_8024F010)[1].unk_08 = 0;
+            N(D_8024F010)[2].unk_04 = 0;
+            N(D_8024F010)[2].unk_08 = 0;
+            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) == 0x14) {
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 5);
+                sfx_play_sound_with_params(0x203, 0, 0x18, 0);
+            }
+            break;
+
+        case 5:
+            N(D_8024F010)[1].unk_10 = 0;
+            N(D_8024F010)[2].unk_10 = 0;
+            N(D_8024F010)[0].unk_10 += 18.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 8) {
+                N(func_80242214_96B3D4)(0, &subroutine_arg6, &subroutine_arg7, &subroutine_arg8, &subroutine_arg9);
+                func_8006FEF0(0, subroutine_arg6, subroutine_arg7 + 20.0f, subroutine_arg8, 30.0f);
+            }
+            if (N(D_8024EF88) == 0xA) {
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 6);
+                sfx_play_sound_with_params(0x203, 0, 0x40, 0);
+            }
+            break;
+
+        case 6:
+            N(D_8024F010)[1].unk_10 = 0;
+            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, &subroutine_argA, &subroutine_argB, &subroutine_argC, &subroutine_argD);
+                func_8006FEF0(0, subroutine_argA, subroutine_argB + 20.0f, subroutine_argC, 30.0f);
+            }
+            if (N(D_8024EF88) == 0xA) {
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 7);
+                sfx_play_sound_with_params(0x203, 0, 0x68, 0);
+            }
+            break;
+
+        case 7:
+            N(D_8024F010)[0].unk_10 = 0;
+            N(D_8024F010)[1].unk_10 += 18.0f;
+            N(D_8024F010)[2].unk_10 += 18.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 8) {
+                N(func_80242214_96B3D4)(1, &subroutine_argE, &subroutine_argF, &subroutine_arg10, &subroutine_arg11);
+                func_8006FEF0(0, subroutine_argE, subroutine_argF + 20.0f, subroutine_arg10, 30.0f);
+            }
+            if (N(D_8024EF88) == 0xA) {
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 8);
+            }
+            break;
+
+        case 8:
+            N(D_8024F010)[0].unk_10 = 0;
+            N(D_8024F010)[2].unk_10 = 0;
+            N(D_8024F010)[1].unk_10 += 18.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 0xA) {
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 9);
+            }
+            break;
+
+        case 9:
+            N(D_8024F010)[0].unk_08 = 0;
+            N(D_8024F010)[0].unk_10 = 0;
+            N(D_8024F010)[1].unk_08 = 0;
+            N(D_8024F010)[1].unk_10 = 0;
+            N(D_8024F010)[2].unk_04 = 0;
+            N(D_8024F010)[2].unk_08 = 0;
+            N(D_8024F010)[2].unk_10 = 0;
+            N(D_8024F010)[0].unk_04 += 10.0f;
+            N(D_8024F010)[1].unk_04 -= 10.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 0xA) {
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 10);
+            }
+            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;
+            N(D_8024F010)[0].unk_0C = 0;
+            N(D_8024F010)[1].unk_04 = 0;
+            N(D_8024F010)[1].unk_0C = 0;
+            N(D_8024F010)[1].unk_1C = 0xA;
+            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;
+            set_variable(N(D_8024EFCC), SI_ARRAY(9), 0xC);
+            gPauseMenuTabs[0].unk_00 = 0;
+            N(D_8024EF84) = 1.0f;
+            N(func_80242214_96B3D4)(1, &subroutine_arg12, &subroutine_arg13, &subroutine_arg14, &subroutine_arg15);
+
+            effect = &N(D_8024EF90);
+            for (i = 0; i < 4; i++) {
+                (*effect) = func_800720B0(2, subroutine_arg12, subroutine_arg13 + 20.0f, subroutine_arg14, 8.0f, -1);
+
+                (*effect)->unk_0C->unk_28 = 0xD7;
+                (*effect)->unk_0C->unk_2C = 0x37;
+                (*effect)->unk_0C->unk_30 = 0xFF;
+                effect++;
+
+                j = 1;
+                while (j < (*effect)->unk_08) {
+                    (*effect)->unk_0C->unk_48->unk_38[j++] *= 0.1;
+                }
+            }
+            break;
+
+        case 12: {
+            MenuTab* menuTabs;
+            s32 y;
+
+            N(func_80242214_96B3D4)(1, &subroutine_arg16, &subroutine_arg17, &subroutine_arg18, &subroutine_arg19);
+            for (y = 0; y < 4; y++) {
+                N(D_8024EF90)[y]->unk_0C->unk_04 = subroutine_arg16;
+                N(D_8024EF90)[y]->unk_0C->unk_08 = subroutine_arg17 + 20.0f;
+                N(D_8024EF90)[y]->unk_0C->unk_0C = subroutine_arg18;
+                N(D_8024EF90)[y]->unk_0C->unk_34 -= 0.1;
+                if (N(D_8024EF90)[y]->unk_0C->unk_34 < 0.1) {
+                    N(D_8024EF90)[y]->unk_0C->unk_34 = 0.1f;
+                }
+
+                j = 1;
+                while (j < N(D_8024EF90)[y]->unk_08) {
+                    N(temp)** eff2 = &N(D_8024EF90)[y];
+
+                    (*eff2)->unk_0C->unk_48->unk_38[j++] += 0.01;
+                }
+            }
+
+            N(D_8024F010)[0].unk_08 += gPauseMenuTabs[0].unk_00;
+            N(D_8024F010)[1].unk_08 += N(D_8024EF84);
+            gPauseMenuTabs[0].unk_00 += 0.4;
+            N(D_8024EF84) -= 0.05;
+            N(D_8024EF88)++;
+            if (N(D_8024F010)[1].unk_08 < -5.0f) {
+                N(D_8024F010)[1].unk_08 = -5.0f;
+                N(D_8024EF88) = 0;
+                set_variable(N(D_8024EFCC), SI_ARRAY(9), 0xD);
+                N(D_8024F010)[0].unk_00 = 0;
+                N(D_8024F010)[1].unk_00 = 0;
+                N(func_80242214_96B3D4)(1, &subroutine_arg1A, &subroutine_arg1B, &subroutine_arg1C, &subroutine_arg1D);
+                func_8006FEF0(0, subroutine_arg1A, subroutine_arg1B + 20.0f, subroutine_arg1C, 30.0f);
+                sfx_play_sound(0x206);
+                for (x = 0; x < 4; x++) {
+                    N(D_8024EF90)[x]->flags |= 0x10;
+                }
+            }
+            break;
+        }
+
+        case 13:
+            break;
+    }
+}
+#else
+INCLUDE_ASM(void, "world/area_dro/dro_02/9694C0", dro_02_func_8024240C_96B5CC, ScriptInstance *script, s32 isInitialCall);
+#endif
+
+void N(func_80242EAC_96C06C)(ScriptInstance *script, s32 isInitialCall) {
+    Matrix4f sp20;
+    u32 temp_s1;
+
+    guPositionF(&sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 0.71428573f, get_variable(N(D_8024EFCC), SI_ARRAY(4)), get_variable(N(D_8024EFCC), SI_ARRAY(5)), get_variable(N(D_8024EFCC), SI_ARRAY(6)));
+
+    temp_s1 = func_8024190C_96AACC(&N(D_8024F010)[0], &sp20);
+    func_8024190C_96AACC(&N(D_8024F010)[1], &sp20);
+    func_8024190C_96AACC(&N(D_8024F010)[2], &sp20);
+    if ((N(D_8024F010)[0].unk_00 == 2) && ((temp_s1 - 1) < 2)) {
+        set_variable(N(D_8024EFCC), SI_ARRAY(9), 3);
+    }
+    if ((N(D_8024F010)[0].unk_00 == 3) && ((temp_s1 - 1) < 2)) {
+        set_variable(N(D_8024EFCC), SI_ARRAY(9), 0xB);
+    }
+}
+
+ApiStatus N(func_8024303C_96C1FC)(ScriptInstance *script, s32 isInitialCall) {
+    sfx_play_sound_with_params(0x202A, 0, 0x18, 0);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80243068_96C228)(ScriptInstance *script, s32 isInitialCall) {
+    sfx_play_sound_with_params(0x202B, 0, 0x68, 0);
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802432C0_96C480);
-/*
 ApiStatus N(func_802432C0_96C480)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80248780_971940) = 0;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80248780_971940) != NULL) {
+        N(D_80248780_971940) = 0;
+        set_variable(script, *args, N(D_80248784_971944));
         return ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243314_96C4D4);
-/*
 ApiStatus N(func_80243314_96C4D4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80248784_971944) = get_variable(script, *args);
+    N(D_80248780_971940) = 1;
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024334C_96C50C);
+ApiStatus N(func_8024334C_96C50C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8);
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_8024F080)[i] = ptr[i];
+        }
+        N(D_8024F080)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_8024F080)[i] = i + 16;
+            N(D_8024F080)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_802433E8_96C5A8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_8024F248)[i] = ptr[i];
+        }
+        N(D_8024F248)[i] = 0;
+    } else {
+        for (i = 0; i <= 90; i++) {
+            N(D_8024F248)[i] = i + 128;
+            N(D_8024F248)[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/Call800E9894.inc.c"
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243644_96C804);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243698_96C858);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938);
+#include "world/common/UnkFunc36.inc.c"
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802439FC_96CBBC);
+ApiStatus N(func_802439FC_96CBBC)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
 
-INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243A40_96CC00);
+    N(D_8024F3B8) = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80243A40_96CC00)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = N(D_8024F3B8);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_dro/dro_02/dro_02.h b/src/world/area_dro/dro_02/dro_02.h
index a378577838..0c11521015 100644
--- a/src/world/area_dro/dro_02/dro_02.h
+++ b/src/world/area_dro/dro_02/dro_02.h
@@ -2,3 +2,62 @@
 #include "map.h"
 
 #define NAMESPACE dro_02
+
+ApiStatus N(Call800E9894)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(Call800E98C4SyncStatusMenu)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(Call800EB168)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetCamVfov)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetGameStatus75)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetNpcUnsafeOwner2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetPartnerCall800EB168)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(Set80151310_0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(Set80151310_1)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SetCamVfov)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SetManyVars)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkAlphaFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkCameraFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc26)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc27)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc29)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkMovePartner)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkRotatePartner)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkRotatePlayer)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkYawFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024043C_9695FC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc31)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802409EC_969BAC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240A70_969C30)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240C88_969E48)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240D3C_969EFC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240D70_969F30)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240DF0_969FB0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240E08_969FC8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240E24_969FE4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241364_96A524)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241394_96A554)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802414C0_96A680)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802415CC_96A78C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802416FC_96A8BC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241874_96AA34)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024303C_96C1FC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243068_96C228)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802432C0_96C480)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243314_96C4D4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024334C_96C50C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802433E8_96C5A8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc32)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(CamSetFOV)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(DoesPlayerNeedSleep)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc35)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802439FC_96CBBC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80243A40_96CC00)(ScriptInstance* script, s32 isInitialCall);
+void N(func_8024240C_96B5CC)(ScriptInstance *script, s32 isInitialCall);
+void N(func_80242EAC_96C06C)(ScriptInstance *script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_8024EEF4);
+extern Script N(80244C78);
+extern Script N(8024D434);
+extern Script N(8024D494);
+extern Script N(8024D700);
+extern Script N(main);
diff --git a/src/world/area_end/end_01/E08050.c b/src/world/area_end/end_01/E08050.c
index 2c33fdf5f5..a6625a6658 100644
--- a/src/world/area_end/end_01/E08050.c
+++ b/src/world/area_end/end_01/E08050.c
@@ -1,5 +1,5 @@
 #include "end_01.h"
 
-INCLUDE_ASM(s32, "world/area_end/end_01/E08050", func_80242CF0_E08050);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_end/end_01/E08050", func_80242E14_E08174);
+#include "world/common/UnkFunc26.inc.c"
diff --git a/src/world/area_flo/flo_00/C9DF20.c b/src/world/area_flo/flo_00/C9DF20.c
index 8028cd3a32..0822bb1457 100644
--- a/src/world/area_flo/flo_00/C9DF20.c
+++ b/src/world/area_flo/flo_00/C9DF20.c
@@ -1,3 +1,9 @@
 #include "flo_00.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF20", func_80240000_C9DF20);
+// Same as SpawnSunEffect, but doesn't touch float regs like SpawnSunEffect does
+void func_80072950();
+
+ApiStatus N(func_80240000_C9DF20)(ScriptInstance *script, s32 isInitialCall) {
+    func_80072950(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c
index f4995c6f21..5707774ad9 100644
--- a/src/world/area_flo/flo_00/C9DF60.c
+++ b/src/world/area_flo/flo_00/C9DF60.c
@@ -1,7 +1,2095 @@
 #include "flo_00.h"
+#include "script_api/common.h"
+#include "message_ids.h"
+#include "sprite/npc/bubulb.h"
+#include "sprite/npc/lakilulu.h"
+#include "sprite/npc/tolielup.h"
+#include "sprite/npc/world_klevar.h"
+#include "sprite/npc/world_lakilester.h"
+#include "sprite/npc/world_parakarry.h"
+
+enum {
+    NPC_BUBULB0,
+    NPC_BUBULB1,
+    NPC_BUBULB2,
+    NPC_BUBULB3,
+    NPC_BUBULB4,
+    NPC_TOLIELUP,
+    NPC_WORLD_KLEVAR,
+    NPC_LAKILULU,
+};
+
+EntryList N(entryList) = {
+    {    0.0f, 0.0f, -310.0f, 170.0f },
+    { -320.0f, 0.0f, -335.0f, 135.0f },
+    { -470.0f, 0.0f,    0.0f,  90.0f },
+    { -320.0f, 0.0f,  335.0f,  45.0f },
+    {  320.0f, 0.0f, -335.0f, 225.0f },
+    {  465.0f, 0.0f,    0.0f, 270.0f },
+    {  320.0f, 0.0f,  335.0f, 315.0f },
+    {  -30.0f, 0.0f,  120.0f, 270.0f },
+    {  -30.0f, 0.0f,  120.0f, 270.0f },
+    { -470.0f, 0.0f,    0.0f,  90.0f },
+    {   40.0f, 0.0f,  -30.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_00_tattle },
+};
+
+Script N(802414D0) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    match SI_VAR(0) {
+        == 8 {
+            if (SI_AREA_FLAG(44) != 0) {
+                SetMusicTrack(0, SONG_MAGIC_BEANSTALK, 1, 8);
+            } else {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+            }
+        }
+        == 9 {
+            SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
+        }
+        == 10 {
+            SetMusicTrack(0, SONG_STAR_SPIRIT_THEME, 1, 8);
+            spawn {
+                loop {
+                    sleep 1;
+                    if (STORY_PROGRESS >= STORY_CH6_STAR_SPRIT_DEPARTED) {
+                        break loop;
+                    }
+                }
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+            }
+        }
+        == 11 {
+            FadeInMusic(0, 49, 0, 3000, 0, 127);
+        }
+        else {
+            match STORY_PROGRESS {
+                < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+                    SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+                }
+                else {
+                    SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+                }
+            }
+        }
+    }
+});
+
+static s32 N(pad_16BC) = {
+    0x00000000,
+};
+
+Script N(802416C0) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(8024196C) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    ModifyColliderFlags(0, 2, 0x7FFFFE00);
+    PlayerMoveTo(30, -170, 10);
+    InterpPlayerYaw(0, 0);
+    PlaySoundAtCollider(2, 463, 0);
+    MakeLerp(0, -100, 20, 4);
+    loop {
+        UpdateLerp();
+        RotateGroup(28, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    func_802D2C14(1);
+    PlayerMoveTo(0, -310, 30);
+    func_802D2C14(0);
+    if (STORY_PROGRESS == STORY_CH6_STAR_SPRIT_DEPARTED) {
+        STORY_PROGRESS = STORY_CH6_RETURNED_TO_TOAD_TOWN;
+    }
+    MakeLerp(-100, 0, 30, 1);
+    loop {
+        UpdateLerp();
+        RotateGroup(28, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    PlaySoundAtCollider(2, 464, 0);
+    GotoMap("mac_01", 5);
+    sleep 100;
+});
+
+Script N(80241B90) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    ModifyColliderFlags(0, 2, 0x7FFFFE00);
+    InterpPlayerYaw(180, 0);
+    PlaySoundAtCollider(2, 463, 0);
+    MakeLerp(0, -100, 30, 1);
+    loop {
+        UpdateLerp();
+        RotateGroup(28, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    func_802D2C14(1);
+    PlayerMoveTo(0, -135, 30);
+    func_802D2C14(0);
+    MakeLerp(-100, 0, 30, 1);
+    loop {
+        UpdateLerp();
+        RotateGroup(28, SI_VAR(0), 0, 1, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    PlaySoundAtCollider(2, 464, 0);
+    DisablePlayerInput(FALSE);
+    ModifyColliderFlags(1, 2, 0x7FFFFE00);
+});
+
+Script N(exitWalk_80241D7C) = EXIT_WALK_SCRIPT(60,  1, "flo_14",  0);
+
+Script N(exitWalk_80241DD8) = EXIT_WALK_SCRIPT(60,  2, "flo_23",  0);
+
+Script N(exitWalk_80241E34) = EXIT_WALK_SCRIPT(60,  3, "flo_25",  0);
+
+Script N(exitWalk_80241E90) = EXIT_WALK_SCRIPT(60,  4, "flo_16",  0);
+
+Script N(exitWalk_80241EEC) = EXIT_WALK_SCRIPT(60,  5, "flo_09",  0);
+
+Script N(exitWalk_80241F48) = EXIT_WALK_SCRIPT(60,  6, "flo_08",  0);
+
+const s32 N(pad_XXXX)[] = { 0, 0};
+
+Script N(80241FA4) = SCRIPT({
+    bind N(exitWalk_80241D7C) to TRIGGER_FLOOR_ABOVE 5;
+    bind N(exitWalk_80241DD8) to TRIGGER_FLOOR_ABOVE 9;
+    bind N(exitWalk_80241E34) to TRIGGER_FLOOR_ABOVE 13;
+    bind N(exitWalk_80241E90) to TRIGGER_FLOOR_ABOVE 17;
+    bind N(exitWalk_80241EEC) to TRIGGER_FLOOR_ABOVE 21;
+    bind N(exitWalk_80241F48) to TRIGGER_FLOOR_ABOVE 25;
+});
+
+Script N(enterWalk_8024205C) = SCRIPT({
+    GetLoadType(SI_VAR(1));
+    if (SI_VAR(1) == 1) {
+        spawn EnterSavePoint;
+        spawn N(80241FA4);
+    } else {
+        GetEntryID(SI_VAR(0));
+        if (SI_VAR(0) != 8) {
+            SI_AREA_FLAG(44) = 0;
+        }
+        match SI_VAR(0) {
+            == 0 {
+                spawn {
+                    await N(80241B90);
+                    spawn N(80241FA4);
+                }
+            }
+            1..6 {
+                SI_VAR(0) = N(80241FA4);
+                spawn EnterWalk;
+            }
+            == 7 {
+                spawn {
+                    await N(8024834C);
+                    spawn N(80241FA4);
+                }
+            }
+            == 8 {
+                spawn {
+                    await N(80247BCC);
+                    spawn N(80241FA4);
+                }
+            }
+            == 9 {
+                spawn N(80242998);
+                SI_VAR(0) = N(80241FA4);
+                spawn EnterWalk;
+            }
+            == 10 {
+                spawn N(80241FA4);
+            }
+            == 11 {
+                spawn N(80245EB8);
+            }
+        }
+    }
+    bind N(80242FCC) to TRIGGER_WALL_PRESS_A 2;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    SI_SAVE_FLAG(1984) = 1;
+    if (STORY_PROGRESS < STORY_CH6_GREW_MAGIC_BEANSTALK) {
+        ModifyColliderFlags(0, 48, 0x7FFFFE00);
+    }
+    SI_SAVE_FLAG(263) = 0;
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 11) {
+        MakeNpcs(0, N(npcGroupList_80246834));
+    } else {
+        MakeNpcs(0, N(npcGroupList_80245DE4));
+    }
+    await N(makeEntities);
+    ParentColliderToModel(46, 81);
+    spawn N(80248F48);
+    spawn N(80248E30);
+    ModifyColliderFlags(3, 30, 0x00000006);
+    ModifyColliderFlags(3, 31, 0x00000006);
+    SI_VAR(0) = 150;
+    SI_VAR(1) = -270;
+    SI_VAR(2) = 410;
+    SI_VAR(3) = 170;
+    SI_VAR(4) = 0;
+    spawn N(802416C0);
+    SI_VAR(0) = 115;
+    SI_VAR(1) = -450;
+    SI_VAR(2) = 250;
+    SI_VAR(3) = -270;
+    SI_VAR(4) = 0;
+    spawn N(802416C0);
+    SI_VAR(0) = -330;
+    SI_VAR(1) = 220;
+    SI_VAR(2) = 45;
+    SI_VAR(3) = 410;
+    SI_VAR(4) = 0;
+    spawn N(802416C0);
+    SI_VAR(0) = -420;
+    SI_VAR(1) = -260;
+    SI_VAR(2) = -140;
+    SI_VAR(3) = 160;
+    SI_VAR(4) = 0;
+    spawn N(802416C0);
+    ModifyColliderFlags(0, 26, 0x7FFFFE00);
+    ModifyColliderFlags(0, 18, 0x7FFFFE00);
+    ModifyColliderFlags(0, 14, 0x7FFFFE00);
+    ModifyColliderFlags(0, 6, 0x7FFFFE00);
+    spawn N(enterWalk_8024205C);
+    GetLoadType(SI_VAR(1));
+    if (SI_VAR(1) != 1) {
+        GetEntryID(SI_VAR(0));
+        if (SI_VAR(0) == 10) {
+            sleep 65;
+        }
+    }
+    await N(802414D0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_C9DF20)();
+    }
+    spawn {
+        EnableTexPanning(35, 1);
+        SI_VAR(0) = 0;
+    0:
+        RandInt(300, SI_VAR(1));
+        SI_VAR(1) += 100;
+        RandInt(1, SI_VAR(2));
+        SI_VAR(2) += 1;
+        sleep SI_VAR(1);
+        loop SI_VAR(2) {
+            SetTexPanOffset(12, 0, -32768, 0);
+            sleep 2;
+            SetTexPanOffset(12, 0, -65536, 0);
+            sleep 2;
+            SetTexPanOffset(12, 0, -98304, 0);
+            RandInt(5, SI_VAR(3));
+            SI_VAR(3) += 2;
+            sleep SI_VAR(3);
+            SetTexPanOffset(12, 0, -65536, 0);
+            sleep 2;
+            SetTexPanOffset(12, 0, -32768, 0);
+            sleep 2;
+            SetTexPanOffset(12, 0, 0, 0);
+            RandInt(5, SI_VAR(3));
+            SI_VAR(3) += 2;
+            sleep SI_VAR(3);
+        }
+        goto 0;
+    }
+});
+
+NpcSettings N(npcSettings_80242840) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcAISettings N(npcAISettings_8024286C) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 30,
+    .waitTime = 30,
+    .unk_14 = -1,
+    .unk_2C = 1,
+};
+
+Script N(npcAI_8024289C) = SCRIPT({
+    N(func_80240BD4_C9EAF4)(N(npcAISettings_8024286C));
+});
+
+NpcSettings N(npcSettings_802428BC) = {
+    .height = 42,
+    .radius = 28,
+    .ai = &N(npcAI_8024289C),
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_802428E8) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80242914) = {
+    .height = 26,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80242940) = {
+    .height = 20,
+    .radius = 20,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_8024296C) = {
+    .height = 22,
+    .radius = 24,
+    .level = 99,
+};
+
+const char N(flo_07_name_hack)[];
+
+Script N(80242998) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    UseSettingsFrom(0, 50, 0, -200);
+    SetPanTarget(0, 50, 0, -200);
+    SetCamDistance(0, 700);
+    SetCamPitch(0, 10.0, -11.0);
+    SetCamPosA(0, -27, 0);
+    SetCamPosB(0, 0, -50);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 20;
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00C4), 0, 50, -200);
+    sleep 10;
+    GotoMap(N(flo_07_name_hack), 1);
+    sleep 100;
+});
+
+Script N(80242AF0) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    UseSettingsFrom(0, 0, 0, -170);
+    SetPanTarget(0, 0, 0, -170);
+    SetCamDistance(0, 300);
+    SetCamPitch(0, 17.0, -8.0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    sleep 75;
+    ShowMessageAtScreenPos(MESSAGE_ID(0x11, 0x0000), 160, 40);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPlayerJumpscale(1.5);
+    PlayerJump1(SI_VAR(0), SI_VAR(1), SI_VAR(2), 12);
+    sleep 10;
+    DisablePartnerAI(0);
+    InterpPlayerYaw(270, 0);
+    InterpNpcYaw(NPC_PARTNER, 270, 0);
+    sleep 15;
+    InterpPlayerYaw(90, 0);
+    InterpNpcYaw(NPC_PARTNER, 90, 0);
+    sleep 15;
+    SetCamDistance(0, 800);
+    SetCamPitch(0, 15.0, -5.7998046875);
+    SetCamPosA(0, -2, 0);
+    PanToTarget(0, 0, 1);
+    sleep 15;
+    SpeakToPlayer(NPC_BUBULB0, -1, -1, 5, MESSAGE_ID(0x11, 0x0001));
+    SetPlayerAnimation(ANIM_10002);
+    InterpPlayerYaw(350, 0);
+    sleep 15;
+    ContinueSpeech(0, -1, -1, 5, MESSAGE_ID(0x11, 0x0002));
+    sleep 10;
+    SetCamDistance(0, 333);
+    SetCamPitch(0, 9.0, -22.0);
+    SetCamPosA(0, -2, 0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    EnablePartnerAI();
+    func_802D2C14(1);
+    sleep 10;
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0003), 0, 70, -200);
+    SetCamPitch(0, 16.5, -11.7998046875);
+    SetCamDistance(0, 525);
+    SetCamPosA(0, -14, 0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 10;
+    SetPlayerAnimation(ANIM_80007);
+    sleep 20;
+    SetPlayerAnimation(ANIM_10002);
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0004), 0, 50, -200);
+    SetCamPitch(0, 9.0, -22.0);
+    SetCamDistance(0, 333);
+    SetCamPosA(0, -2, 0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 10;
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0005), 0, 70, -200);
+    ResetCam(0, 90.0);
+    STORY_PROGRESS = STORY_CH6_ARRIVED_AT_FLOWER_FIELDS;
+    func_802D2C14(0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80242FCC) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    sleep 2;
+    GetPlayerActionState(SI_VAR(3));
+    SI_VAR(4) = 0;
+    if (SI_VAR(3) == 0) {
+        SI_VAR(4) += 1;
+    }
+    if (SI_VAR(3) == 1) {
+        SI_VAR(4) += 1;
+    }
+    if (SI_VAR(3) == 2) {
+        SI_VAR(4) += 1;
+    }
+    if (SI_VAR(4) == 0) {
+        DisablePlayerInput(FALSE);
+        return;
+    }
+    if (STORY_PROGRESS == STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0006), 0, 50, -200);
+        STORY_PROGRESS = STORY_CH6_WISTERWOOD_GAVE_HINT;
+        DisablePlayerInput(FALSE);
+        return;
+    }
+    if (STORY_PROGRESS < STORY_CH6_RETURNED_TO_TOAD_TOWN) {
+        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x000D), 0, 50, -200);
+        ShowChoice(MESSAGE_ID(0x1E, 0x001F));
+        sleep 10;
+        match SI_VAR(0) {
+            == 0 {
+                match STORY_PROGRESS {
+                    < STORY_CH6_GOT_MAGICAL_BEAN {
+                        SwitchMessage(MESSAGE_ID(0x11, 0x000E));
+                    }
+                    < STORY_CH6_GOT_FERTILE_SOIL {
+                        SwitchMessage(MESSAGE_ID(0x11, 0x000F));
+                    }
+                    < STORY_CH6_FILLED_SPRING_WITH_WATER {
+                        SwitchMessage(MESSAGE_ID(0x11, 0x0010));
+                    }
+                    < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+                        SwitchMessage(MESSAGE_ID(0x11, 0x0011));
+                    }
+                    < STORY_CH6_GREW_MAGIC_BEANSTALK {
+                        SwitchMessage(MESSAGE_ID(0x11, 0x0007));
+                    }
+                    < STORY_CH6_BEGAN_PEACH_MISSION {
+                        SwitchMessage(MESSAGE_ID(0x11, 0x0012));
+                    }
+                    else {
+                        SwitchMessage(MESSAGE_ID(0x11, 0x0013));
+                    }
+                }
+            }
+            == 1 {
+                CloseMessage();
+                spawn N(8024196C);
+                return;
+            }
+            == 2 {
+                CloseMessage();
+            }
+        }
+    } else {
+        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0014), 0, 50, -200);
+        ShowChoice(MESSAGE_ID(0x1E, 0x001F));
+        sleep 10;
+        match SI_VAR(0) {
+            == 0 {
+                SwitchMessage(MESSAGE_ID(0x11, 0x0015));
+            }
+            == 1 {
+                CloseMessage();
+                spawn N(8024196C);
+                return;
+            }
+            == 2 {
+                CloseMessage();
+            }
+        }
+    }
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80243368) = SCRIPT({
+    AdjustCam(0, 90.0, 0, 600, 21.0, -12.0);
+    sleep 20;
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x000B), 0, 50, -200);
+    SetPanTarget(0, 0, 0, -30);
+    SetCamDistance(0, 250);
+    SetCamPitch(0, 25.0, -25.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 10;
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x000C), 0, 50, -200);
+    ResetCam(0, 90.0);
+});
+
+Script N(init_80243474) = SCRIPT({
+    EnableGroup(121, 0);
+    EnableGroup(80, 0);
+    EnableGroup(132, 0);
+    SetNpcPos(NPC_SELF, 50, 70, -230);
+    SetNpcFlagBits(NPC_SELF, ((0x00000002)), TRUE);
+    EnableNpcShadow(NPC_SELF, FALSE);
+    if (STORY_PROGRESS < STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) {
+        spawn N(80242AF0);
+    }
+});
+
+Script N(interact_8024352C) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_MAGICAL_BEAN {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0016));
+        }
+        < STORY_CH6_GOT_FERTILE_SOIL {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0017));
+        }
+        < STORY_CH6_FILLED_SPRING_WITH_WATER {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0018));
+        }
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0019));
+        }
+        < STORY_CH6_STAR_SPIRIT_RESCUED {
+            match SI_AREA_FLAG(18) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_9), NPC_ANIM(bubulb, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x001A));
+                    SI_AREA_FLAG(18) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_9), NPC_ANIM(bubulb, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x001B));
+                    SI_AREA_FLAG(18) = 0;
+                }
+            }
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_9), NPC_ANIM(bubulb, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x001C));
+        }
+    }
+});
+
+Script N(interact_802436C0) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_MAGICAL_BEAN {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x001D));
+        }
+        < STORY_CH6_GOT_FERTILE_SOIL {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x001E));
+        }
+        < STORY_CH6_FILLED_SPRING_WITH_WATER {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x001F));
+        }
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x0020));
+        }
+        < STORY_CH6_STAR_SPIRIT_RESCUED {
+            match SI_AREA_FLAG(19) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x0021));
+                    SI_AREA_FLAG(19) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x0022));
+                    SI_AREA_FLAG(19) = 0;
+                }
+            }
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x0023));
+        }
+    }
+});
+
+Script N(interact_80243854) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_MAGICAL_BEAN {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0024));
+        }
+        < STORY_CH6_GOT_FERTILE_SOIL {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0025));
+        }
+        < STORY_CH6_FILLED_SPRING_WITH_WATER {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0026));
+        }
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0027));
+        }
+        < STORY_CH6_STAR_SPIRIT_RESCUED {
+            match SI_AREA_FLAG(20) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_9), NPC_ANIM(bubulb, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, 0x0028));
+                    SI_AREA_FLAG(20) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_9), NPC_ANIM(bubulb, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, 0x0029));
+                    SI_AREA_FLAG(20) = 0;
+                }
+            }
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_9), NPC_ANIM(bubulb, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, 0x002A));
+        }
+    }
+});
+
+Script N(interact_802439E8) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_MAGICAL_BEAN {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002B));
+        }
+        < STORY_CH6_GOT_FERTILE_SOIL {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002C));
+        }
+        < STORY_CH6_FILLED_SPRING_WITH_WATER {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002D));
+        }
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002E));
+        }
+        < STORY_CH6_STAR_SPIRIT_RESCUED {
+            match SI_AREA_FLAG(21) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_9), NPC_ANIM(bubulb, Palette_03, Anim_8), 0, MESSAGE_ID(0x11, 0x002F));
+                    SI_AREA_FLAG(21) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_9), NPC_ANIM(bubulb, Palette_03, Anim_8), 0, MESSAGE_ID(0x11, 0x0030));
+                    SI_AREA_FLAG(21) = 0;
+                }
+            }
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_9), NPC_ANIM(bubulb, Palette_03, Anim_8), 0, MESSAGE_ID(0x11, 0x0031));
+        }
+    }
+});
+
+Script N(init_80243B7C) = SCRIPT({
+    SI_AREA_FLAG(18) = 0;
+    BindNpcInteract(NPC_SELF, N(interact_8024352C));
+});
+
+Script N(init_80243BB0) = SCRIPT({
+    SI_AREA_FLAG(19) = 0;
+    BindNpcInteract(NPC_SELF, N(interact_802436C0));
+});
+
+Script N(init_80243BE4) = SCRIPT({
+    SI_AREA_FLAG(20) = 0;
+    BindNpcInteract(NPC_SELF, N(interact_80243854));
+});
+
+Script N(init_80243C18) = SCRIPT({
+    SI_AREA_FLAG(21) = 0;
+    BindNpcInteract(NPC_SELF, N(interact_802439E8));
+});
+
+Script N(interact_80243C4C) = SCRIPT({
+    if (SI_SAVE_FLAG(1373) == 0) {
+        AdjustCam(0, 4.0, -30, 300, 20.0, -9.5);
+        SI_SAVE_FLAG(1373) = 1;
+    }
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_MAGICAL_BEAN {
+            match SI_AREA_VAR(0) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0035));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 2;
+                }
+                == 2 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 0;
+                }
+            }
+        }
+        < 47 {
+            match SI_AREA_VAR(0) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0036));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 2;
+                }
+                == 2 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 0;
+                }
+            }
+        }
+        < 53 {
+            match SI_AREA_VAR(0) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0037));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 2;
+                }
+                == 2 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 0;
+                }
+            }
+        }
+        < 57 {
+            match SI_AREA_VAR(0) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                    SI_AREA_VAR(0) = 1;
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038));
+                    EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+                }
+            }
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x003A));
+            EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0);
+        }
+    }
+    ResetCam(0, 4.0);
+});
+
+Script N(init_8024414C) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80243C4C));
+    SetNpcCollisionSize(-1, 65, 50);
+});
+
+Script N(idle_80244188) = SCRIPT({
+    loop {
+        loop 10 {
+            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) -= 1;
+            SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+        loop 10 {
+            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) += 1;
+            SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+    }
+});
+
+Script N(8024427C) = SCRIPT({
+    DisablePartnerAI(0);
+    func_802CF56C(2);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(3) = SI_VAR(0);
+    SI_VAR(3) += -50;
+    SI_VAR(4) = SI_VAR(1);
+    SI_VAR(4) += 26;
+    SetNpcPos(NPC_WORLD_KLEVAR, SI_VAR(3), SI_VAR(4), SI_VAR(2));
+    PlayerFaceNpc(6, 0);
+    NpcFaceNpc(NPC_PARTNER, NPC_WORLD_KLEVAR, 0);
+    SI_VAR(0) += -25;
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 475.0);
+    SetCamPitch(0, 18, -8);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    sleep 1;
+    WaitForPlayerInputEnabled();
+    DisablePlayerInput(TRUE);
+    sleep 40;
+    SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_3), NPC_ANIM(world_klevar, Palette_00, Anim_1), 512, MESSAGE_ID(0x11, 0x00D8));
+    SetCamDistance(0, 300.0);
+    SetCamPitch(0, 18, -9);
+    SetCamSpeed(0, 4.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    MakeLerp(0, 360, 10, 0);
+    loop {
+        UpdateLerp();
+        SetNpcRotation(NPC_WORLD_KLEVAR, 0, SI_VAR(0), 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    EnableNpcAI(6, 0);
+    SetNpcAnimation(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_4));
+    sleep 20;
+    SetPlayerAnimation(ANIM_GOT_ITEM);
+    PlaySoundAtPlayer(313, 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(3) = SI_VAR(1);
+    SI_VAR(1) += 50;
+    SI_VAR(2) += 10;
+    SI_VAR(3) += 30;
+    loop 5 {
+        PlayEffect(0x11, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
+        sleep 6;
+        PlayEffect(0x11, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
+        sleep 6;
+    }
+    sleep 20;
+    PlaySoundAtPlayer(392, 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(1) += 20;
+    PlayEffect(0x52, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 30, 0, 0, 0, 0, 0, 0, 0);
+    sleep 30;
+    SetPlayerAnimation(ANIM_10002);
+    SetNpcAnimation(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_1));
+    EnableNpcAI(6, 1);
+    N(PostChapter6StatUpdate)();
+    ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x0196), 160, 40);
+    sleep 10;
+    GetNpcPos(NPC_WORLD_KLEVAR, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 250.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 10;
+    SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_3), NPC_ANIM(world_klevar, Palette_00, Anim_1), 512, MESSAGE_ID(0x11, 0x00D9));
+    sleep 10;
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += -25;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 300.0);
+    SetCamSpeed(0, 4.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 10;
+    SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_3), NPC_ANIM(world_klevar, Palette_00, Anim_1), 512, MESSAGE_ID(0x11, 0x00DA));
+    SetNpcFlagBits(NPC_WORLD_KLEVAR, ((NPC_FLAG_40000)), TRUE);
+    spawn {
+        loop 25 {
+            GetNpcPos(NPC_WORLD_KLEVAR, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0);
+            sleep 4;
+        }
+    }
+    spawn {
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 1800;
+        MakeLerp(SI_VAR(2), SI_VAR(3), 100, 2);
+        loop {
+            UpdateLerp();
+            SetNpcRotation(NPC_WORLD_KLEVAR, 0, SI_VAR(0), 0);
+            sleep 1;
+            if (SI_VAR(1) == 0) {
+                break loop;
+            }
+        }
+    }
+    spawn {
+        GetNpcPos(NPC_WORLD_KLEVAR, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        SI_VAR(5) = SI_VAR(3);
+        SI_VAR(5) += 180;
+        MakeLerp(SI_VAR(3), SI_VAR(5), 100, 2);
+        loop {
+            UpdateLerp();
+            SetNpcPos(NPC_WORLD_KLEVAR, SI_VAR(2), SI_VAR(0), SI_VAR(4));
+            sleep 1;
+            if (SI_VAR(1) == 0) {
+                break loop;
+            }
+        }
+        SetNpcPos(NPC_WORLD_KLEVAR, 0, -1000, 0);
+    }
+    spawn {
+        sleep 15;
+        PlaySoundAtNpc(NPC_WORLD_KLEVAR, 0x2045, 0);
+    }
+    sleep 10;
+    SetPlayerAnimation(0x1002A);
+    sleep 110;
+    SetPlayerAnimation(ANIM_10002);
+    STORY_PROGRESS = STORY_CH6_STAR_SPRIT_DEPARTED;
+    await N(80243368);
+    EnablePartnerAI();
+    DisablePlayerInput(FALSE);
+});
+
+Script N(init_80244BF4) = SCRIPT({
+    GetLoadType(SI_VAR(1));
+    if (SI_VAR(1) != 1) {
+        GetEntryID(SI_VAR(0));
+        if (SI_VAR(0) == 10) {
+            BindNpcIdle(NPC_SELF, N(idle_80244188));
+            spawn N(8024427C);
+        } else {
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+        }
+    }
+});
+
+Script N(interact_80244C98) = SCRIPT({
+    if (STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        SpeakToPlayer(NPC_LAKILULU, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0032));
+    } else {
+        GetCurrentPartnerID(SI_VAR(0));
+        if (SI_VAR(0) == 8) {
+            SpeakToPlayer(NPC_LAKILULU, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0032));
+            sleep 10;
+            DisablePartnerAI(0);
+            SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, Palette_00, Anim_3), 5, MESSAGE_ID(0x11, 0x0033));
+            SetNpcAnimation(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_1));
+            EndSpeech(-4, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5);
+            EnablePartnerAI();
+        } else {
+            SpeakToPlayer(NPC_LAKILULU, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0034));
+        }
+    }
+});
+
+Script N(init_80244DD0) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_BEGAN_PEACH_MISSION) {
+        BindNpcInteract(NPC_SELF, N(interact_80244C98));
+        SetNpcCollisionSize(-1, 36, 28);
+        SetNpcPos(NPC_SELF, -200, 15, -300);
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+StaticNpc N(npcGroup_80244E64) = {
+    .id = NPC_BUBULB0,
+    .settings = &N(npcSettings_80242840),
+    .pos = { -72.0f, 60.0f, -100.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80243474),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_E),
+        NPC_ANIM(bubulb, Palette_00, Anim_E),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+    },
+};
+
+StaticNpc N(npcGroup_80245054)[] = {
+    {
+        .id = NPC_BUBULB1,
+        .settings = &N(npcSettings_802428BC),
+        .pos = { -59.0f, 0.0f, -40.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80243B7C),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { 2, -59, 0, -40, -80, 0, -40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_E),
+            NPC_ANIM(bubulb, Palette_00, Anim_E),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+            NPC_ANIM(bubulb, Palette_00, Anim_2),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00D5),
+    },
+    {
+        .id = NPC_BUBULB2,
+        .settings = &N(npcSettings_802428BC),
+        .pos = { 67.0f, 0.0f, 85.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80243BB0),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { 2, 67, 0, 85, 97, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_E),
+            NPC_ANIM(bubulb, Palette_01, Anim_E),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+            NPC_ANIM(bubulb, Palette_01, Anim_2),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00D6),
+    },
+    {
+        .id = NPC_BUBULB3,
+        .settings = &N(npcSettings_802428BC),
+        .pos = { 90.0f, 0.0f, 410.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80243BE4),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { 2, 90, 0, 410, 120, 0, 410, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_E),
+            NPC_ANIM(bubulb, Palette_02, Anim_E),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+            NPC_ANIM(bubulb, Palette_02, Anim_2),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00D7),
+    },
+    {
+        .id = NPC_BUBULB4,
+        .settings = &N(npcSettings_802428BC),
+        .pos = { 200.0f, 0.0f, 430.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+        .init = &N(init_80243C18),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .movement = { 2, 200, 0, 430, 240, 0, 430, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
+        .animations = {
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_E),
+            NPC_ANIM(bubulb, Palette_03, Anim_E),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+            NPC_ANIM(bubulb, Palette_03, Anim_2),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00D8),
+    },
+};
+
+StaticNpc N(npcGroup_80245814) = {
+    .id = NPC_TOLIELUP,
+    .settings = &N(npcSettings_802428E8),
+    .pos = { -400.0f, 0.0f, 190.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
+    .init = &N(init_8024414C),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+        NPC_ANIM(tolielup, Palette_00, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00D9),
+};
+
+StaticNpc N(npcGroup_80245A04) = {
+    .id = NPC_WORLD_KLEVAR,
+    .settings = &N(npcSettings_80242914),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80244BF4),
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_0),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+        NPC_ANIM(world_klevar, Palette_00, Anim_1),
+    },
+};
+
+StaticNpc N(npcGroup_80245BF4) = {
+    .id = NPC_LAKILULU,
+    .settings = &N(npcSettings_80242840),
+    .pos = { 198.0f, 0.0f, 363.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80244DD0),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00E2),
+};
+
+NpcGroupList N(npcGroupList_80245DE4) = {
+    NPC_GROUP(N(npcGroup_80244E64), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80245054), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80245814), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80245A04), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80245BF4), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+static s32 N(pad_5E2C) = {
+    0x00000000,
+};
+
+NpcSettings N(npcSettings_80245E30) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80245E5C) = {
+    .height = 35,
+    .radius = 24,
+    .level = 99,
+    .unk_2A = 16,
+};
+
+f32 N(D_80245E88_CA3DA8)[] = {
+    266.0f,  20.0f, 322.0f, 310.0f,
+     30.0f, 312.0f, 346.0f,  90.0f,
+    300.0f, 400.0f, 200.0f, 287.0f,
+};
+
+const char N(sam_11_name_hack)[];
+
+Script N(80245EB8) = SCRIPT({
+    SetPlayerPos(-400, 0, 200);
+    SetNpcPos(NPC_PARTNER, -380, 0, 200);
+    func_802CF56C(2);
+    DisablePartnerAI(0);
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    SI_VAR(0) = 230;
+    SI_VAR(1) = 0;
+    SI_VAR(2) = 350;
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 90.0);
+    SetCamPitch(0, 17.0, -10.0);
+    SetCamDistance(0, 350);
+    SetCamPosA(0, 17.5, 35.0);
+    SetCamPosB(0, 0, -50);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 70;
+    InterpNpcYaw(NPC_BUBULB0, 90, 0);
+    sleep 10;
+    SetNpcAnimation(NPC_BUBULB0, NPC_ANIM(world_lakilester, Palette_00, Anim_9));
+    sleep 40;
+    SetNpcAnimation(NPC_BUBULB0, NPC_ANIM(world_lakilester, Palette_00, Anim_1));
+    SetNpcAnimation(NPC_BUBULB2, NPC_ANIM(world_parakarry, Palette_00, Anim_6));
+    sleep 40;
+    SetNpcAnimation(NPC_BUBULB2, NPC_ANIM(world_parakarry, Palette_00, Anim_1));
+    InterpNpcYaw(NPC_BUBULB2, 90, 0);
+    NpcFlyTo(2, 400, 200, 287, 80, -5, 0);
+    InterpNpcYaw(NPC_BUBULB0, 270, 0);
+    sleep 40;
+    FadeOutMusic(0, 1000);
+    GotoMap(N(sam_11_name_hack), 2);
+    sleep 100;
+});
+
+Script N(init_80246170) = SCRIPT({
+    SetPlayerPos(-400, 0, 200);
+    SetNpcPos(NPC_PARTNER, -380, 0, 200);
+    SetNpcPos(NPC_BUBULB0, 196, 20, 354);
+    SetNpcYaw(NPC_BUBULB0, 270);
+});
+
+Script N(init_802461E4) = SCRIPT({
+    SetNpcPos(NPC_BUBULB1, 163, 20, 370);
+    SetNpcYaw(NPC_BUBULB1, 90);
+});
+
+Script N(init_80246224) = SCRIPT({
+    SetNpcPos(NPC_BUBULB2, 266, 20, 322);
+    SetNpcYaw(NPC_BUBULB2, 270);
+});
+
+StaticNpc N(npcGroup_80246264)[] = {
+    {
+        .id = NPC_BUBULB0,
+        .settings = &N(npcSettings_80245E30),
+        .pos = { 144.0f, 0.0f, 374.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_80246170),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+            NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        },
+    },
+    {
+        .id = NPC_BUBULB1,
+        .settings = &N(npcSettings_80245E30),
+        .pos = { 198.0f, 0.0f, 363.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802461E4),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+            NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        },
+    },
+    {
+        .id = NPC_BUBULB2,
+        .settings = &N(npcSettings_80245E5C),
+        .pos = { 266.0f, 0.0f, 322.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_80246224),
+        .yaw = 0,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_2),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_3),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_3),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_0),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_0),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+            NPC_ANIM(world_parakarry, Palette_00, Anim_1),
+        },
+    },
+};
+
+NpcGroupList N(npcGroupList_80246834) = {
+    NPC_GROUP(N(npcGroup_80246264), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+static s32 N(pad_684C) = {
+    0x00000000,
+};
+
+Script N(80246850) = SCRIPT({
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) -= -700.0;
+    SI_VAR(1) /= 100.0;
+    SI_VAR(2) = (float) SI_VAR(1);
+    SI_VAR(2) *= 100.0;
+    if (SI_VAR(2) > 100) {
+        SI_VAR(1) = 1.0;
+    }
+    ScaleGroup(74, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(89, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(91, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(93, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(95, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(97, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(99, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(101, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(103, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(105, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(107, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(109, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(111, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(113, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(115, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(117, SI_VAR(1), 1, SI_VAR(1));
+    ScaleModel(119, SI_VAR(1), 1, SI_VAR(1));
+    TranslateGroup(74, 0, SI_VAR(0), 0);
+    TranslateModel(89, 0, SI_VAR(0), 0);
+    TranslateModel(91, 0, SI_VAR(0), 0);
+    TranslateModel(93, 0, SI_VAR(0), 0);
+    TranslateModel(95, 0, SI_VAR(0), 0);
+    TranslateModel(97, 0, SI_VAR(0), 0);
+    TranslateModel(99, 0, SI_VAR(0), 0);
+    TranslateModel(101, 0, SI_VAR(0), 0);
+    TranslateModel(103, 0, SI_VAR(0), 0);
+    TranslateModel(105, 0, SI_VAR(0), 0);
+    TranslateModel(107, 0, SI_VAR(0), 0);
+    TranslateModel(109, 0, SI_VAR(0), 0);
+    TranslateModel(111, 0, SI_VAR(0), 0);
+    TranslateModel(113, 0, SI_VAR(0), 0);
+    TranslateModel(115, 0, SI_VAR(0), 0);
+    TranslateModel(117, 0, SI_VAR(0), 0);
+    TranslateModel(119, 0, SI_VAR(0), 0);
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) *= -12.0;
+    RotateGroup(74, SI_VAR(1), 0, 1, 0);
+    RotateModel(89, SI_VAR(1), 0, 1, 0);
+    RotateModel(91, SI_VAR(1), 0, 1, 0);
+    RotateModel(93, SI_VAR(1), 0, 1, 0);
+    RotateModel(95, SI_VAR(1), 0, 1, 0);
+    RotateModel(97, SI_VAR(1), 0, 1, 0);
+    RotateModel(99, SI_VAR(1), 0, 1, 0);
+    RotateModel(101, SI_VAR(1), 0, 1, 0);
+    RotateModel(103, SI_VAR(1), 0, 1, 0);
+    RotateModel(105, SI_VAR(1), 0, 1, 0);
+    RotateModel(107, SI_VAR(1), 0, 1, 0);
+    RotateModel(109, SI_VAR(1), 0, 1, 0);
+    RotateModel(111, SI_VAR(1), 0, 1, 0);
+    RotateModel(113, SI_VAR(1), 0, 1, 0);
+    RotateModel(115, SI_VAR(1), 0, 1, 0);
+    RotateModel(117, SI_VAR(1), 0, 1, 0);
+    RotateModel(119, SI_VAR(1), 0, 1, 0);
+    TranslateModel(89, 8.1220703125, 56.1533203125, 1.166015625);
+    TranslateModel(91, -6.8779296875, 91.1533203125, 1.166015625);
+    TranslateModel(93, 13.1220703125, 106.1533203125, 1.166015625);
+    TranslateModel(95, -9.8779296875, 136.1533203125, 1.166015625);
+    TranslateModel(97, -7.8779296875, 201.1533203125, 1.166015625);
+    TranslateModel(99, 13.1220703125, 221.1533203125, 1.166015625);
+    TranslateModel(101, 8.126953125, 261.2294921875, 1.166015625);
+    TranslateModel(103, -12.8779296875, 266.1533203125, 1.166015625);
+    TranslateModel(105, 8.1220703125, 316.1533203125, -13.833984375);
+    TranslateModel(107, -10.943359375, 391.1533203125, 10.56640625);
+    TranslateModel(109, -7.001953125, 456.1533203125, 0.947265625);
+    TranslateModel(111, 12.998046875, 471.1533203125, 0.947265625);
+    TranslateModel(113, -10.001953125, 501.1533203125, 0.947265625);
+    TranslateModel(115, 8.0029296875, 536.2294921875, 0.947265625);
+    TranslateModel(117, 12.998046875, 586.1533203125, 0.947265625);
+    TranslateModel(119, -13.001953125, 631.1533203125, 0.947265625);
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) -= -700.0;
+    SI_VAR(1) /= 300.0;
+    SI_VAR(2) = (float) SI_VAR(1);
+    SI_VAR(2) *= 100.0;
+    if (SI_VAR(2) > 100) {
+        SI_VAR(1) = 1.0;
+    }
+    ScaleModel(89, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(91, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(93, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(95, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(97, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(99, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(101, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(103, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(105, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(107, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(109, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(111, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(113, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(115, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(117, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    ScaleModel(119, SI_VAR(1), SI_VAR(1), SI_VAR(1));
+    TranslateModel(89, -8.12109375, -56.15234375, -1.1650390625);
+    TranslateModel(91, 6.87890625, -91.15234375, -1.1650390625);
+    TranslateModel(93, -13.12109375, -106.15234375, -1.1650390625);
+    TranslateModel(95, 9.87890625, -136.15234375, -1.1650390625);
+    TranslateModel(97, 7.87890625, -201.15234375, -1.1650390625);
+    TranslateModel(99, -13.12109375, -221.15234375, -1.1650390625);
+    TranslateModel(101, -8.1259765625, -261.228515625, -1.1650390625);
+    TranslateModel(103, 12.87890625, -266.15234375, -1.1650390625);
+    TranslateModel(105, -8.12109375, -316.15234375, 13.8349609375);
+    TranslateModel(107, 10.9443359375, -391.15234375, -10.5654296875);
+    TranslateModel(109, 7.0029296875, -456.15234375, -0.9462890625);
+    TranslateModel(111, -12.9970703125, -471.15234375, -0.9462890625);
+    TranslateModel(113, 10.0029296875, -501.15234375, -0.9462890625);
+    TranslateModel(115, -8.001953125, -536.228515625, -0.9462890625);
+    TranslateModel(117, -12.9970703125, -586.15234375, -0.9462890625);
+    TranslateModel(119, 13.0029296875, -631.15234375, -0.9462890625);
+});
+
+Script N(80247488) = SCRIPT({
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) -= -700.0;
+    SI_VAR(1) /= 100.0;
+    SI_VAR(2) = (float) SI_VAR(1);
+    SI_VAR(2) *= 100.0;
+    if (SI_VAR(2) > 100) {
+        SI_VAR(1) = 1.0;
+    }
+    ScaleGroup(79, SI_VAR(1), 1, SI_VAR(1));
+    TranslateGroup(79, 0, SI_VAR(0), 0);
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) *= -12.0;
+    RotateGroup(79, SI_VAR(1), 0, 1, 0);
+});
+
+Script N(80247588) = SCRIPT({
+    TranslateModel(83, 9.5, 12.0, 15.0);
+    TranslateModel(85, -9.5, 12.0, 15.0);
+    TranslateModel(87, 0.0, 0.0, 17.0);
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) *= 90.0;
+    RotateModel(83, SI_VAR(1), 0, 0, -1);
+    RotateModel(85, SI_VAR(1), 0, 0, 1);
+    TranslateModel(83, -9.5, -12.0, -15.0);
+    TranslateModel(85, 9.5, -12.0, -15.0);
+    TranslateModel(87, 0.0, 0.0, -17.0);
+    ScaleModel(83, SI_VAR(0), SI_VAR(0), SI_VAR(0));
+    ScaleModel(85, SI_VAR(0), SI_VAR(0), SI_VAR(0));
+    ScaleModel(87, SI_VAR(0), SI_VAR(0), SI_VAR(0));
+});
+
+Script N(802476F4) = SCRIPT({
+    ScaleModel(81, SI_VAR(0), SI_VAR(0), SI_VAR(0));
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) *= 90.0;
+    SI_VAR(1) += -90.0;
+    RotateModel(81, SI_VAR(1), 1, 0, 0);
+});
+
+Script N(80247770) = SCRIPT({
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) *= -3.0;
+    TranslateModel(81, -0.259765625, SI_VAR(0), 1.4775390625);
+    RotateModel(81, SI_VAR(1), 0, 1, 0);
+    UpdateColliderTransform(46);
+});
+
+const char N(flo_19_name_hack)[];
+
+Script N(802477EC) = SCRIPT({
+    if (SI_AREA_FLAG(44) == 0) {
+        DisablePlayerInput(TRUE);
+        func_802D2B6C();
+        sleep 15;
+        DisablePartnerAI(0);
+        SI_AREA_FLAG(44) = 1;
+        ModifyColliderFlags(0, 47, 0x7FFFFE00);
+        ModifyColliderFlags(0, 48, 0x7FFFFE00);
+        SI_VAR(9) = (int) -59.0;
+        SI_VAR(10) = (int) 22.0;
+        SI_VAR(11) = (int) 125.0;
+        SI_VAR(12) = (int) -55.0;
+        SI_VAR(13) = (int) 24.0;
+        SI_VAR(14) = (int) 145.0;
+        PlayerMoveTo(SI_VAR(9), SI_VAR(11), 8);
+        SetNpcJumpscale(NPC_PARTNER, 0.0);
+        NpcJump0(NPC_PARTNER, SI_VAR(12), SI_VAR(13), SI_VAR(14), 5);
+        PlaySound(0x19C);
+        SetMusicTrack(0, SONG_MAGIC_BEANSTALK, 1, 8);
+        SetNpcAnimation(NPC_PARTNER, 0x106);
+        SetPlayerAnimation(ANIM_WALKING);
+        N(func_80240F10_C9EE30)(SI_VAR(3), SI_VAR(4));
+        match SI_VAR(4) {
+            < 90 {
+                SI_AREA_FLAG(16) = 0;
+                InterpPlayerYaw(90, 0);
+                InterpNpcYaw(NPC_PARTNER, 90, 0);
+            }
+            >= 270 {
+                SI_AREA_FLAG(16) = 1;
+                InterpPlayerYaw(270, 0);
+                InterpNpcYaw(NPC_PARTNER, 270, 0);
+            }
+        }
+        TranslateModel(81, -0.259765625, 2.0, 1.4775390625);
+        UpdateColliderTransform(46);
+        SI_MAP_VAR(10) = 0;
+        spawn {
+            SI_VAR(15) = 0;
+            loop {
+                SI_VAR(15) += 1;
+                N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), 0, 700, 800, 0, 0);
+                spawn N(80247770);
+                SI_VAR(2) = (float) SI_VAR(0);
+                SI_VAR(2) *= -3.0;
+                SI_VAR(3) = (float) SI_VAR(0);
+                N(func_80240F80_C9EEA0)();
+                N(func_802410B4_C9EFD4)();
+                if (SI_VAR(15) == 350) {
+                    SI_MAP_VAR(10) = 1;
+                }
+                sleep 1;
+            }
+        }
+    10:
+        if (SI_MAP_VAR(10) == 0) {
+            sleep 1;
+            goto 10;
+        }
+        GotoMap(N(flo_19_name_hack), 3);
+        sleep 100;
+    }
+});
+
+Script N(80247BCC) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    SetPlayerActionState(10);
+    ModifyColliderFlags(0, 47, 0x7FFFFE00);
+    ModifyColliderFlags(0, 48, 0x7FFFFE00);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    SI_VAR(9) = (int) -59.0;
+    SI_VAR(10) = (int) 22.0;
+    SI_VAR(11) = (int) 125.0;
+    SI_VAR(12) = (int) -55.0;
+    SI_VAR(13) = (int) 23.0;
+    SI_VAR(14) = (int) 145.0;
+    spawn {
+        sleep 5;
+        SetNpcAnimation(NPC_PARTNER, 0x106);
+        SetPlayerAnimation(ANIM_WALKING);
+        match SI_AREA_FLAG(16) {
+            == 0 {
+                InterpPlayerYaw(90, 0);
+                InterpNpcYaw(NPC_PARTNER, 90, 0);
+            }
+            == 1 {
+                InterpPlayerYaw(270, 0);
+                InterpNpcYaw(NPC_PARTNER, 270, 0);
+            }
+        }
+    }
+    TranslateModel(81, -0.259765625, 2.0, 1.4775390625);
+    UpdateColliderTransform(46);
+    SI_VAR(15) = 0;
+    loop 120 {
+        SI_VAR(15) += 1;
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), 70, 0, 120, 0, 0);
+        spawn N(80247770);
+        SI_VAR(2) = (float) SI_VAR(0);
+        SI_VAR(2) *= -3.0;
+        SI_VAR(3) = (float) SI_VAR(0);
+        N(func_80240F80_C9EEA0)();
+        N(func_802410B4_C9EFD4)();
+        sleep 1;
+    }
+    EnablePartnerAI();
+    ClearPartnerMoveHistory(-4);
+    SetPlayerJumpscale(1);
+    PlayerJump(10, 0, 110, 20);
+    SetPlayerActionState(10);
+    InterpPlayerYaw(90, 0);
+    sleep 5;
+    ModifyColliderFlags(1, 47, 0x7FFFFE00);
+    ModifyColliderFlags(1, 48, 0x7FFFFE00);
+    SI_AREA_FLAG(44) = 0;
+    StopSound(413);
+    await N(802414D0);
+    ResetCam(0, 1.0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80247FAC) = SCRIPT({
+    PlaySoundAtCollider(47, 411, 0);
+    SI_VAR(15) = 0;
+    loop 100 {
+        SI_VAR(15) += 1;
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), 0, 1.0, 100, 0, 0);
+        spawn N(80247588);
+        sleep 1;
+    }
+    SI_MAP_VAR(10) = 0;
+    spawn {
+        SI_VAR(15) = 0;
+        loop 1200 {
+            SI_VAR(15) += 1;
+            N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), -700, 0, 1200, 0, 0);
+            SI_VAR(2) = (float) SI_VAR(0);
+            SI_VAR(2) *= 1.0;
+            SI_VAR(0) = (float) SI_VAR(2);
+            spawn N(80246850);
+            SI_VAR(2) = (float) SI_VAR(0);
+            SI_VAR(2) *= 1.0;
+            SI_VAR(0) = (float) SI_VAR(2);
+            spawn N(80247488);
+            match SI_VAR(15) {
+                == 200 {
+                    SetPlayerAnimation(0x1002A);
+                }
+                == 250 {
+                    SI_VAR(0) = -60;
+                    SI_VAR(1) = 0;
+                    SI_VAR(2) = 65;
+                    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                    SetCamSpeed(0, 90.0);
+                    SetCamPitch(0, 12.5, -7.0);
+                    SetCamDistance(0, 800);
+                    SetCamPosA(0, -200, 0);
+                    SetCamPosB(0, 0, -300);
+                    PanToTarget(0, 0, 1);
+                    WaitForCam(0, 1.0);
+                }
+                else {
+                }
+            }
+            if (SI_VAR(15) > 550) {
+                SI_MAP_VAR(10) = 1;
+            }
+            sleep 1;
+        }
+    }
+10:
+    if (SI_MAP_VAR(10) == 0) {
+        sleep 1;
+        goto 10;
+    }
+    FadeInMusic(0, 50, 0, 3000, 0, 127);
+    FadeOutMusic(1, 3000);
+    GotoMap(N(flo_19_name_hack), 2);
+    sleep 100;
+});
+
+Script N(8024834C) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    InterpPlayerYaw(200, 0);
+    SetPlayerPos(-60, 0, 30);
+    NpcFacePlayer(NPC_PARTNER, 1);
+    SetNpcPos(NPC_PARTNER, -20, 0, 10);
+    SI_VAR(0) = -60;
+    SI_VAR(1) = 0;
+    SI_VAR(2) = 65;
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 90.0);
+    SetCamPitch(0, 12.5, -7.0);
+    SetCamDistance(0, 800);
+    SetCamPosA(0, -200, 0);
+    SetCamPosB(0, 0, -300);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SI_VAR(15) = 0;
+    loop 5 {
+        SI_VAR(15) += 20;
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), 0.0, 1.0, 100, 0, 0);
+        spawn N(802476F4);
+        sleep 1;
+    }
+    ModifyColliderFlags(1, 46, 0x7FFFFE00);
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x000A), 0, 50, -200);
+    ResetCam(0, 90.0);
+    DisablePlayerInput(FALSE);
+});
+
+s32 N(itemList_80248598)[] = {
+    ITEM_FERTILE_SOIL,
+    ITEM_MAGICAL_BEAN,
+    ITEM_MIRACLE_WATER,
+    ITEM_NONE,
+};
+
+Script N(802485A8) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    func_802D2884(-85, 85, 0);
+    func_802CF56C(2);
+    DisablePlayerInput(FALSE);
+    if (SI_SAVE_FLAG(1371) == 0) {
+        group 0;
+        func_802D5830(1);
+    10:
+        func_802D6420();
+        SI_VAR(2) = SI_VAR(0);
+        match SI_VAR(2) {
+            <= 0 {
+                func_802D6954();
+                func_802D5830(0);
+                AwaitPlayerLeave(-85, 85, 28);
+                return;
+            }
+            == 89 {
+                SetPlayerAnimation(0x60006);
+                sleep 5;
+                RemoveKeyItemAt(SI_VAR(1));
+                MakeItemEntity(ITEM_FERTILE_SOIL, -83, 0, 87, 1, 0);
+                SI_MAP_VAR(11) = SI_VAR(0);
+                SetPlayerAnimation(ANIM_STAND_STILL);
+                sleep 20;
+            }
+            else {
+                match SI_AREA_FLAG(17) {
+                    == 0 {
+                        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0008), 0, 10, -200);
+                        SI_AREA_FLAG(17) = 1;
+                    }
+                    else {
+                        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0009), 0, 10, -200);
+                    }
+                }
+            }
+        }
+        DisablePlayerInput(FALSE);
+        DisablePlayerPhysics(FALSE);
+        if (SI_VAR(2) != 89) {
+            goto 10;
+        }
+        SI_SAVE_FLAG(1371) = 1;
+    }
+    if (SI_SAVE_FLAG(1372) == 0) {
+        group 0;
+        func_802D5830(1);
+    20:
+        func_802D6420();
+        SI_VAR(2) = SI_VAR(0);
+        match SI_VAR(2) {
+            <= 0 {
+                func_802D6954();
+                func_802D5830(0);
+                AwaitPlayerLeave(-85, 85, 28);
+                return;
+            }
+            == 88 {
+                RemoveItemEntity(SI_MAP_VAR(11));
+                sleep 5;
+                SetPlayerAnimation(0x60006);
+                sleep 5;
+                RemoveKeyItemAt(SI_VAR(1));
+                MakeItemEntity(ITEM_MAGICAL_BEAN, -83, 0, 87, 1, 0);
+                SI_MAP_VAR(11) = SI_VAR(0);
+                SetPlayerAnimation(ANIM_STAND_STILL);
+                sleep 20;
+            }
+            else {
+                match SI_AREA_FLAG(17) {
+                    == 0 {
+                        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0008), 0, 10, -200);
+                        SI_AREA_FLAG(17) = 1;
+                    }
+                    else {
+                        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x0009), 0, 10, -200);
+                    }
+                }
+            }
+        }
+        DisablePlayerInput(FALSE);
+        DisablePlayerPhysics(FALSE);
+        if (SI_VAR(2) != 88) {
+            goto 20;
+        }
+        SI_SAVE_FLAG(1372) = 1;
+    }
+    group 0;
+    func_802D5830(1);
+30:
+    func_802D6420();
+    SI_VAR(2) = SI_VAR(0);
+    match SI_VAR(2) {
+        <= 0 {
+            func_802D6954();
+            func_802D5830(0);
+            AwaitPlayerLeave(-85, 85, 28);
+            return;
+        }
+        == 90 {
+            RemoveItemEntity(SI_MAP_VAR(11));
+            sleep 5;
+            SetPlayerAnimation(0x60006);
+            sleep 5;
+            RemoveKeyItemAt(SI_VAR(1));
+            N(SyncStatusMenu)();
+            MakeItemEntity(ITEM_MIRACLE_WATER, -83, 0, 87, 1, 0);
+            SI_MAP_VAR(11) = SI_VAR(0);
+            SetPlayerAnimation(ANIM_STAND_STILL);
+            sleep 30;
+            RemoveItemEntity(SI_MAP_VAR(11));
+            sleep 30;
+            ModifyColliderFlags(0, 47, 0x7FFFFE00);
+            PlayerMoveTo(-60, 30, 20);
+            ModifyColliderFlags(1, 47, 0x7FFFFE00);
+            ModifyColliderFlags(1, 48, 0x7FFFFE00);
+            InterpPlayerYaw(200, 0);
+            func_802CF56C(2);
+            sleep 60;
+            FadeInMusic(1, 123, 0, 3000, 0, 127);
+            FadeOutMusic(0, 3000);
+            UseSettingsFrom(0, -85, 0, 75);
+            SetPanTarget(0, -85, 0, 75);
+            SetCamSpeed(0, 1.0);
+            SetCamPitch(0, 17.0, -6.0);
+            SetCamDistance(0, 250);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            await N(80247FAC);
+        }
+    }
+    if (SI_VAR(2) != 90) {
+        goto 30;
+    }
+});
+
+Script N(80248D3C) = SCRIPT({
+0:
+    IsPlayerWithin(-85, 85, 20, SI_VAR(0));
+    if (SI_VAR(0) == 0) {
+        return;
+    } else {
+        IsPlayerOnValidFloor(SI_VAR(0));
+        if (SI_VAR(0) == 0) {
+            sleep 1;
+            goto 0;
+        }
+        GetCurrentPartner(SI_VAR(0));
+        if (SI_VAR(0) != 0) {
+            return;
+        }
+    }
+    N(func_8024139C_C9F2BC)();
+    await N(802485A8);
+    N(func_802413BC_C9F2DC)();
+});
+
+// *INDENT-OFF*
+Script N(80248E30) = {
+    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), 55),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(0), 54),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1371), 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1372), 0),
+                SI_CMD(ScriptOpcode_CALL, MakeItemEntity, 89, -83, 0, 87, 1, 0),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_CALL, MakeItemEntity, 88, -83, 0, 87, 1, 0),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SET, SI_MAP_VAR(11), SI_VAR(0)),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80248D3C), 0x10, 0, N(itemList_80248598), 0, 1),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80248F48) = SCRIPT({
+    bind N(802477EC) to TRIGGER_FLOOR_TOUCH 46;
+    EnableGroup(121, 1);
+    EnableGroup(80, 1);
+    match STORY_PROGRESS {
+        == STORY_CH6_WISTERWOOD_GAVE_HINT {
+            SI_VAR(0) = -700;
+            spawn N(80246850);
+            spawn N(80247488);
+            SI_VAR(0) = 0;
+            spawn N(80247588);
+            SI_VAR(0) = 0;
+            spawn N(802476F4);
+            ModifyColliderFlags(0, 46, 0x7FFFFE00);
+            ModifyColliderFlags(0, 47, 0x7FFFFE00);
+        }
+        >= STORY_CH6_GREW_MAGIC_BEANSTALK {
+            SI_VAR(0) = 1;
+            spawn N(80247588);
+            SI_VAR(0) = 1;
+            spawn N(802476F4);
+        }
+        else {
+            SI_VAR(0) = -700;
+            spawn N(80246850);
+            spawn N(80247488);
+            SI_VAR(0) = 0;
+            spawn N(80247588);
+            SI_VAR(0) = 0;
+            spawn N(802476F4);
+            ModifyColliderFlags(0, 46, 0x7FFFFE00);
+            ModifyColliderFlags(0, 47, 0x7FFFFE00);
+        }
+    }
+});
+
+static s32 N(pad_9128)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(makeEntities) = SCRIPT({
+    if (STORY_PROGRESS < STORY_EPILOGUE) {
+        MakeEntity(0x802E9A18, 110, 60, -100, 0, MAKE_ENTITY_END);
+    }
+});
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240040_C9DF60);
-/*
 ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
@@ -36,7 +2124,6 @@ ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, NpcAISettings* aiSetti
     script->functionTemp[0].s = 1;
     return ApiStatus_DONE1;
 }
-*/
 
 #include "world/common/UnkFunc13.inc.c"
 
@@ -44,8 +2131,6 @@ ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkFunc14.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802406BC_C9E5DC);
-/*
 ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -63,7 +2148,6 @@ ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, NpcAISettings* aiSetti
     script->functionTemp[0].s = 1;
     return ApiStatus_DONE1;
 }
-*/
 
 #include "world/common/NpcJumpFunc2.inc.c"
 
@@ -77,8 +2161,6 @@ ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, NpcAISettings* aiSetti
 
 #include "world/common/UnkFunc16.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240BD4_C9EAF4);
-/*
 ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -94,7 +2176,7 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +2196,7 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -131,12 +2213,12 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
         case 0:
             N(func_80240040_C9DF60)(script, npcAISettings, territoryPtr);
         case 1:
-            N(func_80240198_C9E0B8)(script, npcAISettings, territoryPtr);
+            N(UnkFunc13)(script, npcAISettings, territoryPtr);
             break;
         case 2:
             N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
         case 3:
-            N(func_80240500_C9E420)(script, npcAISettings, territoryPtr);
+            N(UnkFunc14)(script, npcAISettings, territoryPtr);
             break;
         case 4:
             N(func_802406BC_C9E5DC)(script, npcAISettings, territoryPtr);
@@ -149,22 +2231,21 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) {
         case 12:
             N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr);
         case 13:
-            N(func_8024098C_C9E8AC)(script, npcAISettings, territoryPtr);
+            N(UnkFunc15)(script, npcAISettings, territoryPtr);
             break;
         case 14:
             N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr);
             break;
         case 15:
-            N(func_80240B14_C9EA34)(script, npcAISettings, territoryPtr);
+            N(UnkFunc16)(script, npcAISettings, territoryPtr);
             break;
         case 99:
             func_8004A73C(script);
     }
     return ApiStatus_BLOCK;
 }
-*/
 
-ApiStatus PostChapter6StatUpdate(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus N(PostChapter6StatUpdate)(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
 
     set_max_SP(6);
@@ -173,3 +2254,8 @@ ApiStatus PostChapter6StatUpdate(ScriptInstance* script, s32 isInitialCall) {
     sync_status_menu();
     return ApiStatus_DONE2;
 }
+
+const char N(flo_07_name_hack)[] = "flo_07";
+const s32 N(pad_XXX)[] = { 0, 0 };
+const char N(sam_11_name_hack)[] = "sam_11";
+const char N(flo_19_name_hack)[] = "flo_19";
diff --git a/src/world/area_flo/flo_00/C9EE30.c b/src/world/area_flo/flo_00/C9EE30.c
index 71da8f5262..cde0f32829 100644
--- a/src/world/area_flo/flo_00/C9EE30.c
+++ b/src/world/area_flo/flo_00/C9EE30.c
@@ -1,15 +1,55 @@
 #include "flo_00.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_80240F10_C9EE30);
+ApiStatus N(func_80240F10_C9EE30)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = *args++;
+    s32 var2 = *args++;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_80240F80_C9EEA0);
+    set_variable(script, var1, gPlayerStatus.spriteFacingAngle);
+    set_variable(script, var2, gPlayerStatus.targetYaw);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802410B4_C9EFD4);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240F80_C9EEA0)(ScriptInstance *script, s32 isInitialCall) {
+    f32 var1 = get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(-83.0f, 87.0f, script->varTable[9], script->varTable[11]);
+    f32 clamped = clamp_angle(atan2(-83.0f, 87.0f, script->varTable[9], script->varTable[11]) - var1);
+
+    var1 = sin_deg(clamped);
+    gPlayerStatus.position.x = (dist * var1) + -83.0f;
+    gPlayerStatus.position.y = get_variable(NULL, script->varTable[10]) + get_variable(NULL, script->varTable[3]);
+    var1 = cos_deg(clamped);
+    gPlayerStatus.position.z = 87.0f - (dist * var1);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_802410B4_C9EFD4)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_by_index(0);
+    f32 temp_f20 = get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(-83.0f, 87.0f, script->varTable[12], script->varTable[14]);
+    f32 clamped = clamp_angle(atan2(-83.0f, 87.0f, script->varTable[12], script->varTable[14]) - temp_f20);
+
+    temp_f20 = sin_deg(clamped);
+    npc->pos.x = (dist * temp_f20) + -83.0f;
+    npc->pos.y = get_variable(NULL, script->varTable[13]) + get_variable(NULL, script->varTable[3]);
+    temp_f20 = cos_deg(clamped);
+    npc->pos.z = 87.0f - (dist * temp_f20);
+
+    return ApiStatus_DONE2;
+}
 
 #include "common/UnkFloatFunc.inc.c"
 
 #include "world/common/SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_8024139C_C9F2BC);
+ApiStatus N(func_8024139C_C9F2BC)(ScriptInstance *script, s32 isInitialCall) {
+    increment_status_menu_disabled();
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802413BC_C9F2DC);
+ApiStatus N(func_802413BC_C9F2DC)(ScriptInstance *script, s32 isInitialCall) {
+    decrement_status_menu_disabled();
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_00/flo_00.h b/src/world/area_flo/flo_00/flo_00.h
index cd2b29425d..e9d902839e 100644
--- a/src/world/area_flo/flo_00/flo_00.h
+++ b/src/world/area_flo/flo_00/flo_00.h
@@ -2,3 +2,29 @@
 #include "map.h"
 
 #define NAMESPACE flo_00
+
+ApiStatus N(SyncStatusMenu)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(PostChapter6StatUpdate)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFloatFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_C9DF20)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240ED0_C9EDF0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240F10_C9EE30)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240F80_C9EEA0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802410B4_C9EFD4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802411EC_C9F10C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024137C_C9F29C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024139C_C9F2BC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802413BC_C9F2DC)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80245DE4);
+extern NpcGroupList N(npcGroupList_80246834);
+extern Script N(80242998);
+extern Script N(80242FCC);
+extern Script N(80245EB8);
+extern Script N(80247BCC);
+extern Script N(8024834C);
+extern Script N(80248E30);
+extern Script N(80248F48);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_flo/flo_03/CA72A0.c b/src/world/area_flo/flo_03/CA72A0.c
index 3af4522b7e..5a4eaf66d0 100644
--- a/src/world/area_flo/flo_03/CA72A0.c
+++ b/src/world/area_flo/flo_03/CA72A0.c
@@ -1,3 +1,8 @@
 #include "flo_03.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72A0", func_80240000_CA72A0);
+void func_80072950();
+
+ApiStatus N(func_80240000_CA72A0)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c
index 70266cbd51..a8a2128ddc 100644
--- a/src/world/area_flo/flo_03/CA72E0.c
+++ b/src/world/area_flo/flo_03/CA72E0.c
@@ -1,32 +1,1219 @@
 #include "flo_03.h"
+#include "message_ids.h"
+#include "sprite/npc/dayzee.h"
+#include "sprite/npc/monty_mole.h"
+#include "sprite/npc/petunia.h"
+
+enum {
+    NPC_PETUNIA,
+    NPC_DAYZEE,
+    NPC_MONTY_MOLE0,
+    NPC_MONTY_MOLE1,
+    NPC_MONTY_MOLE2,
+    NPC_MONTY_MOLE3,
+};
+
+EntryList N(entryList) = {
+    { -325.0f, 0.0f, 0.0f,  90.0f },
+    {  325.0f, 0.0f, 0.0f, 270.0f },
+    { -325.0f, 0.0f, 0.0f,  90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_03_tattle },
+};
+
+Script N(802406A0) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 2) {
+        SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
+    } else {
+        match STORY_PROGRESS {
+            <= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+                if (SI_SAVE_FLAG(1411) == 0) {
+                    SetMusicTrack(0, SONG_MONTY_MOLE_ASSAULT, 0, 8);
+                } else {
+                    SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+                }
+            }
+            < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+            }
+            else {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+            }
+        }
+    }
+});
+
+Script N(802407C0) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+        if (SI_SAVE_FLAG(1411) == 1) {
+            func_802D5FF8(137, 0);
+        }
+    }
+});
+
+Script N(80240814) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+        if (SI_SAVE_FLAG(1411) == 1) {
+            FadeOutMusic(0, 250);
+            sleep 10;
+            func_802D5FD8();
+        }
+    }
+});
+
+Script N(80240880) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_80240B2C) = EXIT_WALK_SCRIPT(60,  0, "flo_09",  1);
+
+Script N(exitWalk_80240B88) = EXIT_WALK_SCRIPT(60,  1, "flo_22",  0);
+
+Script N(80240BE4) = SCRIPT({
+    bind N(exitWalk_80240B2C) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_80240B88) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    SI_AREA_FLAG(27) = 0;
+    SI_AREA_FLAG(28) = 0;
+    SI_AREA_VAR(1) = 0;
+    MakeNpcs(0, N(npcGroupList_8024442C));
+    await N(makeEntities);
+    await N(80241EF4);
+    spawn N(80244E54);
+    spawn N(80244ED0);
+    ModifyColliderFlags(3, 9, 0x00000006);
+    SI_VAR(0) = -145;
+    SI_VAR(1) = -335;
+    SI_VAR(2) = 182;
+    SI_VAR(3) = -180;
+    SI_VAR(4) = 0;
+    spawn N(80240880);
+    SI_VAR(0) = 200;
+    SI_VAR(1) = -170;
+    SI_VAR(2) = 310;
+    SI_VAR(3) = 150;
+    SI_VAR(4) = 0;
+    spawn N(80240880);
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 2) {
+        spawn N(80240FFC);
+    } else {
+        ModifyColliderFlags(0, 1, 0x7FFFFE00);
+        SI_VAR(0) = N(80240BE4);
+        spawn EnterWalk;
+    }
+    await N(802406A0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CA72A0)();
+    }
+});
+
+static s32 N(pad_EA4)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+NpcSettings N(npcSettings_80240EB0) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80240EDC) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
+
+s32** N(D_80240F08_CA81A8) = NULL;
+
+Script N(80240F0C) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 0);
+    return;
+});
+
+Script N(80240F3C) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 16);
+    return;
+});
+
+s32 N(intTable_80240F6C)[] = {
+    0xFFFFFF9C, 0x00000000, 0x000000D2, 0xFFFFFF60, 0x00000000, 0x0000011D, 0xFFFFFFDD, 0x00000000,
+    0x00000131,
+};
+
+s32 N(intTable_80240F90)[] = {
+    0xFFFFFF42, 0x00000000, 0x00000050, 0xFFFFFF7E, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000000,
+    0xFFFFFFC4,
+};
+
+s32 N(intTable_80240FB4)[] = {
+    0x0000004B, 0x00000000, 0xFFFFFFF1, 0x00000023, 0x00000000, 0xFFFFFF9C, 0x00000082, 0x00000000,
+    0x00000000,
+};
+
+s32 N(intTable_80240FD8)[] = {
+    0x00000073, 0x00000000, 0x000000B4, 0x00000055, 0x00000000, 0x00000122, 0x00000091, 0x00000000,
+    0x0000008C,
+};
+
+Script N(80240FFC) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    SetNpcYaw(NPC_PETUNIA, 90);
+    GetNpcPos(NPC_PETUNIA, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 300);
+    SetCamPitch(0, 17.0, -9.5);
+    SetCamPosA(0, -27, 0);
+    SetCamPosB(0, 0, -50);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 20;
+    SpeakToPlayer(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00C8));
+    SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_3));
+    sleep 10;
+    GotoMap("flo_18", 1);
+    sleep 100;
+});
+
+Script N(npcAI_8024119C) = SCRIPT({
+    N(func_80240158_CA73F8)();
+});
+
+Script N(defeat_802411B8) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            SI_SAVE_FLAG(1366) = 1;
+            DoNpcDefeat();
+        }
+        == 1 {}
+        == 2 {
+        }
+    }
+});
+
+Script N(8024122C) = SCRIPT({
+    GetPlayerPos(SI_VAR(3), SI_VAR(1), SI_VAR(2));
+    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += SI_VAR(3);
+    SI_VAR(0) /= 2;
+    SetCamProperties(0, SI_VAR(4), SI_VAR(0), SI_VAR(1), SI_VAR(2), 300, 20.0, -9.5);
+});
+
+Script N(interact_802412BC) = SCRIPT({
+    await N(802407C0);
+    match STORY_PROGRESS {
+        < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            SI_MAP_VAR(14) = 1;
+            SI_VAR(4) = (int) 3.5;
+            await N(8024122C);
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0050));
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_6));
+            SetPlayerAnimation(ANIM_NOD_YES);
+            sleep 20;
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0051));
+            SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_12));
+            SetNpcYaw(NPC_MONTY_MOLE0, 270);
+            GetNpcPos(NPC_MONTY_MOLE0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamSpeed(0, 90.0);
+            SetCamPitch(0, 17.0, -8.0);
+            SetCamDistance(0, 200);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            sleep 20;
+            PlaySoundAtNpc(NPC_MONTY_MOLE0, SOUND_MOLE_SURFACE, 0);
+            SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_16));
+            sleep 10;
+            PlaySoundAtNpc(NPC_MONTY_MOLE0, 0x263, 0);
+            ShowEmote(2, EMOTE_QUESTION, -45, 30, 1, 0, 0, 0, 0);
+            GetNpcPos(NPC_MONTY_MOLE1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0052));
+            SetNpcYaw(NPC_MONTY_MOLE1, 90);
+            SetNpcPos(NPC_MONTY_MOLE1, 0, -1000, 0);
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 200);
+            SetCamPitch(0, 17.0, -8.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_0));
+            sleep 20;
+            PlaySoundAtNpc(NPC_MONTY_MOLE1, SOUND_MOLE_SURFACE, 0);
+            SetNpcPos(NPC_MONTY_MOLE1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+            sleep 20;
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0053));
+            SetNpcYaw(NPC_MONTY_MOLE2, 270);
+            GetNpcPos(NPC_MONTY_MOLE2, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 200);
+            SetCamPitch(0, 17.0, -8.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            sleep 20;
+            SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_14));
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0054));
+            SetNpcYaw(NPC_MONTY_MOLE3, 270);
+            GetNpcPos(NPC_MONTY_MOLE3, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 200);
+            SetCamPitch(0, 17.0, -9.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_6));
+            sleep 20;
+            SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_7));
+            sleep 20;
+            SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_8));
+            sleep 20;
+            SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_16));
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0055));
+            SetNpcPos(NPC_DAYZEE, -233, 0, -217);
+            GetNpcPos(NPC_DAYZEE, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 300);
+            SetCamPitch(0, 17.0, -9.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            SetNpcAnimation(NPC_DAYZEE, NPC_ANIM(dayzee, Palette_00, Anim_D));
+            PlaySoundAtNpc(NPC_DAYZEE, SOUND_UNKNOWN_262, 0);
+            ShowEmote(1, EMOTE_EXCLAMATION, 45, 30, 1, 0, 0, 0, 0);
+            sleep 15;
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0056));
+            SI_VAR(4) = (int) 90.0;
+            await N(8024122C);
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0057));
+            SetEnemyFlagBits(1, 1, 0);
+            SetEnemyFlagBits(2, 1, 0);
+            SetEnemyFlagBits(3, 1, 0);
+            SetEnemyFlagBits(4, 1, 0);
+            SetEnemyFlagBits(5, 1, 0);
+            BindNpcAI(NPC_DAYZEE, N(npcAI_8024119C));
+            SI_MAP_VAR(14) = 0;
+            SI_MAP_VAR(15) = 60;
+            STORY_PROGRESS = STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES;
+        }
+        == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            if (SI_SAVE_FLAG(1411) == 0) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0058));
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_6));
+            } else {
+                SI_VAR(4) = (int) 3.5;
+                await N(8024122C);
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_8), NPC_ANIM(petunia, Palette_00, Anim_3), 0, MESSAGE_ID(0x11, 0x0059));
+                EndSpeech(-1, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0);
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_4));
+                sleep 20;
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_1));
+                SI_VAR(0) = 88;
+                SI_VAR(1) = 1;
+                await N(80240F0C);
+                AddKeyItem(ITEM_MAGICAL_BEAN);
+                sleep 20;
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x005A));
+                EndSpeech(-1, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0);
+                STORY_PROGRESS = STORY_CH6_GOT_MAGICAL_BEAN;
+            }
+        }
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x005B));
+        }
+        < STORY_CH6_RETURNED_TO_TOAD_TOWN {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x005C));
+        }
+        else {
+            if (SI_AREA_VAR(1) == 0) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x005D));
+                SI_AREA_VAR(1) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x005E));
+            }
+        }
+    }
+    ResetCam(0, 8.0);
+    await N(80240814);
+});
+
+Script N(init_80241DA4) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_802412BC));
+    if (SI_SAVE_FLAG(1411) == 0) {
+        SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_6));
+    } else {
+        SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_1));
+    }
+});
+
+Script N(init_80241E10) = SCRIPT({
+    BindNpcDefeat(NPC_SELF, N(defeat_802411B8));
+    EnableNpcShadow(NPC_DAYZEE, FALSE);
+    match STORY_PROGRESS {
+        < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            SetNpcPos(NPC_DAYZEE, 0, -1000, 0);
+        }
+        else {
+            if (SI_SAVE_FLAG(1366) == 0) {
+                SetEnemyFlagBits(1, 1, 0);
+                BindNpcIdle(NPC_SELF, N(npcAI_8024119C));
+            } else {
+                SetNpcPos(NPC_DAYZEE, 0, -1000, 0);
+            }
+        }
+    }
+});
+
+Script N(80241EF4) = SCRIPT({
+    SI_MAP_VAR(14) = 0;
+    SI_MAP_VAR(10) = 0;
+    SI_MAP_VAR(11) = 0;
+    SI_MAP_VAR(12) = 0;
+    SI_MAP_VAR(13) = 0;
+    SI_MAP_VAR(15) = 100;
+});
+
+Script N(defeat_80241F64) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            GetSelfNpcID(SI_VAR(0));
+            match SI_VAR(0) {
+                == 2 {
+                    SI_SAVE_FLAG(1367) = 1;
+                }
+                == 3 {
+                    SI_SAVE_FLAG(1368) = 1;
+                }
+                == 4 {
+                    SI_SAVE_FLAG(1369) = 1;
+                }
+                == 5 {
+                    SI_SAVE_FLAG(1370) = 1;
+                }
+            }
+            SI_VAR(0) = 0;
+            SI_VAR(0) += SI_SAVE_FLAG(1367);
+            SI_VAR(0) += SI_SAVE_FLAG(1368);
+            SI_VAR(0) += SI_SAVE_FLAG(1369);
+            SI_VAR(0) += SI_SAVE_FLAG(1370);
+            if (SI_VAR(0) != 4) {
+                SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_6));
+            } else {
+                SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_1));
+                SI_SAVE_FLAG(1411) = 1;
+                await N(802406A0);
+            }
+            DoNpcDefeat();
+        }
+        == 1 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(monty_mole, Palette_01, Anim_1));
+        }
+        == 2 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(monty_mole, Palette_01, Anim_1));
+        }
+    }
+});
+
+Script N(hit_80242138) = SCRIPT({
+    if (STORY_PROGRESS == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) {
+        GetOwnerEncounterTrigger(SI_VAR(0));
+        if (SI_VAR(0) != 1) {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(monty_mole, Palette_01, Anim_5));
+        }
+    }
+});
+
+// *INDENT-OFF*
+Script N(idle_8024219C) = {
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(10), 0),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(23), 1),
+                SI_CMD(ScriptOpcode_GOTO, 0),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 1),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_LABEL, 0),
+            SI_CMD(ScriptOpcode_CALL, GetNpcPos, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, IsPlayerWithin, SI_VAR(0), SI_VAR(2), SI_MAP_VAR(15), SI_VAR(3)),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_CALL, GetCurrentPartner, SI_VAR(9)),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(9), 9),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(14), 1),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(3), 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(23), 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 2, 32840, 1),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 2, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(23), 1),
+                SI_CMD(ScriptOpcode_IF_NE, SI_MAP_VAR(10), 0),
+                    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), 44),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 4),
+                    SI_CMD(ScriptOpcode_ELSE),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 10),
+                    SI_CMD(ScriptOpcode_END_IF),
+                    SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 2, 610, 0),
+                    SI_CMD(ScriptOpcode_CALL, ShowEmote, 2, 0, 0, SI_VAR(1), 1, 0, 0, 0, 0),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(1)),
+                    SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 1),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 2, 802, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 2, 3080465),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1367), 0),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 2, 0, -50, 0),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 45),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(23), 1),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1367), 0),
+                    SI_CMD(ScriptOpcode_CALL, RandInt, 2, SI_VAR(0)),
+                    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+                    SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_80240F6C)),
+                    SI_CMD(ScriptOpcode_LOOP, SI_VAR(0)),
+                        SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                    SI_CMD(ScriptOpcode_END_LOOP),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 2, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 2, 32840, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(23), 0),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 2, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 2, 801, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 2, 3080464),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+                SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 0),
+                SI_CMD(ScriptOpcode_CALL, RandInt, 30, SI_VAR(0)),
+                SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 60),
+                SI_CMD(ScriptOpcode_SET, SI_MAP_VAR(10), SI_VAR(0)),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_IF_GT, SI_MAP_VAR(10), 0),
+                    SI_CMD(ScriptOpcode_SUB, SI_MAP_VAR(10), 1),
+                SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script N(idle_80242618) = {
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(11), 0),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(24), 1),
+                SI_CMD(ScriptOpcode_GOTO, 0),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 1),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_LABEL, 0),
+            SI_CMD(ScriptOpcode_CALL, GetNpcPos, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, IsPlayerWithin, SI_VAR(0), SI_VAR(2), SI_MAP_VAR(15), SI_VAR(3)),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_CALL, GetCurrentPartner, SI_VAR(9)),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(9), 9),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(14), 1),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(3), 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(24), 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 3, 32840, 1),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 3, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(24), 1),
+                SI_CMD(ScriptOpcode_IF_NE, SI_MAP_VAR(11), 0),
+                    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), 44),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 4),
+                    SI_CMD(ScriptOpcode_ELSE),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 10),
+                    SI_CMD(ScriptOpcode_END_IF),
+                    SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 3, 610, 0),
+                    SI_CMD(ScriptOpcode_CALL, ShowEmote, 3, 0, 0, SI_VAR(1), 1, 0, 0, 0, 0),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(1)),
+                    SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 1),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 3, 802, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 3, 3080465),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1368), 0),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 3, 0, -50, 0),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 45),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(24), 1),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1368), 0),
+                    SI_CMD(ScriptOpcode_CALL, RandInt, 2, SI_VAR(0)),
+                    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+                    SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_80240F90)),
+                    SI_CMD(ScriptOpcode_LOOP, SI_VAR(0)),
+                        SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                    SI_CMD(ScriptOpcode_END_LOOP),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 3, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 3, 32840, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(24), 0),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 3, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 3, 801, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 3, 3080464),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+                SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 0),
+                SI_CMD(ScriptOpcode_CALL, RandInt, 35, SI_VAR(0)),
+                SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 55),
+                SI_CMD(ScriptOpcode_SET, SI_MAP_VAR(11), SI_VAR(0)),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_IF_GT, SI_MAP_VAR(11), 0),
+                    SI_CMD(ScriptOpcode_SUB, SI_MAP_VAR(11), 1),
+                SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script N(idle_80242A94) = {
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(12), 0),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(25), 1),
+                SI_CMD(ScriptOpcode_GOTO, 0),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 1),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_LABEL, 0),
+            SI_CMD(ScriptOpcode_CALL, GetNpcPos, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, IsPlayerWithin, SI_VAR(0), SI_VAR(2), SI_MAP_VAR(15), SI_VAR(3)),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_CALL, GetCurrentPartner, SI_VAR(9)),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(9), 9),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(14), 1),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(3), 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(25), 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 4, 32840, 1),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 4, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(25), 1),
+                SI_CMD(ScriptOpcode_IF_NE, SI_MAP_VAR(12), 0),
+                    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), 44),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 4),
+                    SI_CMD(ScriptOpcode_ELSE),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 10),
+                    SI_CMD(ScriptOpcode_END_IF),
+                    SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 4, 610, 0),
+                    SI_CMD(ScriptOpcode_CALL, ShowEmote, 4, 0, 0, SI_VAR(1), 1, 0, 0, 0, 0),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(1)),
+                    SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 1),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 4, 802, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, 3080465),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1369), 0),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 4, 0, -50, 0),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 45),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(25), 1),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1369), 0),
+                    SI_CMD(ScriptOpcode_CALL, RandInt, 2, SI_VAR(0)),
+                    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+                    SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_80240FB4)),
+                    SI_CMD(ScriptOpcode_LOOP, SI_VAR(0)),
+                        SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                    SI_CMD(ScriptOpcode_END_LOOP),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 4, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 4, 32840, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(25), 0),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 4, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 4, 801, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 4, 3080464),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+                SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 0),
+                SI_CMD(ScriptOpcode_CALL, RandInt, 40, SI_VAR(0)),
+                SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 50),
+                SI_CMD(ScriptOpcode_SET, SI_MAP_VAR(12), SI_VAR(0)),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_IF_GT, SI_MAP_VAR(12), 0),
+                    SI_CMD(ScriptOpcode_SUB, SI_MAP_VAR(12), 1),
+                SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script N(idle_80242F10) = {
+    SI_CMD(ScriptOpcode_LOOP, 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(13), 0),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(26), 1),
+                SI_CMD(ScriptOpcode_GOTO, 0),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 1),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_LABEL, 0),
+            SI_CMD(ScriptOpcode_CALL, GetNpcPos, 5, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_CALL, IsPlayerWithin, SI_VAR(0), SI_VAR(2), SI_MAP_VAR(15), SI_VAR(3)),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_CALL, GetCurrentPartner, SI_VAR(9)),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(9), 9),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_VAR(14), 1),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(3), 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(3), 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(26), 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 5, 32840, 1),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 5, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(26), 1),
+                SI_CMD(ScriptOpcode_IF_NE, SI_MAP_VAR(13), 0),
+                    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), 44),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 4),
+                    SI_CMD(ScriptOpcode_ELSE),
+                        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 10),
+                    SI_CMD(ScriptOpcode_END_IF),
+                    SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 5, 610, 0),
+                    SI_CMD(ScriptOpcode_CALL, ShowEmote, 5, 0, 0, SI_VAR(1), 1, 0, 0, 0, 0),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(1)),
+                    SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 1),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 5, 802, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 5, 3080465),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1370), 0),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 5, 0, -50, 0),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 45),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_ELSE),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(26), 1),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1370), 0),
+                    SI_CMD(ScriptOpcode_CALL, RandInt, 2, SI_VAR(0)),
+                    SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+                    SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_80240FD8)),
+                    SI_CMD(ScriptOpcode_LOOP, SI_VAR(0)),
+                        SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                    SI_CMD(ScriptOpcode_END_LOOP),
+                    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 5, SI_VAR(1), SI_VAR(2), SI_VAR(3)),
+                SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_CALL, SetNpcFlagBits, 5, 32840, 1),
+                SI_CMD(ScriptOpcode_SET, SI_AREA_FLAG(26), 0),
+                SI_CMD(ScriptOpcode_CALL, NpcFacePlayer, 5, 1),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 5, 801, 0),
+                SI_CMD(ScriptOpcode_CALL, SetNpcAnimation, 5, 3080464),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+                SI_CMD(ScriptOpcode_CALL, SetSelfEnemyFlagBits, 386924544, 0),
+                SI_CMD(ScriptOpcode_CALL, RandInt, 45, SI_VAR(0)),
+                SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 45),
+                SI_CMD(ScriptOpcode_SET, SI_MAP_VAR(13), SI_VAR(0)),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_IF_GT, SI_MAP_VAR(13), 0),
+                    SI_CMD(ScriptOpcode_SUB, SI_MAP_VAR(13), 1),
+                SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(init_8024338C) = SCRIPT({
+    BindNpcHit(-1, N(hit_80242138));
+    BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
+    EnableNpcShadow(NPC_MONTY_MOLE0, FALSE);
+    match STORY_PROGRESS {
+        < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            BindNpcIdle(NPC_SELF, N(idle_8024219C));
+            SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+        }
+        == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            if (SI_SAVE_FLAG(1367) == 0) {
+                BindNpcIdle(NPC_SELF, N(idle_8024219C));
+                SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+                SetEnemyFlagBits(2, 1, 0);
+            } else {
+                SetNpcPos(NPC_MONTY_MOLE0, 0, -1000, 0);
+            }
+        }
+        else {
+            SetNpcPos(NPC_MONTY_MOLE0, 0, -1000, 0);
+        }
+    }
+});
+
+Script N(init_802434CC) = SCRIPT({
+    BindNpcHit(-1, N(hit_80242138));
+    BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
+    EnableNpcShadow(NPC_MONTY_MOLE1, FALSE);
+    match STORY_PROGRESS {
+        < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            BindNpcIdle(NPC_SELF, N(idle_80242618));
+            SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+        }
+        == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            if (SI_SAVE_FLAG(1368) == 0) {
+                BindNpcIdle(NPC_SELF, N(idle_80242618));
+                SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+                SetEnemyFlagBits(3, 1, 0);
+            } else {
+                SetNpcPos(NPC_MONTY_MOLE1, 0, -1000, 0);
+            }
+        }
+        else {
+            SetNpcPos(NPC_MONTY_MOLE1, 0, -1000, 0);
+        }
+    }
+});
+
+Script N(init_8024360C) = SCRIPT({
+    BindNpcHit(-1, N(hit_80242138));
+    BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
+    EnableNpcShadow(NPC_MONTY_MOLE2, FALSE);
+    match STORY_PROGRESS {
+        < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            BindNpcIdle(NPC_SELF, N(idle_80242A94));
+            SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+        }
+        == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            if (SI_SAVE_FLAG(1369) == 0) {
+                BindNpcIdle(NPC_SELF, N(idle_80242A94));
+                SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+                SetEnemyFlagBits(4, 1, 0);
+            } else {
+                SetNpcPos(NPC_MONTY_MOLE2, 0, -1000, 0);
+            }
+        }
+        else {
+            SetNpcPos(NPC_MONTY_MOLE2, 0, -1000, 0);
+        }
+    }
+});
+
+Script N(init_8024374C) = SCRIPT({
+    BindNpcHit(-1, N(hit_80242138));
+    BindNpcDefeat(NPC_SELF, N(defeat_80241F64));
+    EnableNpcShadow(NPC_MONTY_MOLE3, FALSE);
+    match STORY_PROGRESS {
+        < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            BindNpcIdle(NPC_SELF, N(idle_80242F10));
+            SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+        }
+        == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES {
+            if (SI_SAVE_FLAG(1370) == 0) {
+                BindNpcIdle(NPC_SELF, N(idle_80242F10));
+                SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_10));
+                SetEnemyFlagBits(5, 1, 0);
+            } else {
+                SetNpcPos(NPC_MONTY_MOLE3, 0, -1000, 0);
+            }
+        }
+        else {
+            SetNpcPos(NPC_MONTY_MOLE3, 0, -1000, 0);
+        }
+    }
+});
+
+StaticNpc N(npcGroup_8024388C) = {
+    .id = NPC_PETUNIA,
+    .settings = &N(npcSettings_80240EDC),
+    .pos = { -30.0f, 0.0f, 100.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80241DA4),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+        NPC_ANIM(petunia, Palette_00, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00DD),
+};
+
+StaticNpc N(npcGroup_80243A7C) = {
+    .id = NPC_DAYZEE,
+    .settings = &N(npcSettings_80240EB0),
+    .pos = { -233.0f, 0.0f, -217.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80241E10),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+};
+
+StaticNpc N(npcGroup_80243C6C) = {
+    .id = NPC_MONTY_MOLE0,
+    .settings = &N(npcSettings_80240EB0),
+    .pos = { -100.0f, 0.0f, 210.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_8024338C),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_2),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+    },
+};
+
+StaticNpc N(npcGroup_80243E5C) = {
+    .id = NPC_MONTY_MOLE1,
+    .settings = &N(npcSettings_80240EB0),
+    .pos = { -130.0f, 0.0f, 0.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_802434CC),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_2),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+    },
+};
+
+StaticNpc N(npcGroup_8024404C) = {
+    .id = NPC_MONTY_MOLE2,
+    .settings = &N(npcSettings_80240EB0),
+    .pos = { 75.0f, 0.0f, 20.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_8024360C),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_2),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+    },
+};
+
+StaticNpc N(npcGroup_8024423C) = {
+    .id = NPC_MONTY_MOLE3,
+    .settings = &N(npcSettings_80240EB0),
+    .pos = { 71.0f, 0.0f, 200.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_8024374C),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_2),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_3),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_1),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_5),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+        NPC_ANIM(monty_mole, Palette_01, Anim_0),
+    },
+};
+
+NpcGroupList N(npcGroupList_8024442C) = {
+    NPC_GROUP(N(npcGroup_8024388C), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80243A7C), BATTLE_ID(24, 15, 0, 2)),
+    NPC_GROUP(N(npcGroup_80243C6C), BATTLE_ID(25, 2, 0, 2)),
+    NPC_GROUP(N(npcGroup_80243E5C), BATTLE_ID(25, 1, 0, 2)),
+    NPC_GROUP(N(npcGroup_8024404C), BATTLE_ID(25, 3, 0, 2)),
+    NPC_GROUP(N(npcGroup_8024423C), BATTLE_ID(25, 4, 0, 2)),
+    {},
+};
 
-INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240040_CA72E0);
-/*
 ApiStatus N(func_80240040_CA72E0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240F08_CA81A8) == NULL) {
+        N(D_80240F08_CA81A8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240F08_CA81A8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240F08_CA81A8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240F08_CA81A8));
+        N(D_80240F08_CA81A8) = NULL;
     }
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/GetItemName.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240158_CA73F8);
+ApiStatus N(func_80240158_CA73F8)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc *npc = get_npc_unsafe(enemy->npcID);
+
+    f32 clamp = clamp_angle(atan2(-210.0f, -183.0f, gPlayerStatus.position.x, gPlayerStatus.position.z) + 180.0f);
+    f32 sp10 = -210.0f;
+    f32 sp14 = -183.0f;
+
+    f32 temp_f20;
+    f32 temp_f4_2;
+    f64 temp_f4;
+    f32 phi_f2;
+
+    add_vec2D_polar(&sp10, &sp14, 46.0f, clamp);
+    temp_f4 = dist2D(npc->pos.x, npc->pos.z, sp10, sp14);
+    if (temp_f4 > 2.0) {
+        temp_f20 = clamp_angle(atan2(-210.0f, -183.0f, npc->pos.x, npc->pos.z));
+        temp_f4_2 = temp_f20 - clamp_angle(atan2(-210.0f, -183.0f, sp10, sp14));
+        if (abs(temp_f4_2) >= 0x15) {
+            phi_f2 = temp_f4_2;
+            if (temp_f4_2 >= 180.0f) {
+                phi_f2 = temp_f4_2 - 360.0f;
+            }
+            if (phi_f2 <= -180.0f) {
+                phi_f2 += 360.0f;
+            }
+            if (temp_f4_2 == phi_f2) {
+                sp10 = -210.0f;
+                sp14 = -183.0f;
+                if (temp_f4_2 >= 0.0f) {
+                    clamp = clamp_angle(temp_f20 - 20.0f);
+                } else {
+                    clamp = clamp_angle(temp_f20 + 20.0f);
+                }
+                add_vec2D_polar(&sp10, &sp14, 46.0f, clamp);
+            }
+        }
+        npc->currentAnim = enemy->animList[2];
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14);
+        npc_move_heading(npc, 2.0f, npc->yaw);
+    } else if (temp_f4 > 0.2) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14);
+        npc->pos.x = sp10;
+        npc->pos.z = sp14;
+        npc->currentAnim = enemy->animList[1];
+    } else {
+        npc->pos.x = sp10;
+        npc->pos.z = sp14;
+        npc->currentAnim = enemy->animList[0];
+    }
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/foliage.inc.c"
+
+FoliageModelList N(tree1_Leaves) = {
+    .count = 1,
+    .models = { 23 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 22 }
+};
+
+FoliageDropList N(tree1_Drops) = {
+    .count = 2,
+    .drops = {
+        {
+            .itemID = ITEM_RED_BERRY,
+            .pos = { -256, 102, -169 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(27),
+        },
+        {
+            .itemID = ITEM_RED_BERRY,
+            .pos = { -156, 102, -169 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(28),
+        },
+    }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .drops = &N(tree1_Drops),
+};
+
+Vec4f N(triggerCoord_80244E44) = { -208.0f, 0.0f, -182.0f, 0.0f };
+
+Script N(80244E54) = SCRIPT({
+    SI_AREA_FLAG(27) = 0;
+    SI_AREA_FLAG(28) = 0;
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 16;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80244E44);
+});
+
+static s32 N(pad_4ECC) = {
+    0x00000000,
+};
+
+Script N(80244ED0) = SCRIPT({
+
+});
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802EAB04, -175, 0, 150, 0, ITEM_MAP, MAKE_ENTITY_END);
+    AssignPanelFlag(SI_SAVE_FLAG(1404));
+});
diff --git a/src/world/area_flo/flo_03/flo_03.h b/src/world/area_flo/flo_03/flo_03.h
index 53454eca08..22eb49eb38 100644
--- a/src/world/area_flo/flo_03/flo_03.h
+++ b/src/world/area_flo/flo_03/flo_03.h
@@ -2,3 +2,16 @@
 #include "map.h"
 
 #define NAMESPACE flo_03
+
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CA72A0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240158_CA73F8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240460_CA7700)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_8024442C);
+extern Script N(80240FFC);
+extern Script N(80241EF4);
+extern Script N(80244E54);
+extern Script N(80244ED0);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c
index ca0312c713..b91e149d57 100644
--- a/src/world/area_flo/flo_07/CAC1F0.c
+++ b/src/world/area_flo/flo_07/CAC1F0.c
@@ -6,4 +6,30 @@
 
 #include "world/common/SpawnSunEffect.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC1F0", func_80240344_CAC534);
+typedef struct N(unk_effect) {
+    char unk_00[0x38];
+    s32 unk_38;
+    s32 unk_3C;
+    s32 unk_40;
+    char unk_44[0x4];
+    s32 unk_48;
+    s32 unk_4C;
+    s32 unk_50;
+} N(unk_effect);
+
+typedef struct N(temp) {
+    char unk_00[0xC];
+    N(unk_effect)* unk_0C;
+} N(temp);
+
+ApiStatus N(func_80240344_CAC534)(ScriptInstance* script, s32 isInitialCall) {
+    N(temp)* effect = func_80072350(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0);
+
+    effect->unk_0C->unk_38 = 0xF0;
+    effect->unk_0C->unk_3C = 0xF0;
+    effect->unk_0C->unk_40 = 0xF0;
+    effect->unk_0C->unk_48 = 0xE6;
+    effect->unk_0C->unk_4C = 0xE6;
+    effect->unk_0C->unk_50 = 0xF0;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c
index a27a79d5a2..0a49770728 100644
--- a/src/world/area_flo/flo_07/CAC5D0.c
+++ b/src/world/area_flo/flo_07/CAC5D0.c
@@ -1,30 +1,512 @@
 #include "flo_07.h"
+#include "message_ids.h"
+#include "sprite/npc/posie.h"
+
+enum {
+    NPC_POSIE,
+};
+
+EntryList N(entryList) = {
+    { 375.0f, 0.0f, 0.0f, 270.0f },
+    { 325.0f, 0.0f, 0.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_07_tattle },
+};
+
+Script N(802407A0) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
+    } else {
+        match STORY_PROGRESS {
+            < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+            }
+            else {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+            }
+        }
+    }
+    PlaySound(0x80000021);
+});
+
+Script N(8024086C) = SCRIPT({
+    func_802D5FF8(137, 1);
+});
+
+Script N(80240890) = SCRIPT({
+    FadeOutMusic(0, 250);
+    sleep 10;
+    func_802D5FD8();
+});
+
+static s32 N(pad_8CC) = {
+    0x00000000,
+};
+
+Script N(updateTexturePan_802408D0) = SCRIPT({
+    group 0;
+    if (SI_VAR(5) == 1) {
+        if (SI_VAR(6) == 1) {
+            if (SI_VAR(7) == 1) {
+                if (SI_VAR(8) == 1) {
+                    N(UnkTexturePanFunc)();
+                    return;
+                }
+            }
+        }
+    }
+    N(UnkTexturePanFunc2)();
+});
+
+Script N(8024096C) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_80240C18) = EXIT_WALK_SCRIPT(60,  0, "flo_25",  1);
+
+Script N(80240C74) = SCRIPT({
+    bind N(exitWalk_80240C18) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    SI_AREA_FLAG(6) = 0;
+    MakeNpcs(0, N(npcGroupList_80242B0C));
+    await N(802428C4);
+    ModifyColliderFlags(3, 6, 0x00000006);
+    SI_VAR(0) = 297;
+    SI_VAR(1) = -95;
+    SI_VAR(2) = 383;
+    SI_VAR(3) = -65;
+    SI_VAR(4) = 0;
+    spawn N(8024096C);
+    SI_VAR(0) = 293;
+    SI_VAR(1) = 71;
+    SI_VAR(2) = 378;
+    SI_VAR(3) = 113;
+    SI_VAR(4) = 0;
+    spawn N(8024096C);
+    SI_VAR(0) = 21;
+    SI_VAR(1) = -346;
+    SI_VAR(2) = 147;
+    SI_VAR(3) = -242;
+    SI_VAR(4) = 20;
+    spawn N(8024096C);
+    SI_VAR(0) = -350;
+    SI_VAR(1) = -190;
+    SI_VAR(2) = -81;
+    SI_VAR(3) = -106;
+    SI_VAR(4) = 0;
+    spawn N(8024096C);
+    SI_VAR(0) = -380;
+    SI_VAR(1) = 85;
+    SI_VAR(2) = -95;
+    SI_VAR(3) = 150;
+    SI_VAR(4) = 0;
+    spawn N(8024096C);
+    EnableTexPanning(51, 1);
+    EnableTexPanning(49, 1);
+    EnableTexPanning(50, 1);
+    spawn {
+        SI_VAR(0) = 2;
+        SI_VAR(1) = -100;
+        SI_VAR(2) = 100;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802408D0);
+    }
+    spawn {
+        SI_VAR(0) = 3;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -1200;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802408D0);
+    }
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        spawn N(80241C14);
+    } else {
+        ModifyColliderFlags(0, 1, 0x7FFFFE00);
+        SI_VAR(0) = N(80240C74);
+        spawn EnterWalk;
+        spawn N(802424F4);
+    }
+    await N(802407A0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(SpawnSunEffect)();
+    }
+    N(func_80240344_CAC534)();
+});
+
+static s32 N(pad_1214)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+NpcSettings N(npcSettings_80241220) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
 
 #include "world/common/foliage.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_8024061C_CAC80C);
-/*
-ApiStatus N(func_8024061C_CAC80C)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
-    s32 i;
-    s32* test;
+s32** N(D_80241BB0_CADDA0) = NULL;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+Script N(80241BB4) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 0);
+    return;
+});
+
+Script N(80241BE4) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 16);
+    return;
+});
+
+Script N(80241C14) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    GetNpcPos(NPC_POSIE, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 30;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 300);
+    SetCamPitch(0, 11.0, -11.0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 20;
+    SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00C5));
+    sleep 10;
+    GotoMap("flo_10", 1);
+    sleep 100;
+});
+
+Script N(80241D6C) = SCRIPT({
+0:
+    ShakeCam(0, 0, 1, 1.0);
+    sleep 1;
+    goto 0;
+});
+
+Script N(80241DBC) = SCRIPT({
+    if (SI_AREA_FLAG(6) == 1) {
+        return;
+    }
+    SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0068));
+    spawn {
+        SetCamDistance(0, 300);
+        SetCamPitch(0, 18.0, -7.5);
+        SetCamSpeed(0, 0.5);
+        PanToTarget(0, 0, 1);
+    }
+    PlaySound(0x8000006B);
+    SI_MAP_VAR(0) = spawn N(80241D6C);
+    SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_6), NPC_ANIM(posie, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0069));
+    kill SI_MAP_VAR(0);
+    SetCamDistance(0, 350);
+    SetCamPitch(0, 18.0, -7.5);
+    SetCamSpeed(0, 8.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 10;
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) -= SI_VAR(2);
+    if (SI_VAR(0) < -250) {
+        MakeItemEntity(ITEM_CRYSTAL_BERRY, -225, 100, -25, 13, SI_SAVE_FLAG(1374));
+    } else {
+        MakeItemEntity(ITEM_CRYSTAL_BERRY, -265, 100, 54, 13, SI_SAVE_FLAG(1374));
+        SI_SAVE_FLAG(1396) = 1;
+    }
+    PlaySound(0x7BC);
+    func_802D62E4(956);
+    SI_AREA_FLAG(6) = 1;
+    sleep 20;
+    SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006A));
+    STORY_PROGRESS = STORY_CH6_GOT_CRYSTAL_BERRY;
+});
+
+Script N(interact_80242044) = SCRIPT({
+    await N(8024086C);
+    NpcFacePlayer(NPC_SELF, 1);
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_MAGICAL_BEAN {
+            if (SI_AREA_FLAG(5) == 0) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0070));
+                SI_AREA_FLAG(5) = 1;
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0071));
+            }
+        }
+        < STORY_CH6_GOT_FERTILE_SOIL {
+            AdjustCam(0, 4.0, 0, 350.0, 18.0, -7.5);
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0065));
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_5));
+            sleep 20;
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_0));
+            SI_VAR(0) = 89;
+            SI_VAR(1) = 1;
+            await N(80241BB4);
+            AddKeyItem(ITEM_FERTILE_SOIL);
+            STORY_PROGRESS = STORY_CH6_GOT_FERTILE_SOIL;
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0066));
+            if (SI_SAVE_FLAG(1379) == 1) {
+                await N(80241DBC);
+            }
+            ResetCam(0, 4.0);
+        }
+        < STORY_CH6_GOT_CRYSTAL_BERRY {
+            if (SI_SAVE_FLAG(1379) == 1) {
+                if (SI_AREA_FLAG(6) == 0) {
+                    AdjustCam(0, 4.0, 0, 350.0, 18.0, -7.5);
+                    await N(80241DBC);
+                    ResetCam(0, 4.0);
+                } else {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0072));
+                }
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0072));
+            }
+        }
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            if (SI_SAVE_FLAG(1374) == 0) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0072));
+            } else {
+                if (STORY_PROGRESS < STORY_CH6_GOT_WATER_STONE) {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0073));
+                } else {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0074));
+                }
+                ContinueSpeech(-1, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0075));
+            }
+        }
+        < STORY_CH6_RETURNED_TO_TOAD_TOWN {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0076));
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0077));
+        }
+    }
+    await N(80240890);
+});
+
+Script N(init_80242428) = SCRIPT({
+    if (STORY_PROGRESS == STORY_CH6_GOT_CRYSTAL_BERRY) {
+        if (SI_SAVE_FLAG(1374) == 0) {
+            if (SI_SAVE_FLAG(1396) == 0) {
+                MakeItemEntity(ITEM_CRYSTAL_BERRY, -225, 0, -25, 17, SI_SAVE_FLAG(1374));
+            } else {
+                MakeItemEntity(ITEM_CRYSTAL_BERRY, -265, 0, 54, 17, SI_SAVE_FLAG(1374));
+            }
+        }
+    }
+    SI_AREA_FLAG(5) = 0;
+    BindNpcInteract(NPC_SELF, N(interact_80242044));
+});
+
+Script N(802424F4) = SCRIPT({
+    if (SI_AREA_VAR(3) != 0) {
+        DisablePlayerInput(TRUE);
+        sleep 10;
+        if (SI_AREA_VAR(3) < 5) {
+            SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006E));
+            GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            PlayerMoveTo(410, SI_VAR(3), 10);
+            SI_AREA_VAR(3) += 1;
+        } else {
+            SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006F));
+            SI_AREA_VAR(3) = 0;
+        }
+        DisablePlayerInput(FALSE);
+    }
+});
+
+const char N(flo_25_name_hack)[];
+
+Script N(tree1_Callback) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    if (STORY_PROGRESS < STORY_CH6_GOT_CRYSTAL_BERRY) {
+        NpcFacePlayer(NPC_POSIE, 1);
+        sleep 10;
+        SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_4), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0067));
+        if (STORY_PROGRESS == STORY_CH6_GOT_FERTILE_SOIL) {
+            if (SI_SAVE_FLAG(1379) == 1) {
+                UseSettingsFrom(0, -250, 0, 0);
+                SetPanTarget(0, -250, 0, 0);
+                SetCamDistance(0, 350);
+                PanToTarget(0, 0, 1);
+                await N(80241DBC);
+                ResetCam(0, 4.0);
+            }
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        if (SI_SAVE_FLAG(1374) == 0) {
+            NpcFacePlayer(NPC_POSIE, 1);
+            sleep 10;
+            SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_4), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0067));
+        } else {
+            SI_AREA_VAR(2) += 1;
+            match SI_AREA_VAR(2) {
+                < 2 {
+                    SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_3), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006B));
+                }
+                < 5 {
+                    SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_3), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006C));
+                }
+                >= 5 {
+                    SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_3), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006D));
+                    SI_AREA_VAR(3) = 1;
+                    GotoMap(N(flo_25_name_hack), 1);
+                    sleep 100;
+                }
+            }
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+    }
+    ResetCam(0, 4.0);
+    DisablePlayerInput(FALSE);
+});
+
+FoliageModelList N(tree1_Leaves) = {
+    .count = 3,
+    .models = { 19, 20, 21 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 18 }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .callback = &N(tree1_Callback),
+};
+
+Vec4f N(triggerCoord_802428B4) = { -309.0f, 0.0f, 31.0f, 0.0f };
+
+Script N(802428C4) = SCRIPT({
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 4;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_802428B4);
+});
+
+StaticNpc N(npcGroup_8024291C) = {
+    .id = NPC_POSIE,
+    .settings = &N(npcSettings_80241220),
+    .pos = { -260.0f, 0.0f, 0.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80242428),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+        NPC_ANIM(posie, Palette_00, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00DE),
+};
+
+NpcGroupList N(npcGroupList_80242B0C) = {
+    NPC_GROUP(N(npcGroup_8024291C), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+ApiStatus N(func_8024061C_CAC80C)(ScriptInstance* script, s32 isInitialCall) {
+    s32 i;
+
+    if (N(D_80241BB0_CADDA0) == NULL) {
+        N(D_80241BB0_CADDA0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241BB0_CADDA0)[i] = script->varTable[i];
+        }
+    } else {
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241BB0_CADDA0)[i];
+        }
+        heap_free(N(D_80241BB0_CADDA0));
+        N(D_80241BB0_CADDA0) = NULL;
     }
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/GetItemName.inc.c"
+
+const char N(flo_25_name_hack)[] = "flo_25";
diff --git a/src/world/area_flo/flo_07/flo_07.h b/src/world/area_flo/flo_07/flo_07.h
index 8a32333c6e..d18351524f 100644
--- a/src/world/area_flo/flo_07/flo_07.h
+++ b/src/world/area_flo/flo_07/flo_07.h
@@ -2,3 +2,15 @@
 #include "map.h"
 
 #define NAMESPACE flo_07
+
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SpawnSunEffect)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240344_CAC534)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80242B0C);
+extern Script N(80241C14);
+extern Script N(802424F4);
+extern Script N(802428C4);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c
index 3469955f4f..25af5e53dd 100644
--- a/src/world/area_flo/flo_08/CAED40.c
+++ b/src/world/area_flo/flo_08/CAED40.c
@@ -1,87 +1,161 @@
 #include "flo_08.h"
 
+extern s32 D_800F7F00[];
+extern s32 D_800F7F40[];
+extern s32 D_8008EF20[11][4];
+
 #include "world/common/SetOverrideFlags_40.inc.c"
 
 #include "world/common/UnkFunc17.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_8024003C_CAED7C);
-/*
 ApiStatus N(func_8024003C_CAED7C)(ScriptInstance* script, s32 isInitialCall) {
-    func_800EB168(get_variable(script, *script->ptrReadPos));
+    func_802E5690(get_variable(script, *script->ptrReadPos));
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_802400D4_CAEE14);
+#ifdef NON_MATCHING
+typedef struct {
+    s32 unk_00[8];
+    char unk_20[0x64];
+    s32 unk_84[8];
+    char unk_A4[0x64];
+    s32 unk_108[8];
+    char unk_128[0x64];
+    s32 unk_18C[8];
+    char unk_1AC[0x64];
+    s32 unk_210[8];
+    char unk_230[0x64];
+    s32 unk_294[8];
+    char unk_2B4[0x64];
+    s32 unk_318;
+    char unk_31C[8];
+    s32 unk_324;
+    s32 unk_328;
+    s16 unk_32C;
+} N(UnkStruct);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240120_CAEE60);
-/*
-ApiStatus N(func_80240120_CAEE60)(ScriptInstance *script, s32 isInitialCall) {
+ApiStatus N(func_802401CC_CAEF0C)(ScriptInstance *script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
+    N(UnkStruct)* ptr;
     s32 i;
-    s16 var = script->varTable[12] >= 0;
+    s32 partnerLevel;
+    s32 var, partnerActiveCount;
+    s32 idx;
 
-    script->varTable[0] = -1;
+    if (isInitialCall) {
+        script->functionTemp[2].s = heap_malloc(0x330);
+        ptr = script->functionTemp[2].s;
 
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
+        partnerActiveCount = 0;
+        var = script->varTable[12] >= 0;
+
+        for (i = 0; i < 8; i++) {
+            idx = N(D_80241FB8_CB0CF8)[i];
+
+            if (playerData->partners[idx].enabled) {
+                ptr->unk_108[i] = idx;
+                ptr->unk_84[i] = *D_8008EF20[idx];
+                partnerLevel = N(UnkFunc37)(idx, var);
+                if (partnerLevel >= 0) {
+                    ptr->unk_00[i] = D_800F7F00[idx];
+                    ptr->unk_18C[i] = 1;
+                    ptr->unk_294[i] = N(D_80241FC8_CB0D08)[i][partnerLevel];
+                } else {
+                    ptr->unk_00[i] = D_800F7F40[idx];
+                    ptr->unk_18C[i] = 0;
+                    ptr->unk_294[i] = N(D_80241FB0_CB0CF0)[var];
+                }
+                ptr->unk_210[i] = playerData->partners[idx].level;
+                partnerActiveCount++;
+            }
+        }
+
+        ptr->unk_318 = 4;
+        ptr->unk_324 = partnerActiveCount;
+        ptr->unk_328 = 0;
+        func_800F4E40(ptr);
+        script->functionTemp[0].s = 0;
+    }
+
+    ptr = script->functionTemp[2].s;
+    if (script->functionTemp[0].s == 0) {
+        script->functionTemp[1].s = ptr->unk_32C;
+        if (script->functionTemp[1].s != 0) {
+            func_800F13B0();
+        } else {
+            return ApiStatus_BLOCK;
         }
     }
 
+    script->functionTemp[0].s++;
+
+    if (script->functionTemp[0].s < 15) {
+        return ApiStatus_BLOCK;
+    }
+
+    func_800F1538();
+    if (script->functionTemp[1].s != 0xFF) {
+        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1].s - 1]][0];
+        script->varTable[1] = ptr->unk_108[script->functionTemp[1].s - 1];
+    } else {
+        script->varTable[0] = -1;
+    }
+
+    heap_free(script->functionTemp[2].s);
+
     return ApiStatus_DONE2;
 }
-*/
+#else
+INCLUDE_ASM(ApiStatus, "world/area_flo/flo_08/CAED40", flo_08_func_802401CC_CAEF0C, ScriptInstance *script, s32 isInitialCall);
+#endif
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_802401CC_CAEF0C);
-
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_8024041C_CAF15C);
-/*
 ApiStatus N(func_8024041C_CAF15C)(ScriptInstance* script, s32 isInitialCall) {
     func_800EB168(get_variable(script, *script->ptrReadPos));
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/UnkFunc19.inc.c"
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240510_CAF250);
-/*
-ApiStatus N(func_80240510_CAF250)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
 #include "world/common/UnkFunc22.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240600_CAF340);
-/*
+typedef struct {
+    s32 unk_00;
+    s32 unk_04;
+    Effect* unk_08[3];
+    f32 unk_14[3];
+    f32 unk_20[3];
+    f32 unk_2C[3];
+    f32 unk_38[3];
+    f32 unk_44[3];
+    f32 unk_50[3];
+    Entity* unk_5C;
+    s32 unk_60;
+    s32 unk_64;
+} N(UserData);
+
 ApiStatus N(func_80240600_CAF340)(ScriptInstance *script, s32 isInitialCall) {
     Bytecode *args = script->ptrReadPos;
     Npc* npc = get_npc_safe(-4);
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +178,7 @@ ApiStatus N(func_80240600_CAF340)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80242008_CB0D48)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +187,7 @@ ApiStatus N(func_80240600_CAF340)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +195,7 @@ ApiStatus N(func_80240600_CAF340)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242008_CB0D48)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +213,7 @@ ApiStatus N(func_80240600_CAF340)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242008_CB0D48)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -193,10 +267,9 @@ ApiStatus N(func_80240600_CAF340)(ScriptInstance *script, s32 isInitialCall) {
 
     return ApiStatus_BLOCK;
 }
-*/
 
 #include "world/common/UnkFunc23.inc.c"
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240D08_CAFA48);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_flo/flo_08/CAFA80.c b/src/world/area_flo/flo_08/CAFA80.c
index b828ab6fda..856165d1fe 100644
--- a/src/world/area_flo/flo_08/CAFA80.c
+++ b/src/world/area_flo/flo_08/CAFA80.c
@@ -1,3 +1,8 @@
 #include "flo_08.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFA80", func_80240D40_CAFA80);
+void func_80072950();
+
+ApiStatus N(func_80240D40_CAFA80)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c
index 12a49f6676..5c88a75c49 100644
--- a/src/world/area_flo/flo_08/CAFAC0.c
+++ b/src/world/area_flo/flo_08/CAFAC0.c
@@ -1,57 +1,1408 @@
 #include "flo_08.h"
+#include "message_ids.h"
+#include "sprite/npc/dayzee.h"
+#include "sprite/npc/gate_flower.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80240D80_CAFAC0);
+enum {
+    NPC_GATE_FLOWER,
+    NPC_DAYZEE0,
+    NPC_DAYZEE1,
+    NPC_DAYZEE2,
+    NPC_DAYZEE3,
+    NPC_DAYZEE4,
+    NPC_DAYZEE5,
+    NPC_DAYZEE6,
+    NPC_DAYZEE7,
+};
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241364_CB00A4);
+// BSS
+static s32 N(D_802462C0_B4AA30)[91];
+static s32 N(D_8024642C)[91];
+static s32 N(D_80246598);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802414C8_CB0208);
+// DATA
+EntryList N(entryList) = {
+    { -870.0f, 0.0f, 0.0f,  90.0f },
+    {  570.0f, 0.0f, 0.0f, 270.0f },
+};
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_8024150C_CB024C);
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_08_tattle },
+};
+
+Script N(80241F40) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+s32 N(D_80241FB0_CB0CF0)[] = {
+    0x001D00F0, 0x001D00F1,
+};
+
+s16 N(D_80241FB8_CB0CF8)[] = {
+    0x0001, 0x0002, 0x0003, 0x0004,
+    0x0009, 0x0006, 0x0007, 0x0008
+};
+
+s32 N(D_80241FC8_CB0D08)[8][2] = {
+    { 0x001D00E0, 0x001D00E1 }, { 0x001D00E2, 0x001D00E3 },
+    { 0x001D00E4, 0x001D00E5 }, { 0x001D00E6, 0x001D00E7 },
+    { 0x001D00E8, 0x001D00E9 }, { 0x001D00EA, 0x001D00EB },
+    { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF }
+};
+
+f32 N(D_80242008_CB0D48)[3] = {
+    140.0f, 180.0f, 220.0f
+};
+
+Script N(80242014) = SCRIPT({
+    sleep 10;
+    PlaySound(0x212D);
+    N(UnkFunc21)(SI_MAP_VAR(0));
+    sleep 85;
+    spawn {
+        PlaySound(0x212E);
+        N(UnkFunc23)(70, 70);
+        sleep 27;
+        PlaySound(SOUND_UNKNOWN_208E);
+        N(UnkFunc23)(50, 50);
+    }
+    spawn {
+        sleep 3;
+        N(func_8024003C_CAED7C)(SI_MAP_VAR(0));
+    }
+    spawn {
+        sleep 47;
+        N(UnkFunc22)();
+        N(UnkPartnerPosFunc)();
+        sleep 5;
+        N(UnkPartnerPosFunc2)();
+        sleep 5;
+        N(UnkPartnerPosFunc)();
+    }
+    sleep 3;
+    N(func_80240600_CAF340)(SI_MAP_VAR(0));
+    sleep 30;
+});
+
+Script N(80242178) = SCRIPT({
+    if (SI_SAVE_FLAG(1402) == 1) {
+        return;
+    }
+    IsStartingConversation(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        return;
+    }
+    N(UnkFunc40)();
+    if (SI_VAR(0) == 1) {
+        return;
+    }
+    func_802D585C(1, 2097152);
+    N(SetOverrideFlags_40)();
+    DisablePlayerInput(TRUE);
+    DisablePartnerAI(0);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
+    N(UnkFunc20)(SI_MAP_VAR(0), SI_VAR(9));
+    FindKeyItem(ITEM_ULTRA_STONE, SI_VAR(12));
+    N(UnkFunc38)();
+    if (SI_VAR(0) == -1) {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DC), 160, 40);
+        sleep 10;
+        N(UnkFunc39)(SI_VAR(9));
+        DisablePlayerInput(FALSE);
+        EnablePartnerAI();
+        func_802D585C(0, 2097152);
+        N(UnkFunc17)();
+        return;
+    }
+    if (SI_SAVE_FLAG(438) == 0) {
+        SI_SAVE_FLAG(438) = 1;
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DA), 160, 40);
+    } else {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DB), 160, 40);
+    }
+    N(func_802401CC_CAEF0C)();
+    if (SI_VAR(0) == -1) {
+        N(UnkFunc39)(SI_VAR(9));
+        DisablePlayerInput(FALSE);
+        EnablePartnerAI();
+        func_802D585C(0, 2097152);
+        N(UnkFunc17)();
+        return;
+    }
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    EnablePartnerAI();
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != SI_VAR(11)) {
+        N(func_8024041C_CAF15C)(SI_VAR(11));
+    } else {
+        func_802CF56C(2);
+    }
+    sleep 10;
+    ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DF), 160, 40);
+    ShowChoice(MESSAGE_ID(0x1E, 0x000D));
+    CloseMessage();
+    if (SI_VAR(0) != 0) {
+        N(UnkFunc39)(SI_VAR(9));
+        DisablePlayerInput(FALSE);
+        EnablePartnerAI();
+        func_802D585C(0, 2097152);
+        N(UnkFunc17)();
+        return;
+    }
+    await N(80242014);
+    N(UnkFunc18)(SI_VAR(11), SI_VAR(13));
+    SI_SAVE_FLAG(1402) = 1;
+    N(UnkFunc39)(SI_VAR(9));
+    N(UnkFunc19)();
+    if (SI_VAR(13) == 1) {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DD), 160, 40);
+    } else {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DE), 160, 40);
+    }
+    DisablePlayerInput(FALSE);
+    EnablePartnerAI();
+    func_802D585C(0, 2097152);
+    N(UnkFunc17)();
+});
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802EA910, -780, 120, -110, 0, MAKE_ENTITY_END);
+    SI_MAP_VAR(0) = SI_VAR(0);
+    AssignBlockFlag(SI_SAVE_FLAG(1402));
+    AssignScript(N(80242178));
+    MakeItemEntity(ITEM_STAR_PIECE, 510, 0, -90, 17, SI_SAVE_FLAG(1381));
+});
+
+Script N(80242680) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_8024292C) = EXIT_WALK_SCRIPT(60,  0, "flo_00",  6);
+
+Script N(exitWalk_80242988) = EXIT_WALK_SCRIPT(60,  1, "flo_24",  0);
+
+Script N(802429E4) = SCRIPT({
+    bind N(exitWalk_8024292C) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_80242988) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+s32 N(lavaResetList_80242A2C)[] = {
+    0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000,
+    0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80244EC4));
+    await N(makeEntities);
+    spawn N(80245F5C);
+    ModifyColliderFlags(3, 19, 0x00000002);
+    spawn {
+        ResetFromLava(N(lavaResetList_80242A2C));
+    }
+    EnableTexPanning(22, 1);
+    EnableTexPanning(23, 1);
+    EnableTexPanning(25, 1);
+    EnableTexPanning(27, 1);
+    EnableTexPanning(29, 1);
+    EnableTexPanning(31, 1);
+    EnableTexPanning(41, 1);
+    EnableTexPanning(24, 1);
+    EnableTexPanning(26, 1);
+    EnableTexPanning(28, 1);
+    EnableTexPanning(30, 1);
+    EnableTexPanning(32, 1);
+    spawn {
+        SI_VAR(0) = 0;
+        SI_VAR(1) = 0;
+    0:
+        SI_VAR(0) += 140;
+        if (SI_VAR(0) > 65536) {
+            SI_VAR(0) += -65536;
+        }
+        SetTexPanOffset(1, 0, SI_VAR(0), 0);
+        SI_VAR(1) += -200;
+        if (SI_VAR(1) < 0) {
+            SI_VAR(1) += 65536;
+        }
+        SetTexPanOffset(2, 0, SI_VAR(1), 0);
+        sleep 1;
+        goto 0;
+    }
+    ModifyColliderFlags(3, 21, 0x00000006);
+    SI_VAR(0) = 140;
+    SI_VAR(1) = -137;
+    SI_VAR(2) = 340;
+    SI_VAR(3) = -60;
+    SI_VAR(4) = 0;
+    spawn N(80242680);
+    SI_VAR(0) = 450;
+    SI_VAR(1) = -137;
+    SI_VAR(2) = 590;
+    SI_VAR(3) = -60;
+    SI_VAR(4) = 0;
+    spawn N(80242680);
+    spawn N(80245914);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(802429E4);
+    spawn EnterWalk;
+    await N(80241F40);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240D40_CAFA80)();
+    }
+});
+
+static s32 N(pad_2EA8)[] = {
+    0x00000000, 0x00000000,
+};
+
+NpcAISettings N(npcAISettings_80242EB0) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 30,
+    .waitTime = 30,
+    .alertRadius = 100.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 2.4f,
+    .unk_1C = { .s = 15 },
+    .unk_20 = 1,
+    .chaseRadius = 140.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80242EE0) = SCRIPT({
+    N(func_8024150C_CB024C)(N(npcAISettings_80242EB0));
+});
+
+Script N(80242F00) = SCRIPT({
+0:
+    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(1) += 30;
+    SI_VAR(2) -= 2;
+    PlayEffect(0x11, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 30, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep 15;
+    goto 0;
+});
+
+NpcSettings N(npcSettings_80242FB4) = {
+    .height = 30,
+    .radius = 24,
+    .ai = &N(npcAI_80242EE0),
+    .onHit = EnemyNpcHit,
+    .aux = &N(80242F00),
+    .onDefeat = EnemyNpcDefeat,
+    .level = 100,
+};
+
+NpcSettings N(npcSettings_80242FE0) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
+
+NpcAISettings N(npcAISettings_8024300C) = {
+    .moveSpeed = 1.0f,
+    .moveTime = 500,
+    .waitTime = 10,
+    .alertRadius = 50.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 3.5f,
+    .unk_1C = { .s = 40 },
+    .unk_20 = 3,
+    .chaseRadius = 100.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_8024303C) = SCRIPT({
+    DoBasicAI(N(npcAISettings_8024300C));
+});
+
+NpcSettings N(npcSettings_8024305C) = {
+    .height = 30,
+    .radius = 24,
+    .ai = &N(npcAI_8024303C),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+s32 N(D_80243088_CB1DC8) = FALSE;
+
+s32 N(D_8024308C_CB1DCC) = {
+    0x00000000,
+};
+
+Script N(80243090) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D663C();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_802419C4_CB0704)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(802431C4) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_802419FC_CB073C), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80243090), 0x10, 0, N(D_802462C0_B4AA30), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241970_CB06B0), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(interact_80243214) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    if (SI_SAVE_FLAG(1364) == 0) {
+        GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetCamDistance(0, 350);
+        SetCamPitch(0, 18.5, -7.5);
+        SetCamSpeed(0, 4.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_2), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0042));
+        SetPlayerAnimation(ANIM_THINKING);
+        N(func_80241BCC_CB090C)();
+        SI_VAR(0) = 0x80246430;
+        SI_VAR(1) = 0;
+        await N(802431C4);
+        match SI_VAR(0) {
+            <= 0 {
+                SetPlayerAnimation(ANIM_STAND_STILL);
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_2), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0043));
+            }
+            else {
+                SI_VAR(8) = SI_VAR(0);
+                N(func_80241B5C_CB089C)(SI_VAR(0));
+                MakeItemEntity(SI_VAR(8), -695, 20, -29, 1, 0);
+                SI_VAR(7) = SI_VAR(0);
+                PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0);
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_3));
+                sleep 20;
+                RemoveItemEntity(SI_VAR(7));
+                match SI_VAR(8) {
+                    == 160 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0046));
+                        PlaySoundAtNpc(NPC_SELF, 0x21C, 0);
+                        EndSpeech(-1, NPC_ANIM(gate_flower, Palette_02, Anim_9), NPC_ANIM(gate_flower, Palette_02, Anim_8), 0);
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_7));
+                        PlaySoundAtCollider(17, 457, 0);
+                        ModifyColliderFlags(0, 17, 0x7FFFFE00);
+                        MakeLerp(0, 100, 30, 1);
+                        loop {
+                            UpdateLerp();
+                            SI_VAR(8) = (float) SI_VAR(0);
+                            SI_VAR(9) = (float) SI_VAR(0);
+                            SI_VAR(8) *= 0.5;
+                            SI_VAR(9) *= 1.2001953125;
+                            RotateModel(103, SI_VAR(8), 0, 1, 0);
+                            RotateModel(104, SI_VAR(8), 0, 1, 0);
+                            RotateModel(105, SI_VAR(8), 0, 1, 0);
+                            RotateModel(99, SI_VAR(9), 0, -1, 0);
+                            RotateModel(100, SI_VAR(9), 0, -1, 0);
+                            RotateModel(101, SI_VAR(9), 0, -1, 0);
+                            sleep 1;
+                            if (SI_VAR(1) != 1) {
+                                break loop;
+                            }
+                        }
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_5));
+                        SI_SAVE_FLAG(1364) = 1;
+                    }
+                    == 159 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0045));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1));
+                    }
+                    == 158 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0045));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1));
+                    }
+                    else {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0044));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_6));
+                        PlaySoundAtNpc(NPC_SELF, 0x2096, 0);
+                        MakeItemEntity(SI_VAR(8), 125, 20, 0, 1, 0);
+                        SI_VAR(7) = SI_VAR(0);
+                        sleep 5;
+                        GetAngleToPlayer(-1, SI_VAR(0));
+                        if (SI_VAR(0) < 180) {
+                            MakeLerp(0, 100, 7, 0);
+                            loop {
+                                UpdateLerp();
+                                SI_VAR(2) = -0.5;
+                                SI_VAR(3) = -0.19921875;
+                                SI_VAR(4) = 0.900390625;
+                                SI_VAR(2) *= (float) SI_VAR(0);
+                                SI_VAR(3) *= (float) SI_VAR(0);
+                                SI_VAR(4) *= (float) SI_VAR(0);
+                                SI_VAR(2) += -700.0;
+                                SI_VAR(3) += 15.0;
+                                SI_VAR(4) += -25.0;
+                                N(func_80241A98_CB07D8)(SI_VAR(7), SI_VAR(2), SI_VAR(3), SI_VAR(4));
+                                sleep 1;
+                                if (SI_VAR(1) == 0) {
+                                    break loop;
+                                }
+                            }
+                        } else {
+                            MakeLerp(0, 100, 7, 0);
+                            loop {
+                                UpdateLerp();
+                                SI_VAR(2) = 0.5;
+                                SI_VAR(3) = -0.19921875;
+                                SI_VAR(4) = 0.900390625;
+                                SI_VAR(2) *= (float) SI_VAR(0);
+                                SI_VAR(3) *= (float) SI_VAR(0);
+                                SI_VAR(4) *= (float) SI_VAR(0);
+                                SI_VAR(2) += -690.0;
+                                SI_VAR(3) += 15.0;
+                                SI_VAR(4) += -25.0;
+                                N(func_80241A98_CB07D8)(SI_VAR(7), SI_VAR(2), SI_VAR(3), SI_VAR(4));
+                                sleep 1;
+                                if (SI_VAR(1) == 0) {
+                                    break loop;
+                                }
+                            }
+                        }
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1));
+                        RemoveItemEntity(SI_VAR(7));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1));
+                        EndSpeech(-1, NPC_ANIM(gate_flower, Palette_02, Anim_2), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0);
+                    }
+                }
+            }
+        }
+        spawn {
+            ResetCam(0, 6.0);
+        }
+        sleep 10;
+    } else {
+        if (STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_9), NPC_ANIM(gate_flower, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, 0x0047));
+        } else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_9), NPC_ANIM(gate_flower, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, 0x0048));
+        }
+    }
+    DisablePlayerInput(FALSE);
+    unbind;
+});
+
+Script N(init_80243B20) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80243214));
+    if (SI_SAVE_FLAG(1364) == 1) {
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_5));
+        ModifyColliderFlags(0, 17, 0x7FFFFE00);
+        RotateModel(103, 50, 0, 1, 0);
+        RotateModel(104, 50, 0, 1, 0);
+        RotateModel(105, 50, 0, 1, 0);
+        RotateModel(99, 120, 0, -1, 0);
+        RotateModel(100, 120, 0, -1, 0);
+        RotateModel(101, 120, 0, -1, 0);
+    }
+});
+
+StaticNpc N(npcGroup_80243C48) = {
+    .id = NPC_GATE_FLOWER,
+    .settings = &N(npcSettings_80242FE0),
+    .pos = { -695.0f, 0.0f, -30.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
+    .init = &N(init_80243B20),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+        NPC_ANIM(gate_flower, Palette_02, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00DB),
+};
+
+StaticNpc N(npcGroup_80243E38) = {
+    .id = NPC_DAYZEE0,
+    .settings = &N(npcSettings_8024305C),
+    .pos = { 205.0f, 0.0f, -80.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { 205, 0, -80, 30, 0, -32767, 0, 205, 0, -80, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80244028) = {
+    .id = NPC_DAYZEE1,
+    .settings = &N(npcSettings_8024305C),
+    .pos = { 275.0f, 0.0f, -115.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { 275, 0, -115, 30, 0, -32767, 0, 275, 0, -115, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80244218) = {
+    .id = NPC_DAYZEE2,
+    .settings = &N(npcSettings_8024305C),
+    .pos = { -230.0f, 60.0f, -110.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { -230, 60, -110, 30, 0, -32767, 0, -230, 60, -110, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80244408) = {
+    .id = NPC_DAYZEE3,
+    .settings = &N(npcSettings_8024305C),
+    .pos = { -330.0f, 60.0f, -110.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { -330, 60, -110, 30, 0, -32767, 0, -330, 60, -110, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_802445F8) = {
+    .id = NPC_DAYZEE4,
+    .settings = &N(npcSettings_8024305C),
+    .pos = { -430.0f, 60.0f, -110.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { -430, 60, -110, 30, 0, -32767, 0, -430, 60, -110, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_802447E8) = {
+    .id = NPC_DAYZEE5,
+    .settings = &N(npcSettings_8024305C),
+    .pos = { -530.0f, 60.0f, -110.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { -530, 60, -110, 30, 0, -32767, 0, -530, 60, -110, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_802449D8) = {
+    .id = NPC_DAYZEE6,
+    .settings = &N(npcSettings_8024305C),
+    .pos = { -630.0f, 60.0f, -110.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { -630, 60, -110, 30, 0, -32767, 0, -630, 60, -110, 150, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+Script N(init_80244BC8) = SCRIPT({
+    spawn {
+        sleep 2;
+        GetNpcPointer(2, SI_VAR(0));
+        if (SI_VAR(0) == 0) {
+            RemoveNpc(NPC_SELF);
+            return;
+        }
+        RandInt(100, SI_VAR(0));
+        if (SI_VAR(0) < 30) {
+            SetNpcFlagBits(NPC_DAYZEE1, ((0x00000002 | NPC_FLAG_4)), TRUE);
+            SetNpcPos(NPC_DAYZEE1, 0, -1000, 0);
+        } else {
+            SetNpcFlagBits(NPC_SELF, ((0x00000002 | NPC_FLAG_4)), TRUE);
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+        }
+    }
+});
+
+StaticNpc N(npcGroup_80244CD4) = {
+    .id = NPC_DAYZEE7,
+    .settings = &N(npcSettings_80242FB4),
+    .pos = { 240.0f, 0.0f, -90.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .init = &N(init_80244BC8),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 20,
+    .itemDrops = {
+        { ITEM_HONEY_SYRUP, 24, 0 },
+        { ITEM_MAPLE_SYRUP, 25, 0 },
+        { ITEM_JAMMIN_JELLY, 1, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(6),
+    .minCoinBonus = 5,
+    .maxCoinBonus = 8,
+    .movement = { 240, 0, -90, 30, 0, -32767, 0, 240, 0, -90, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_2),
+        NPC_ANIM(dayzee, Palette_01, Anim_3),
+        NPC_ANIM(dayzee, Palette_01, Anim_3),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_8),
+        NPC_ANIM(dayzee, Palette_01, Anim_8),
+        NPC_ANIM(dayzee, Palette_01, Anim_6),
+        NPC_ANIM(dayzee, Palette_01, Anim_7),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+        NPC_ANIM(dayzee, Palette_01, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_80244EC4) = {
+    NPC_GROUP(N(npcGroup_80243C48), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80243E38), BATTLE_ID(24, 20, 0, 1)),
+    NPC_GROUP(N(npcGroup_80244028), BATTLE_ID(24, 15, 0, 1)),
+    NPC_GROUP(N(npcGroup_80244218), BATTLE_ID(24, 15, 0, 2)),
+    NPC_GROUP(N(npcGroup_80244408), BATTLE_ID(24, 15, 0, 2)),
+    NPC_GROUP(N(npcGroup_802445F8), BATTLE_ID(24, 15, 0, 2)),
+    NPC_GROUP(N(npcGroup_802447E8), BATTLE_ID(24, 15, 0, 2)),
+    NPC_GROUP(N(npcGroup_802449D8), BATTLE_ID(24, 18, 0, 2)),
+    NPC_GROUP(N(npcGroup_80244CD4), BATTLE_ID(24, 28, 0, 1)),
+    {},
+};
+
+static s32 N(pad_4F3C) = {
+    0x00000000,
+};
+
+void N(func_80240D80_CAFAC0)(ScriptInstance *script, NpcAISettings *npcAISettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    f32 temp_f0;
+    f32 temp_f20;
+    f64 temp_f2;
+    f32 phi_f22;
+    f32 phi_f24;
+    f32 phi_f26;
+    s32 phi_s3;
+
+    f32 subroutine_arg8;
+    f32 subroutine_arg9;
+    f32 subroutine_argA;
+    f32 subroutine_argB;
+    f32 subroutine_argC;
+    f32 subroutine_argD;
+    f32 subroutine_argE;
+    f32 subroutine_argF;
+    f32 subroutine_arg10;
+
+    npc->duration = npcAISettings->unk_20 / 2 + rand_int(npcAISettings->unk_20 / 2 + 1);
+    npc->currentAnim = enemy->animList[3];
+    npc->moveSpeed = npcAISettings->chaseSpeed;
+    phi_s3 = FALSE;
+
+    temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) + 180.0f);
+    temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20);
+    if (npcAISettings->unk_1C.s < fabsf(temp_f0)) {
+        temp_f20 = npc->yaw;
+        if (temp_f0 < 0.0f) {
+            temp_f20 += -npcAISettings->unk_1C.s;
+        } else {
+            temp_f20 += npcAISettings->unk_1C.s;
+        }
+    }
+
+    npc->yaw = clamp_angle(temp_f20);
+
+    subroutine_arg8 = npc->pos.x;
+    subroutine_arg9 = npc->pos.y;
+    subroutine_argA = npc->pos.z;
+
+    temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) + 180.0f);
+    phi_f22 = 0.0f;
+    phi_f24 = 0.0f;
+    phi_f26 = 0.0f;
+
+    if (func_800DDCEC(npc->unk_80, &subroutine_arg8, &subroutine_arg9, &subroutine_argA, npc->moveSpeed * 4.5, temp_f20, npc->collisionHeight, npc->collisionRadius) != 0) {
+        phi_f22 = dist2D(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+
+        subroutine_argB = npc->pos.x;
+        subroutine_argC = npc->pos.y;
+        subroutine_argD = npc->pos.z;
+
+        if (func_800DDCEC(npc->unk_80, &subroutine_argB, &subroutine_argC, &subroutine_argD, npc->moveSpeed * 4.5, clamp_angle(temp_f20 + 35.0f), npc->collisionHeight, npc->collisionRadius) != 0) {
+            phi_f24 = dist2D(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+        }
+
+        subroutine_argE = npc->pos.x;
+        subroutine_argF = npc->pos.y;
+        subroutine_arg10 = npc->pos.z;
+
+        if (func_800DDCEC(npc->unk_80, &subroutine_argE, &subroutine_argF, &subroutine_arg10, npc->moveSpeed * 4.5, clamp_angle(temp_f20 - 35.0f), npc->collisionHeight, npc->collisionRadius) != 0) {
+            phi_f26 = dist2D(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+        }
+
+        dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+
+        if ((phi_f22 < npc->moveSpeed * 1.5) && (phi_f24 < npc->moveSpeed * 1.5) && (phi_f26 < npc->moveSpeed * 1.5) &&
+            (func_800490B4(territory, enemy, npcAISettings->alertRadius, npcAISettings->unk_10.f, 0) != 0)) {
+            phi_s3 = TRUE;
+        }
+
+        if (!phi_s3) {
+            if ((phi_f24 < phi_f22) && (phi_f26 < phi_f24)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+            } else if ((phi_f24 < phi_f22) && (phi_f24 < phi_f26)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+            } else if ((phi_f22 < phi_f24) && (phi_f26 < phi_f22)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+            } else if ((phi_f26 < phi_f24) && (phi_f22 < phi_f26)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+            } else if ((phi_f22 < phi_f26) && (phi_f24 < phi_f22)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+            } else if ((phi_f24 < phi_f26) && (phi_f22 < phi_f24)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+            }
+
+            temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20);
+            if (npcAISettings->unk_1C.s < fabsf(temp_f0)) {
+                temp_f20 = npc->yaw;
+                if (temp_f0 < 0.0f) {
+                    temp_f20 += -npcAISettings->unk_1C.s;
+                } else {
+                    temp_f20 += npcAISettings->unk_1C.s;
+                }
+            }
+            npc->yaw = clamp_angle(temp_f20);
+        }
+    }
+    if (phi_s3) {
+        npc->duration = 0xA;
+        npc->currentAnim = enemy->animList[8];
+    }
+    script->functionTemp[0].s = 0xD;
+}
+
+void N(func_80241364_CB00A4)(ScriptInstance *script, NpcAISettings *npcAISettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc *npc = get_npc_unsafe(enemy->npcID);
+    s32 var;
+
+    if (func_800490B4(territory, enemy, npcAISettings->chaseRadius, npcAISettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 25;
+        script->functionTemp[0].s = 14;
+    } else {
+        if (npc->currentAnim != enemy->animList[8]) {
+            if (npc->moveSpeed < 4.0) {
+                func_8003D660(npc, 0);
+            } else {
+                func_8003D660(npc, 1);
+            }
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        }
+        if (npc->duration > 0) {
+            npc->duration--;
+            return;
+        } else {
+            script->functionTemp[0].s = 12;
+        }
+    }
+}
+
+void N(func_802414C8_CB0208)(ScriptInstance *script, NpcAISettings *npcAISettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc *npc = get_npc_unsafe(enemy->npcID);
+
+    npc->duration--;
+    if (npc->duration == 0) {
+        script->functionTemp[0].s = NULL;
+    }
+}
+
+ApiStatus N(func_8024150C_CB024C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc *npc = get_npc_unsafe(enemy->npcID);
+    Bytecode* args = script->ptrReadPos;
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++);
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 100.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall || (enemy->unk_B0 & 4)) {
+        script->functionTemp[0].s = 0;
+        npc->duration = 0;
+        npc->currentAnim = enemy->animList[0];
+        npc->flags &= ~0x800;
+        if (!enemy->territory->wander.isFlying) {
+            npc->flags = (npc->flags | 0x200) & ~0x8;
+        } else {
+            npc->flags = (npc->flags & ~0x200) | 0x8;
+        }
+        if (enemy->unk_B0 & 4) {
+            script->functionTemp[0].s = 99;
+            script->functionTemp[1].s = 0;
+            enemy->unk_B0 &= ~4;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800495A0(script, npcAISettings, territoryPtr);
+        case 1:
+            func_800496B8(script, npcAISettings, territoryPtr);
+            break;
+        case 2:
+            base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr);
+        case 3:
+            func_80049C04(script, npcAISettings, territoryPtr);
+            break;
+        case 10:
+            func_80049E3C(script, npcAISettings, territoryPtr);
+        case 11:
+            func_80049ECC(script, npcAISettings, territoryPtr);
+            break;
+        case 12:
+            N(func_80240D80_CAFAC0)(script, npcAISettings, territoryPtr);
+        case 13:
+            N(func_80241364_CB00A4)(script, npcAISettings, territoryPtr);
+            break;
+        case 14:
+            N(func_802414C8_CB0208)(script, npcAISettings, territoryPtr);
+            break;
+        case 99:
+            func_8004A73C(script);
+    }
+
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241970_CB06B0);
-/*
 ApiStatus N(func_80241970_CB06B0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80243088_CB1DC8) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80243088_CB1DC8)) {
+        N(D_80243088_CB1DC8) = FALSE;
+        set_variable(script, *args, N(D_8024308C_CB1DCC));
         return ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802419C4_CB0704);
-/*
 ApiStatus N(func_802419C4_CB0704)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_8024308C_CB1DCC) = get_variable(script, *args);
+    N(D_80243088_CB1DC8) = TRUE;
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802419FC_CB073C);
+ApiStatus N(func_802419FC_CB073C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241A98_CB07D8);
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_802462C0_B4AA30)[i] = ptr[i];
+        }
+        N(D_802462C0_B4AA30)[i] = 0;
+    } else {
+        for (i = 0; i <= 90; i++) {
+            N(D_802462C0_B4AA30)[i] = i + 128;
+            N(D_802462C0_B4AA30)[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241B5C_CB089C);
+ApiStatus N(func_80241A98_CB07D8)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 itemIdx = get_variable(script, *args++);
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    ItemEntity* item = get_item_entity(itemIdx);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241BCC_CB090C);
+    item->position.x = var1;
+    item->position.y = var2;
+    item->position.z = var3;
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241B5C_CB089C)(ScriptInstance *script, s32 isInitialCall) {
+    s32 itemId = get_variable(script, *script->ptrReadPos);
+    StaticItem* item = &gItemTable[itemId];
+
+    if (itemId == ITEM_YUMMY_MEAL) {
+        script->varTable[9] = 2;
+    } else if (item->typeFlags & 0x80) {
+        script->varTable[9] = 1;
+    } else {
+        script->varTable[9] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241BCC_CB090C)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
+
+    for (i = 0; i <= 90; i++) {
+        N(D_8024642C)[i] = 128 + i;
+    }
+
+    N(D_80246598) = 0;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/foliage.inc.c"
+
+FoliageModelList N(tree1_Leaves) = {
+    .count = 1,
+    .models = { 46 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 45 }
+};
+
+FoliageDropList N(tree1_Drops) = {
+    .count = 2,
+    .drops = {
+        {
+            .itemID = ITEM_BLUE_BERRY,
+            .pos = { 340, 102, -89 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(29),
+        },
+        {
+            .itemID = ITEM_BLUE_BERRY,
+            .pos = { 440, 102, -89 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(30),
+        },
+    }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .drops = &N(tree1_Drops),
+};
+
+Vec4f N(triggerCoord_80245904) = { 391.0f, 0.0f, -102.0f, 0.0f };
+
+Script N(80245914) = SCRIPT({
+    SI_AREA_FLAG(29) = 0;
+    SI_AREA_FLAG(30) = 0;
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 22;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80245904);
+});
+
+static s32 N(pad_598C) = {
+    0x00000000,
+};
+
+Script N(80245990) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(80245C3C) = SCRIPT({
+    SI_VAR(9) = SI_VAR(6);
+    SI_VAR(8) = SI_VAR(5);
+    SI_VAR(7) = SI_VAR(4);
+    SI_VAR(6) = SI_VAR(3);
+    SI_VAR(5) = SI_VAR(2);
+    SI_VAR(4) = SI_VAR(1);
+    SI_VAR(3) = SI_VAR(0);
+    EnableModel(SI_VAR(6), 0);
+0:
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    N(UnkFunc43)();
+    if (SI_VAR(0) == 0) {
+        sleep 1;
+        goto 0;
+    }
+    spawn {
+        sleep 5;
+        EnableModel(SI_VAR(6), 1);
+    }
+    if (SI_VAR(10) != 0) {
+        spawn {
+            sleep 5;
+            SI_VAR(0) = SI_VAR(3);
+            SI_VAR(1) = SI_VAR(4);
+            SI_VAR(2) = SI_VAR(5);
+            SI_VAR(1) += 10;
+            SI_VAR(2) += 8;
+            PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 15, 0, 0, 0, 0, 0, 0, 0, 0);
+            sleep 15;
+            SI_VAR(1) -= 10;
+            MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 14, 0);
+        }
+    }
+    spawn {
+        sleep 10;
+        PlaySoundAt(0xF8, 0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    }
+    MakeLerp(0, 180, 20, 2);
+1:
+    UpdateLerp();
+    RotateModel(SI_VAR(8), SI_VAR(0), 1, 0, 0);
+    RotateModel(SI_VAR(9), SI_VAR(0), 1, 0, 0);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+    EnableModel(SI_VAR(7), 0);
+});
+
+Script N(80245F5C) = SCRIPT({
+    GetModelCenter(60);
+    SI_VAR(3) = 60;
+    SI_VAR(4) = 61;
+    SI_VAR(5) = 62;
+    SI_VAR(6) = 63;
+    SI_VAR(10) = 0;
+    spawn N(80245C3C);
+    GetModelCenter(54);
+    SI_VAR(3) = 54;
+    SI_VAR(4) = 55;
+    SI_VAR(5) = 56;
+    SI_VAR(6) = 57;
+    SI_VAR(10) = 0;
+    spawn N(80245C3C);
+    GetModelCenter(48);
+    SI_VAR(3) = 48;
+    SI_VAR(4) = 49;
+    SI_VAR(5) = 50;
+    SI_VAR(6) = 51;
+    SI_VAR(10) = 0;
+    spawn N(80245C3C);
+    GetModelCenter(67);
+    SI_VAR(3) = 67;
+    SI_VAR(4) = 66;
+    SI_VAR(5) = 68;
+    SI_VAR(6) = 69;
+    SI_VAR(10) = 174;
+    spawn N(80245C3C);
+});
diff --git a/src/world/area_flo/flo_08/CB0B80.c b/src/world/area_flo/flo_08/CB0B80.c
index 8c2017f611..a9acf5c8e9 100644
--- a/src/world/area_flo/flo_08/CB0B80.c
+++ b/src/world/area_flo/flo_08/CB0B80.c
@@ -1,3 +1,3 @@
 #include "flo_08.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_08/CB0B80", func_80241E40_CB0B80);
+#include "world/common/UnkFunc43.inc.c"
diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h
index fce31c582f..9a271cc214 100644
--- a/src/world/area_flo/flo_08/flo_08.h
+++ b/src/world/area_flo/flo_08/flo_08.h
@@ -2,3 +2,41 @@
 #include "map.h"
 
 #define NAMESPACE flo_08
+
+ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SetOverrideFlags_40)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc17)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc18)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc19)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc20)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc21)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc22)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc23)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkPartnerPosFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024003C_CAED7C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc38)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802401CC_CAEF0C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024041C_CAF15C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc39)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240600_CAF340)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc40)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240D40_CAFA80)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024150C_CB024C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241970_CB06B0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802419C4_CB0704)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802419FC_CB073C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241A98_CB07D8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241B5C_CB089C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241BCC_CB090C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc43)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80244EC4);
+extern Script N(80245914);
+extern Script N(80245F5C);
+extern Script N(main);
+extern s32 N(D_80241FB0_CB0CF0)[];
+extern s16 N(D_80241FB8_CB0CF8)[];
+extern s32 N(D_80241FC8_CB0D08)[8][2];
+extern f32 N(D_80242008_CB0D48)[3];
diff --git a/src/world/area_flo/flo_09/CB5000.c b/src/world/area_flo/flo_09/CB5000.c
index c965a16f1a..c6231d0b05 100644
--- a/src/world/area_flo/flo_09/CB5000.c
+++ b/src/world/area_flo/flo_09/CB5000.c
@@ -1,3 +1,8 @@
 #include "flo_09.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5000", func_80240000_CB5000);
+void func_80072950();
+
+ApiStatus N(func_80240000_CB5000)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_09/CB5040.c b/src/world/area_flo/flo_09/CB5040.c
index 909cd1fee2..950348ce05 100644
--- a/src/world/area_flo/flo_09/CB5040.c
+++ b/src/world/area_flo/flo_09/CB5040.c
@@ -1,3 +1,3 @@
 #include "flo_09.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5040", func_80240040_CB5040);
+#include "world/common/UnkFunc43.inc.c"
diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c
index a46b428040..583c662a57 100644
--- a/src/world/area_flo/flo_09/CB50E0.c
+++ b/src/world/area_flo/flo_09/CB50E0.c
@@ -1,4 +1,672 @@
 #include "flo_09.h"
+#include "message_ids.h"
+#include "sprite/npc/bzzap.h"
+#include "sprite/npc/dayzee.h"
+
+enum {
+    NPC_DAYZEE0,
+    NPC_DAYZEE1,
+    NPC_BZZAP0,
+    NPC_BZZAP1,
+};
+
+EntryList N(entryList) = {
+    { -520.0f, 0.0f, 0.0f,  90.0f },
+    {  520.0f, 0.0f, 0.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_09_tattle },
+};
+
+Script N(80241880) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(802418F0) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_80241B9C) = EXIT_WALK_SCRIPT(60,  0, "flo_00",  5);
+
+Script N(exitWalk_80241BF8) = EXIT_WALK_SCRIPT(60,  1, "flo_03",  0);
+
+Script N(80241C54) = SCRIPT({
+    bind N(exitWalk_80241B9C) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_80241BF8) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_8024414C));
+    spawn N(802425DC);
+    spawn N(802434A8);
+    ModifyColliderFlags(3, 9, 0x00000006);
+    SI_VAR(0) = -511;
+    SI_VAR(1) = -4;
+    SI_VAR(2) = -319;
+    SI_VAR(3) = 10;
+    SI_VAR(4) = 0;
+    spawn N(802418F0);
+    SI_VAR(0) = -302;
+    SI_VAR(1) = 77;
+    SI_VAR(2) = -32;
+    SI_VAR(3) = 116;
+    SI_VAR(4) = 0;
+    spawn N(802418F0);
+    SI_VAR(0) = 51;
+    SI_VAR(1) = 18;
+    SI_VAR(2) = 141;
+    SI_VAR(3) = 127;
+    SI_VAR(4) = 0;
+    spawn N(802418F0);
+    SI_VAR(0) = 234;
+    SI_VAR(1) = 38;
+    SI_VAR(2) = 502;
+    SI_VAR(3) = 98;
+    SI_VAR(4) = 0;
+    spawn N(802418F0);
+    SI_VAR(0) = -525;
+    SI_VAR(1) = -163;
+    SI_VAR(2) = -400;
+    SI_VAR(3) = -80;
+    SI_VAR(4) = 60;
+    spawn N(802418F0);
+    SI_VAR(0) = -346;
+    SI_VAR(1) = -148;
+    SI_VAR(2) = 517;
+    SI_VAR(3) = -91;
+    SI_VAR(4) = 60;
+    spawn N(802418F0);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(80241C54);
+    spawn EnterWalk;
+    await N(80241880);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CB5000)();
+    }
+});
+
+static s32 N(pad_2004)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80242010) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(802422BC) = SCRIPT({
+    SI_VAR(9) = SI_VAR(6);
+    SI_VAR(8) = SI_VAR(5);
+    SI_VAR(7) = SI_VAR(4);
+    SI_VAR(6) = SI_VAR(3);
+    SI_VAR(5) = SI_VAR(2);
+    SI_VAR(4) = SI_VAR(1);
+    SI_VAR(3) = SI_VAR(0);
+    EnableModel(SI_VAR(6), 0);
+0:
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    N(UnkFunc43)();
+    if (SI_VAR(0) == 0) {
+        sleep 1;
+        goto 0;
+    }
+    spawn {
+        sleep 5;
+        EnableModel(SI_VAR(6), 1);
+    }
+    if (SI_VAR(10) != 0) {
+        spawn {
+            sleep 5;
+            SI_VAR(0) = SI_VAR(3);
+            SI_VAR(1) = SI_VAR(4);
+            SI_VAR(2) = SI_VAR(5);
+            SI_VAR(1) += 10;
+            SI_VAR(2) += 8;
+            PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 15, 0, 0, 0, 0, 0, 0, 0, 0);
+            sleep 15;
+            SI_VAR(1) -= 10;
+            MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 14, 0);
+        }
+    }
+    spawn {
+        sleep 10;
+        PlaySoundAt(0xF8, 0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    }
+    MakeLerp(0, 180, 20, 2);
+1:
+    UpdateLerp();
+    RotateModel(SI_VAR(8), SI_VAR(0), 1, 0, 0);
+    RotateModel(SI_VAR(9), SI_VAR(0), 1, 0, 0);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+    EnableModel(SI_VAR(7), 0);
+});
+
+Script N(802425DC) = SCRIPT({
+    GetModelCenter(69);
+    SI_VAR(3) = 69;
+    SI_VAR(4) = 70;
+    SI_VAR(5) = 71;
+    SI_VAR(6) = 72;
+    SI_VAR(10) = 0;
+    spawn N(802422BC);
+    GetModelCenter(75);
+    SI_VAR(3) = 75;
+    SI_VAR(4) = 76;
+    SI_VAR(5) = 77;
+    SI_VAR(6) = 78;
+    SI_VAR(10) = 174;
+    spawn N(802422BC);
+    GetModelCenter(83);
+    SI_VAR(3) = 83;
+    SI_VAR(4) = 84;
+    SI_VAR(5) = 85;
+    SI_VAR(6) = 86;
+    SI_VAR(10) = 0;
+    spawn N(802422BC);
+    GetModelCenter(89);
+    SI_VAR(3) = 89;
+    SI_VAR(4) = 90;
+    SI_VAR(5) = 91;
+    SI_VAR(6) = 92;
+    SI_VAR(10) = 0;
+    spawn N(802422BC);
+    GetModelCenter(97);
+    SI_VAR(3) = 97;
+    SI_VAR(4) = 98;
+    SI_VAR(5) = 99;
+    SI_VAR(6) = 100;
+    SI_VAR(10) = 0;
+    spawn N(802422BC);
+    GetModelCenter(103);
+    SI_VAR(3) = 103;
+    SI_VAR(4) = 104;
+    SI_VAR(5) = 105;
+    SI_VAR(6) = 106;
+    SI_VAR(10) = 0;
+    spawn N(802422BC);
+});
+
+static s32 N(pad_2874)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
 
 #include "world/common/foliage.inc.c"
 
+Script N(802431E4) = SCRIPT({
+    GetNpcPos(NPC_BZZAP1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    if (SI_VAR(1) < 0) {
+        GetModelCenter(SI_VAR(9));
+        SI_VAR(2) += 35;
+        SetNpcPos(NPC_BZZAP1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    }
+});
+
+Script N(tree1_Callback) = SCRIPT({
+    if (SI_SAVE_FLAG(1382) == 0) {
+        if (SI_AREA_VAR(5) == 1) {
+            MakeItemEntity(ITEM_HAPPY_FLOWER_B, -250, 100, 0, 13, SI_SAVE_FLAG(1382));
+        } else {
+            SI_VAR(9) = 14;
+            spawn N(802431E4);
+        }
+        SI_AREA_VAR(4) = 0;
+        SI_AREA_VAR(5) = 0;
+    }
+});
+
+Script N(tree2_Callback) = SCRIPT({
+    if (SI_SAVE_FLAG(1382) == 0) {
+        SI_AREA_VAR(4) = 1;
+        SI_AREA_VAR(5) = 0;
+    }
+});
+
+Script N(tree3_Callback) = SCRIPT({
+    if (SI_SAVE_FLAG(1382) == 0) {
+        if (SI_AREA_VAR(4) == 1) {
+            if (SI_AREA_VAR(5) == 0) {
+                SI_AREA_VAR(5) = 1;
+                return;
+            }
+        }
+        SI_VAR(9) = 22;
+        spawn N(802431E4);
+        SI_AREA_VAR(4) = 0;
+        SI_AREA_VAR(5) = 0;
+    }
+});
+
+FoliageModelList N(tree1_Leaves) = {
+    .count = 2,
+    .models = { 15, 16 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 14 }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .callback = &N(tree1_Callback),
+};
+
+Vec4f N(triggerCoord_80243428) = { -200.0f, 0.0f, 1.0f, 0.0f };
+
+FoliageModelList N(tree2_Leaves) = {
+    .count = 2,
+    .models = { 19, 20 }
+};
+
+FoliageModelList N(tree2_Trunk) = {
+    .count = 1,
+    .models = { 18 }
+};
+
+ShakeTreeConfig N(tree2) = {
+    .leaves = &N(tree2_Leaves),
+    .trunk = &N(tree2_Trunk),
+    .callback = &N(tree2_Callback),
+};
+
+Vec4f N(triggerCoord_80243460) = { 0.0f, 0.0f, 1.0f, 0.0f };
+
+FoliageModelList N(tree3_Leaves) = {
+    .count = 2,
+    .models = { 23, 24 }
+};
+
+FoliageModelList N(tree3_Trunk) = {
+    .count = 1,
+    .models = { 22 }
+};
+
+ShakeTreeConfig N(tree3) = {
+    .leaves = &N(tree3_Leaves),
+    .trunk = &N(tree3_Trunk),
+    .callback = &N(tree3_Callback),
+};
+
+Vec4f N(triggerCoord_80243498) = { 200.0f, 0.0f, 1.0f, 0.0f };
+
+Script N(802434A8) = SCRIPT({
+    SI_AREA_VAR(4) = 0;
+    SI_AREA_VAR(5) = 0;
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 15;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80243428);
+    SI_VAR(0) = N(tree2);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 16;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80243460);
+    SI_VAR(0) = N(tree3);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 17;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80243498);
+});
+
+NpcAISettings N(npcAISettings_802435B0) = {
+    .moveSpeed = 1.0f,
+    .moveTime = 500,
+    .waitTime = 10,
+    .alertRadius = 50.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 3.5f,
+    .unk_1C = { .s = 40 },
+    .unk_20 = 3,
+    .chaseRadius = 100.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_802435E0) = SCRIPT({
+    DoBasicAI(N(npcAISettings_802435B0));
+});
+
+NpcSettings N(npcSettings_80243600) = {
+    .height = 30,
+    .radius = 24,
+    .ai = &N(npcAI_802435E0),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+f32 N(D_8024362C_CB862C)[] = {
+     4.5f, 3.5f, 2.6f, 2.0f,
+     1.5f, 20.0f,
+};
+
+NpcAISettings N(npcAISettings_80243644) = {
+    .moveSpeed = 1.0f,
+    .moveTime = 30,
+    .waitTime = 5,
+    .alertRadius = 80.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 2,
+    .chaseSpeed = 4.5f,
+    .unk_1C = { .s = 6 },
+    .unk_20 = 1,
+    .chaseRadius = 90.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80243674) = SCRIPT({
+    SetSelfVar(0, 0);
+    SetSelfVar(5, -630);
+    SetSelfVar(6, 50);
+    SetSelfVar(1, 200);
+    N(func_8024162C_CB662C)(N(npcAISettings_80243644));
+});
+
+NpcSettings N(npcSettings_802436E4) = {
+    .height = 26,
+    .radius = 24,
+    .ai = &N(npcAI_80243674),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+NpcSettings N(npcSettings_80243710) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+Script N(npcAI_8024373C) = SCRIPT({
+    loop {
+        GetSelfVar(0, SI_VAR(0));
+        match SI_VAR(0) {
+            == 0 {
+                GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                if (SI_VAR(1) > 0) {
+                    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                    SetNpcJumpscale(NPC_SELF, 0);
+                    NpcJump0(NPC_SELF, SI_VAR(0), 50, SI_VAR(2), 15);
+                    SetSelfVar(0, 1);
+                    BindNpcAI(NPC_SELF, N(npcAI_80243674));
+                }
+            }
+            == 2 {
+                DisablePlayerInput(TRUE);
+                sleep 25;
+                SetNpcPos(NPC_SELF, 0, -1000, 0);
+                SetNpcFlagBits(NPC_SELF, ((0x00000002)), FALSE);
+                SetSelfVar(0, 0);
+                DisablePlayerInput(FALSE);
+            }
+        }
+        sleep 1;
+    }
+});
+
+Script N(defeat_802438C8) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            SetSelfVar(0, 2);
+            BindNpcAI(NPC_SELF, N(npcAI_8024373C));
+            DoNpcDefeat();
+        }
+        == 1 {}
+        == 2 {
+        }
+    }
+});
+
+Script N(init_80243954) = SCRIPT({
+    BindNpcIdle(NPC_SELF, N(npcAI_8024373C));
+    BindNpcDefeat(NPC_SELF, N(defeat_802438C8));
+});
+
+StaticNpc N(npcGroup_8024398C) = {
+    .id = NPC_DAYZEE0,
+    .settings = &N(npcSettings_80243600),
+    .pos = { -350.0f, 0.0f, 40.0f },
+    .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { -350, 0, 40, 30, 0, -32767, 0, -350, 0, 40, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80243B7C) = {
+    .id = NPC_DAYZEE1,
+    .settings = &N(npcSettings_80243600),
+    .pos = { 260.0f, 0.0f, 75.0f },
+    .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .movement = { 260, 0, 75, 30, 0, -32767, 0, 260, 0, 75, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80243D6C) = {
+    .id = NPC_BZZAP0,
+    .settings = &N(npcSettings_802436E4),
+    .pos = { -50.0f, 55.0f, 90.0f },
+    .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .minCoinBonus = 1,
+    .maxCoinBonus = 4,
+    .movement = { -50, 55, 90, 30, 0, -32767, 0, -50, 50, 90, 250, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_4),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80243F5C) = {
+    .id = NPC_BZZAP1,
+    .settings = &N(npcSettings_80243710),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .init = &N(init_80243954),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .minCoinBonus = 1,
+    .maxCoinBonus = 4,
+    .movement = { -50, 55, 90, 100, 0, -32767, 0, -50, 50, 90, 250, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_4),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_8024414C) = {
+    NPC_GROUP(N(npcGroup_8024398C), BATTLE_ID(24, 16, 0, 5)),
+    NPC_GROUP(N(npcGroup_80243B7C), BATTLE_ID(24, 21, 0, 5)),
+    NPC_GROUP(N(npcGroup_80243D6C), BATTLE_ID(24, 23, 0, 2)),
+    NPC_GROUP(N(npcGroup_80243F5C), BATTLE_ID(24, 23, 0, 2)),
+    {},
+};
+
diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c
index f73a25dedb..9ac9ea7700 100644
--- a/src/world/area_flo/flo_09/CB5320.c
+++ b/src/world/area_flo/flo_09/CB5320.c
@@ -1,7 +1,5 @@
 #include "flo_09.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240320_CB5320);
-/*
 void N(func_80240320_CB5320)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -25,9 +23,154 @@ void N(func_80240320_CB5320)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     script->functionTemp[0].s = 1;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_802404D0_CB54D0);
+#ifdef NON_MATCHING
+void N(func_802404D0_CB54D0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 temp_f24;
+    f32 posX, posY, posZ, posW;
+    s32 var;
+    f32 temp_f0;
+    f32 phi_f4;
+    s32 phi_v0;
+    s32 phi_s4 = 0;
+
+    f32 a = enemy->varTable[7];
+    f32 temp_f2  = a / 100.0;
+    f32 b = enemy->varTable[3];
+    f32 temp_f26 = b / 100.0;
+    f32 c = enemy->varTable[4];
+    f32 temp_f20 = c / 100.0;
+    f32 d = enemy->varTable[1];
+    f32 temp_f22 = d / 100.0;
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    temp_f24 = temp_f26 + temp_f2;
+
+    if ((enemy->varTable[0] & 0x11) == 1) {
+        if (npc->flags & 8) {
+            if (temp_f22 < (temp_f24 - npc->pos.y)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            if (temp_f22 < (temp_f26 - posW)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        }
+    }
+
+    if ((enemy->varTable[0] & 0x11) == 0x11) {
+        // original m2c reference:
+        //if ((temp_s0->flags & 8) != 0) {
+        //    phi_f0 = temp_f20 + ((temp_f24 - temp_f20) * D_802441A8_CB91A8);
+        //    phi_f4 = temp_f24;
+        //} else {
+        //    func_800DCB7C(temp_s0->unk_80, &subroutine_argA, &subroutine_argB, &subroutine_argC, &subroutine_argD, temp_s0->pos.x, temp_f20, temp_s0->pos.z, 1000.0f);
+        //    temp_f4 = subroutine_argB + temp_f26;
+        //    phi_f0 = temp_f20 + ((temp_f4 - temp_f20) * D_802441B0_CB91B0);
+        //    phi_f4 = temp_f4;
+        //}
+        //temp_s0->pos.y = phi_f0;
+
+        f64 test;
+        if (npc->flags & 8) {
+            phi_f4 = temp_f24;
+            npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        } else {
+            posX = npc->pos.x;
+            posY = temp_f20;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            phi_f4 = posY + temp_f26;
+            npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        }
+
+        if (fabsf(phi_f4 - npc->pos.y) < 1.0) {
+            npc->pos.y = phi_f4;
+            enemy->varTable[0] &= ~0x10;
+        }
+    } else if (enemy->varTable[1] > 0) {
+        temp_f0 = sin_deg(enemy->varTable[2]);
+        if (npc->flags & 8) {
+            phi_v0 = FALSE;
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+        }
+        if (phi_v0) {
+            npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22);
+        } else {
+            npc->pos.y = temp_f24 + (temp_f0 * temp_f22);
+        }
+        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
+    }
+
+    if (enemy->varTable[9] <= 0) {
+        if (aiSettings->unk_14 >= 0) {
+            if (script->functionTemp[1].s <= 0) {
+                script->functionTemp[1].s = aiSettings->unk_14;
+                if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
+                    func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
+                    fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
+                    npc->moveToPos.y = npc->pos.y;
+                    func_800494C0(npc, 0x2F4, 0x200000);
+                    if (enemy->npcSettings->unk_2A & 1) {
+                        script->functionTemp[0].s = 10;
+                    } else {
+                        script->functionTemp[0].s = 12;
+                    }
+                    return;
+                }
+            }
+            script->functionTemp[1].s--;
+        }
+    } else {
+        enemy->varTable[9]--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape,
+            enemy->territory->wander.point.x, enemy->territory->wander.point.z,
+            npc->pos.x, npc->pos.z,
+            enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) {
+        posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z);
+        if (npc->moveSpeed < posW) {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+            phi_s4 = 1;
+        }
+    }
+
+    if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        } else {
+            return;
+        }
+    }
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    if (aiSettings->moveTime > 0) {
+        if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+            script->functionTemp[0].s = 2;
+            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
+                script->functionTemp[0].s = 0;
+            }
+        }
+    }
+}
+#else
+INCLUDE_ASM(ApiStatus, "world/area_flo/flo_09/CB5320", flo_09_func_802404D0_CB54D0, ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory);
+#endif
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
@@ -35,18 +178,15 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_802404D0_CB54D0);
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240F74_CB5F74);
-/*
 void N(func_80240F74_CB5F74)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_8024362C_CB862C)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
 }
-*/
 
 #include "world/common/UnkNpcAIFunc14.inc.c"
 
@@ -56,4 +196,60 @@ void N(func_80240F74_CB5F74)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkFunc5.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_8024162C_CB662C);
+ApiStatus N(func_8024162C_CB662C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Bytecode* args = script->ptrReadPos;
+    Npc *npc = get_npc_unsafe(enemy->npcID);
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++);
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 120.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall) {
+        N(UnkFunc5)(npc, enemy, script, npcAISettings);
+    }
+    npc->unk_AB = -2;
+
+    if (enemy->unk_B0 & 4) {
+        if (enemy->unk_B4 != 0) {
+            return ApiStatus_BLOCK;
+        }
+        enemy->unk_B0 &= ~4;
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            N(func_80240320_CB5320)(script, npcAISettings, territoryPtr);
+        case 1:
+            N(func_802404D0_CB54D0)(script, npcAISettings, territoryPtr);
+            break;
+        case 2:
+            N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr);
+        case 3:
+            N(UnkFunc4)(script, npcAISettings, territoryPtr);
+            break;
+        case 10:
+            N(UnkNpcAIFunc2)(script, npcAISettings, territoryPtr);
+        case 11:
+            N(func_80240F74_CB5F74)(script, npcAISettings, territoryPtr);
+            break;
+        case 12:
+            N(UnkNpcAIFunc14)(script, npcAISettings, territoryPtr);
+            break;
+        case 13:
+            N(UnkNpcAIFunc3)(script, npcAISettings, territoryPtr);
+            break;
+        case 14:
+            N(UnkFunc6)(script, npcAISettings, territoryPtr);
+    }
+
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_flo/flo_09/flo_09.h b/src/world/area_flo/flo_09/flo_09.h
index 11c9154974..012fe1c845 100644
--- a/src/world/area_flo/flo_09/flo_09.h
+++ b/src/world/area_flo/flo_09/flo_09.h
@@ -2,3 +2,14 @@
 #include "map.h"
 
 #define NAMESPACE flo_09
+
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CB5000)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc43)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024162C_CB662C)(ScriptInstance* script, s32 isInitialCall);
+
+extern f32 N(D_8024362C_CB862C)[];
+extern NpcGroupList N(npcGroupList_8024414C);
+extern Script N(802425DC);
+extern Script N(802434A8);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_10/CB9200.c b/src/world/area_flo/flo_10/CB9200.c
index dcfe29430d..a1e501ea8e 100644
--- a/src/world/area_flo/flo_10/CB9200.c
+++ b/src/world/area_flo/flo_10/CB9200.c
@@ -1,3 +1,8 @@
 #include "flo_10.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9200", func_80240000_CB9200);
+s32 N(func_80240000_CB9200)(void) {
+    if (get_variable(NULL, SI_SAVE_VAR(0)) <= 0x30) {
+        return MESSAGE_ID(0x19, 0x0119);
+    }
+    return MESSAGE_ID(0x19, 0x011A);
+}
diff --git a/src/world/area_flo/flo_10/CB9240.c b/src/world/area_flo/flo_10/CB9240.c
index 36e293f3de..47cb1ead9f 100644
--- a/src/world/area_flo/flo_10/CB9240.c
+++ b/src/world/area_flo/flo_10/CB9240.c
@@ -1,3 +1,8 @@
 #include "flo_10.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9240", func_80240040_CB9240);
+void func_80072950();
+
+ApiStatus N(func_80240040_CB9240)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c
index 10885ee98b..fe59489f3e 100644
--- a/src/world/area_flo/flo_10/CB9280.c
+++ b/src/world/area_flo/flo_10/CB9280.c
@@ -1,29 +1,827 @@
 #include "flo_10.h"
+#include "message_ids.h"
+#include "sprite/npc/lily.h"
+
+enum {
+    NPC_LILY,
+};
+
+EntryList N(entryList) = {
+    { -360.0f,   0.0f,    0.0f,  90.0f },
+    { -360.0f,   0.0f,    0.0f,  90.0f },
+    { -100.0f, -10.0f, -172.0f, 135.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = N(func_80240000_CB9200),
+};
+
+Script N(802414E0) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
+    } else {
+        match STORY_PROGRESS {
+            < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+            }
+            else {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+            }
+        }
+    }
+    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+        PlaySound(0x80000022);
+    }
+});
+
+Script N(802415C4) = SCRIPT({
+    func_802D5FF8(137, 2);
+});
+
+Script N(802415E8) = SCRIPT({
+    FadeOutMusic(0, 250);
+    sleep 10;
+    func_802D5FD8();
+});
+
+static s32 N(pad_1624)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80241630) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+        MakeItemEntity(ITEM_WATER_STONE, 0, -60, 6, 1, 0);
+    }
+});
+
+static s32 N(pad_167C) = {
+    0x00000000,
+};
+
+Script N(80241680) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_8024192C) = EXIT_WALK_SCRIPT(60,  0, "flo_24",  1);
+
+Script N(80241988) = SCRIPT({
+    bind N(exitWalk_8024192C) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80244054));
+    await N(80241630);
+    spawn N(80244A50);
+    spawn N(802435F8);
+    spawn N(80242AE8);
+    spawn N(80244074);
+    ModifyColliderFlags(3, 11, 0x00000006);
+    ModifyColliderFlags(3, 12, 0x00000006);
+    SI_VAR(0) = -265;
+    SI_VAR(1) = 247;
+    SI_VAR(2) = 199;
+    SI_VAR(3) = 313;
+    SI_VAR(4) = 0;
+    spawn N(80241680);
+    SI_VAR(0) = -300;
+    SI_VAR(1) = -275;
+    SI_VAR(2) = -140;
+    SI_VAR(3) = -185;
+    SI_VAR(4) = 0;
+    spawn N(80241680);
+    SI_VAR(0) = 263;
+    SI_VAR(1) = -248;
+    SI_VAR(2) = 362;
+    SI_VAR(3) = 146;
+    SI_VAR(4) = 0;
+    spawn N(80241680);
+    GetEntryID(SI_VAR(0));
+    match SI_VAR(0) {
+        == 1 {
+            spawn N(8024324C);
+        }
+        == 2 {
+            spawn N(802427EC);
+            spawn N(80241988);
+        }
+        else {
+            ModifyColliderFlags(0, 1, 0x7FFFFE00);
+            SI_VAR(0) = N(80241988);
+            spawn EnterWalk;
+        }
+    }
+    await N(802414E0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240040_CB9240)();
+    }
+});
+
+static s32 N(pad_1CA8)[] = {
+    0x00000000, 0x00000000,
+};
+
+s32** N(D_80241CB0_CBAEB0) = NULL;
+
+Script N(80241CB4) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 0);
+    return;
+});
+
+Script N(80241CE4) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 16);
+    return;
+});
+
+Script N(updateTexturePan_80241D14) = SCRIPT({
+    group 0;
+    if (SI_VAR(5) == 1) {
+        if (SI_VAR(6) == 1) {
+            if (SI_VAR(7) == 1) {
+                if (SI_VAR(8) == 1) {
+                    N(UnkTexturePanFunc)();
+                    return;
+                }
+            }
+        }
+    }
+    N(UnkTexturePanFunc2)();
+});
+
+Script N(80241DB0) = SCRIPT({
+    MakeLerp(-50, 170, 385, 0);
+1:
+    UpdateLerp();
+    TranslateGroup(56, 0, SI_VAR(0), 0);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+});
+
+Script N(80241E40) = SCRIPT({
+    MakeLerp(0, 100, 90, 1);
+1:
+    UpdateLerp();
+    SI_VAR(2) = (float) SI_VAR(0);
+    SI_VAR(3) = (float) SI_VAR(0);
+    SI_VAR(2) /= 333.0;
+    SI_VAR(3) /= 100.0;
+    SI_VAR(2) += 0.703125;
+    ScaleGroup(56, SI_VAR(2), SI_VAR(3), SI_VAR(2));
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+});
+
+Script N(80241F20) = SCRIPT({
+    EnableTexPanning(53, 1);
+    spawn {
+        SI_VAR(0) = 10;
+        SI_VAR(1) = -150;
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80241D14);
+    }
+});
+
+Script N(80242030) = SCRIPT({
+    sleep 60;
+    EnableModel(53, 1);
+    spawn N(80241F20);
+});
+
+Script N(8024206C) = SCRIPT({
+    sleep 80;
+    EnableNpcShadow(NPC_LILY, FALSE);
+    GetNpcPos(NPC_LILY, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    MakeLerp(10, 55, 108, 0);
+    loop {
+        UpdateLerp();
+        SI_VAR(6) = SI_VAR(4);
+        SI_VAR(6) += SI_VAR(0);
+        SI_VAR(6) += -10;
+        SetNpcPos(NPC_LILY, SI_VAR(3), SI_VAR(6), SI_VAR(5));
+        TranslateGroup(60, 0, SI_VAR(0), 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+});
+
+Script N(80242188) = SCRIPT({
+    DisablePlayerPhysics(TRUE);
+    sleep 40;
+    SetPlayerAnimation(0x80024);
+    GetPlayerPos(SI_VAR(2), SI_VAR(0), SI_VAR(3));
+    MakeLerp(-50, 90, 60, 1);
+    loop {
+        UpdateLerp();
+        SI_VAR(2) /= 1.2001953125;
+        SI_VAR(3) /= 1.2001953125;
+        SetPlayerPos(SI_VAR(2), SI_VAR(0), SI_VAR(3));
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    MakeLerp(90, 270, 280, 0);
+    loop {
+        UpdateLerp();
+        SetPlayerPos(0, SI_VAR(0), 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    DisablePlayerPhysics(FALSE);
+});
+
+Script N(8024230C) = SCRIPT({
+    sleep 80;
+    GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    UseSettingsFrom(0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    SetPanTarget(0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    SetCamSpeed(0, 0.7001953125);
+    SetCamPitch(0, 25.0, -22.0);
+    SetCamDistance(0, 450);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+});
+
+Script N(802423E4) = SCRIPT({
+    DisablePartnerAI(0);
+    spawn N(80241DB0);
+    spawn N(80241E40);
+    spawn N(80242030);
+    spawn N(8024206C);
+    spawn N(80242188);
+    spawn N(8024230C);
+});
+
+Script N(8024244C) = SCRIPT({
+    MakeLerp(170, 75, 150, 0);
+1:
+    UpdateLerp();
+    TranslateGroup(56, 0, SI_VAR(0), 0);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+});
+
+Script N(802424DC) = SCRIPT({
+    MakeLerp(100, 15, 150, 1);
+1:
+    UpdateLerp();
+    SI_VAR(2) = (float) SI_VAR(0);
+    SI_VAR(3) = (float) SI_VAR(0);
+    SI_VAR(2) /= 333.0;
+    SI_VAR(3) /= 100.0;
+    SI_VAR(2) += 0.703125;
+    ScaleGroup(56, SI_VAR(2), SI_VAR(3), SI_VAR(2));
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+});
+
+Script N(802425BC) = SCRIPT({
+    spawn N(8024244C);
+    spawn N(802424DC);
+});
+
+const char N(flo_24_name_hack)[];
+
+Script N(802425E4) = SCRIPT({
+    sleep 20;
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    UseSettingsFrom(0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    SetPanTarget(0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    SetCamSpeed(0, 1.0);
+    SetCamDistance(0, 600);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    EnableGroup(56, 1);
+    TranslateGroup(56, 0, -50, 0);
+    ScaleGroup(56, 0, 0, 0);
+    EnableGroup(60, 1);
+    await N(802423E4);
+    sleep 20;
+    PlaySound(0x80000024);
+    sleep 360;
+    InterpPlayerYaw(90, 0);
+    SetPlayerAnimation(ANIM_80017);
+    SetPlayerJumpscale(0.2001953125);
+    PlayerJump1(-100, -10, -172, 75);
+    ShakeCam(0, 0, 5, 1.0);
+    await N(802425BC);
+    sleep 60;
+    GotoMap(N(flo_24_name_hack), 2);
+    sleep 100;
+});
+
+Script N(802427EC) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    SetPlayerPos(-100, -10, -172);
+    InterpPlayerYaw(150, 0);
+    SetPlayerAnimation(ANIM_DEAD_STILL);
+    SetNpcPos(NPC_PARTNER, -129, 9, -177);
+    EnablePartnerAI();
+    ClearPartnerMoveHistory(-4);
+    EnableGroup(52, 1);
+    EnableGroup(19, 0);
+    EnableGroup(61, 0);
+    EnableGroup(60, 0);
+    SetNpcPos(NPC_LILY, -57, -20, -105);
+    InterpNpcYaw(NPC_LILY, 90, 0);
+    AdjustCam(0, 90.0, 0, 450, 25.0, -6.0);
+    sleep 30;
+    SetPlayerAnimation(ANIM_GET_UP);
+    sleep 20;
+    SetPlayerAnimation(ANIM_10002);
+    sleep 10;
+    await N(802415C4);
+    sleep 10;
+    SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x0082));
+    NpcFacePlayer(NPC_LILY, 1);
+    SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x0083));
+    SetNpcAnimation(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_6));
+    sleep 20;
+    SetNpcAnimation(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_1));
+    SI_VAR(0) = 90;
+    SI_VAR(1) = 1;
+    await N(80241CB4);
+    AddKeyItem(ITEM_MIRACLE_WATER);
+    SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x0084));
+    EndSpeech(0, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0);
+    SetNpcAnimation(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_1));
+    ResetCam(0, 4.0);
+    await N(802415E8);
+    DisablePlayerPhysics(FALSE);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80242AE8) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_FILLED_SPRING_WITH_WATER) {
+        EnableGroup(52, 0);
+        EnableGroup(61, 0);
+        ModifyColliderFlags(0, 21, 0x7FFFFE00);
+    } else {
+        EnableGroup(19, 0);
+        EnableGroup(61, 0);
+        EnableGroup(60, 0);
+        ModifyColliderFlags(0, 14, 0x7FFFFE00);
+        ModifyColliderFlags(0, 15, 0x7FFFFE00);
+        ModifyColliderFlags(0, 16, 0x7FFFFE00);
+        ModifyColliderFlags(0, 17, 0x7FFFFE00);
+    }
+    EnableTexPanning(54, 1);
+    EnableTexPanning(48, 1);
+    EnableTexPanning(55, 1);
+    EnableTexPanning(59, 1);
+    EnableTexPanning(49, 1);
+    EnableTexPanning(51, 1);
+    spawn {
+        SI_VAR(0) = 1;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -2000;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80241D14);
+    }
+    spawn {
+        SI_VAR(0) = 3;
+        SI_VAR(1) = -100;
+        SI_VAR(2) = 80;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80241D14);
+    }
+    spawn {
+        SI_VAR(0) = 5;
+        SI_VAR(1) = -1000;
+        SI_VAR(2) = 2000;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80241D14);
+    }
+    spawn {
+        SI_VAR(0) = 6;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -2000;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80241D14);
+    }
+    spawn {
+        SI_VAR(0) = 8;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -1500;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80241D14);
+    }
+    spawn {
+        SI_VAR(0) = 9;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -1000;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80241D14);
+    }
+    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+        spawn N(80241F20);
+    }
+});
+
+static s32 N(pad_3218)[] = {
+    0x00000000, 0x00000000,
+};
+
+NpcSettings N(npcSettings_80243220) = {
+    .height = 45,
+    .radius = 65,
+    .level = 99,
+};
+
+const char N(flo_24_name_hack)[] = "flo_24";
+
+Script N(8024324C) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    SetNpcPos(NPC_LILY, 60, 0, 55);
+    UseSettingsFrom(0, 0, 0, 0);
+    SetPanTarget(0, 0, 0, 0);
+    SetCamDistance(0, 450);
+    SetCamPitch(0, 17.0, -6.0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 20;
+    SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00C6));
+    sleep 10;
+    GotoMap("flo_12", 1);
+    sleep 100;
+});
+
+s32 N(itemList_80243394)[] = {
+    ITEM_WATER_STONE,
+    ITEM_NONE,
+};
+
+Script N(8024339C) = SCRIPT({
+    if (SI_SAVE_FLAG(1376) == 1) {
+        GetCurrentPartner(SI_VAR(10));
+        if (SI_VAR(10) != 0) {
+            AwaitPlayerLeave(0, 0, 19);
+            return;
+        }
+        DisablePlayerInput(TRUE);
+        group 0;
+        func_802D5830(1);
+        func_802D6420();
+        SI_VAR(2) = SI_VAR(0);
+        match SI_VAR(2) {
+            == -1 {
+                func_802D6954();
+                func_802D5830(0);
+                sleep 10;
+                SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x0081));
+            }
+            else {
+                GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+                PlayerMoveTo(-17, -17, 20);
+                func_802CF56C(2);
+                InterpPlayerYaw(100, 1);
+                sleep 10;
+                AdjustCam(0, 1.0, 0, 450, 25.0, -6.0);
+                sleep 10;
+                SetPlayerAnimation(0x60006);
+                RemoveKeyItemAt(SI_VAR(1));
+                MakeItemEntity(ITEM_WATER_STONE, 0, -60, 6, 1, 0);
+                SI_VAR(10) = SI_VAR(0);
+                func_802D6954();
+                func_802D5830(0);
+                await N(802425E4);
+            }
+        }
+        DisablePlayerInput(FALSE);
+        AwaitPlayerLeave(0, 0, 19);
+    }
+});
+
+Script N(802435F8) = {
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(8024339C), TRIGGER_FLOOR_TOUCH, 15, N(itemList_80243394), 0, 1),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(80243628) = SCRIPT({
+    sleep 10;
+    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    if (SI_VAR(5) < SI_VAR(2)) {
+        SI_VAR(6) = 30;
+    } else {
+        SI_VAR(6) = 20;
+    }
+    SI_VAR(1) = SI_VAR(0);
+    SI_VAR(4) = SI_VAR(0);
+    SI_VAR(1) -= SI_VAR(6);
+    SI_VAR(4) += SI_VAR(6);
+    match SI_VAR(3) {
+    SI_VAR(1)..SI_VAR(4) {
+            spawn {
+                if (SI_VAR(3) < SI_VAR(0)) {
+                    SI_VAR(0) -= 40;
+                } else {
+                    SI_VAR(0) += 40;
+                }
+                SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE);
+                PlayerMoveTo(SI_VAR(0), SI_VAR(5), 15);
+                PlayerFaceNpc(0, 1);
+                SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), FALSE);
+            }
+        }
+    }
+});
+
+Script N(interact_802437C8) = SCRIPT({
+    await N(802415C4);
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_MAGICAL_BEAN {
+            spawn N(80243628);
+            GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 325);
+            SetCamPitch(0, 23.0, -9.0);
+            SetCamSpeed(0, 4.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            sleep 10;
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 5, MESSAGE_ID(0x11, 0x0078));
+            EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_9), NPC_ANIM(lily, Palette_00, Anim_5), 5);
+        }
+        < STORY_CH6_GOT_WATER_STONE {
+            if (SI_SAVE_FLAG(1375) == 0) {
+                spawn N(80243628);
+                GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SetCamDistance(0, 325);
+                SetCamPitch(0, 23.0, -9.0);
+                SetCamSpeed(0, 4.0);
+                PanToTarget(0, 0, 1);
+                WaitForCam(0, 1.0);
+                sleep 10;
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 5, MESSAGE_ID(0x11, 0x0079));
+                NpcFacePlayer(NPC_SELF, 1);
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_1));
+                PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_262, 0);
+                ShowEmote(-1, EMOTE_EXCLAMATION, 0, 15, 1, 0, 0, 0, 0);
+                sleep 15;
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_1), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x007A));
+                EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_5), NPC_ANIM(lily, Palette_00, Anim_1), 0);
+                GetPlayerTargetYaw(SI_VAR(0));
+                InterpNpcYaw(NPC_SELF, SI_VAR(0), 1);
+                sleep 20;
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x007B));
+                NpcFacePlayer(NPC_SELF, 1);
+                sleep 20;
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x007C));
+                ShowChoice(MESSAGE_ID(0x1E, 0x0011));
+                sleep 10;
+                match SI_VAR(0) {
+                    == 0 {
+                        ContinueSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x007D));
+                    }
+                    == 1 {
+                        ContinueSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x007E));
+                    }
+                }
+                sleep 10;
+                SI_SAVE_FLAG(1375) = 1;
+                SetEnemyFlagBits(-1, 4194304, 0);
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 5, MESSAGE_ID(0x11, 0x007F));
+            }
+        }
+        < 49 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0080));
+            SI_SAVE_FLAG(1376) = 1;
+        }
+        < 53 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x0085));
+            EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0);
+            EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0);
+        }
+        < 60 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x0086));
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0087));
+        }
+    }
+    ResetCam(0, 4.0);
+    await N(802415E8);
+});
+
+Script N(init_80243D78) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_802437C8));
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_WATER_STONE {
+            if (SI_SAVE_FLAG(1375) == 0) {
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_8));
+                InterpNpcYaw(NPC_SELF, 90, 1);
+                SetEnemyFlagBits(-1, 4194304, 1);
+            }
+        }
+        == STORY_CH6_GOT_WATER_STONE {
+            InterpNpcYaw(NPC_SELF, 270, 1);
+        }
+        >= STORY_CH6_FILLED_SPRING_WITH_WATER {
+            SetNpcPos(NPC_SELF, -67, -20, -105);
+        }
+    }
+});
+
+StaticNpc N(npcGroup_80243E64) = {
+    .id = NPC_LILY,
+    .settings = &N(npcSettings_80243220),
+    .pos = { 80.0f, -60.0f, 0.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80243D78),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+        NPC_ANIM(lily, Palette_00, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00DF),
+};
+
+NpcGroupList N(npcGroupList_80244054) = {
+    NPC_GROUP(N(npcGroup_80243E64), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+static s32 N(pad_406C) = {
+    0x00000000,
+};
+
+s32 N(D_80244070_CBD270) = {
+    0x00000000,
+};
+
+Script N(80244074) = SCRIPT({
+
+});
+
+static s32 N(pad_4084)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
 
-INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240080_CB9280);
-/*
 ApiStatus N(func_80240080_CB9280)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241CB0_CBAEB0) == NULL) {
+        N(D_80241CB0_CBAEB0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241CB0_CBAEB0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241CB0_CBAEB0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241CB0_CBAEB0));
+        N(D_80241CB0_CBAEB0) = NULL;
     }
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/GetItemName.inc.c"
 
diff --git a/src/world/area_flo/flo_10/CB96B0.c b/src/world/area_flo/flo_10/CB96B0.c
index 3b5deeddf0..83f5788a5a 100644
--- a/src/world/area_flo/flo_10/CB96B0.c
+++ b/src/world/area_flo/flo_10/CB96B0.c
@@ -1,5 +1,314 @@
 #include "flo_10.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_10/CB96B0", func_802404B0_CB96B0);
+extern u16* nuGfxZBuffer;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_10/CB96B0", func_80240A98_CB9C98);
+// in no way close at all, may as well start over
+// good luck have fun
+#ifdef NON_MATCHING
+void N(func_802404B0_CB96B0)(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
+    s32 i;
+    s32 phi_a3;
+    s32 temp_s2_2;
+    s32 temp_v0_2;
+    s32 temp_a2_3;
+    s32 phi_s3;
+    s32 phi_s4;
+    s32 phi_s5;
+    s32 phi_s6;
+    s32 phi_s7;
+    s32 phi_a2;
+
+    s32 subroutine_arg4;
+    s32 subroutine_arg5;
+    s32 subroutine_arg6;
+
+    N(D_80244070_CBD270) += 5;
+    if ((arg0 < arg2) && (arg1 < arg3)) {
+        if (arg0 < 0) {
+            phi_s6 = 0;
+        } else {
+            phi_s6 = arg0;
+        }
+
+        if (arg1 < 0) {
+            arg1 = 0;
+        }
+
+        phi_s4 = arg2;
+        if (arg2 < 0) {
+            phi_s4 = 0;
+        }
+
+        phi_a3 = arg3;
+        if (arg3 < 0) {
+            phi_a3 = 0;
+        }
+
+        if (phi_s6 >= 0x140) {
+            phi_s6 = 0x13F;
+        }
+        if (arg1 >= 0xF0) {
+            arg1 = 0xEF;
+        }
+        if (phi_s4 >= 0x140) {
+            phi_s4 = 0x13F;
+        }
+        if (phi_a3 >= 0xF0) {
+            phi_a3 = 0xEF;
+        }
+
+        if ((phi_s6 != phi_s4) && (arg1 != phi_a3)) {
+            if (phi_s6 < 0) {
+                phi_s6 += 3;
+            }
+            phi_s6 = (phi_s6 >> 2) * 4;
+
+            if (phi_s4 < 0) {
+                phi_s4 += 3;
+            }
+            subroutine_arg5 = phi_s4 / 6;
+            subroutine_arg4 = phi_s4 / 6;
+            subroutine_arg6 = D_8009A64C;
+
+            for (i = 0; i < subroutine_arg4; i++) {
+                phi_s5 = arg1 - ((i + 1) * 6);
+                phi_s7 = arg1 + ((i + 1) * 6);
+
+                if (phi_s5 >= 0) {
+                    phi_a2 = phi_s5 * 2;
+                    if (phi_a2 >= 0x100) {
+                        phi_a2 = 0xFF;
+                    }
+
+                    gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, phi_a2);
+                    gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(subroutine_arg6));
+
+                    gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, (phi_s4 - phi_s6) / 6, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOLOD);
+                    gDPLoadSync(gMasterGfxPos++);
+
+                    gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, phi_s6 * 4, phi_s5 * 4, (phi_s4 - 1) * 4, (phi_s5 - 1) * 4);
+
+                    gDPPipeSync(gMasterGfxPos++);
+                    gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, phi_s4 - phi_s6, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOLOD);
+
+                    gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, phi_s6 * 4, phi_s5 * 4, (phi_s4 - 1) * 4, (phi_s5 - 1) * 4);
+
+                    gSPTextureRectangle(gMasterGfxPos++,
+                            (phi_s4 - 1) * 4, (phi_s5 - 1) * 4, phi_s6 * 4, phi_s5 * 4,
+                            G_TX_RENDERTILE,
+                            phi_s6, phi_s5,
+                            0x0400, (sin_deg(N(D_80244070_CBD270) + (i * 30)) * 500.0f) - 0x1F4);
+                }
+            }
+
+            if (subroutine_arg5 != 0) {
+                temp_s2_2 = arg1 - (i * 6);
+                temp_v0_2 = temp_s2_2 - 6;
+                temp_a2_3 = temp_v0_2 * 2;
+                if (temp_v0_2 >= 0) {
+                    phi_a2 = temp_a2_3;
+                    if (temp_a2_3 >= 0x100) {
+                        phi_a2 = 0xFF;
+                    }
+
+                    gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, phi_a2);
+                    gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(subroutine_arg6));
+                    gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, (phi_s4 - phi_s6) / 6, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOLOD);
+                    gDPLoadSync(gMasterGfxPos++);
+
+                    gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, phi_s6 * 4, (temp_s2_2 - subroutine_arg5) * 4, (phi_s4 - 1) * 4, (temp_s2_2 - 1) * 4);
+                    gDPPipeSync(gMasterGfxPos++);
+                    gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, (phi_s4 - phi_s6) / 6, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 9, G_TX_NOLOD);
+                    gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, (phi_s4 - 1) * 4, (temp_s2_2 - subroutine_arg5) * 4, phi_s6 * 4, (temp_s2_2 - subroutine_arg5) * 4);
+                    gSPTextureRectangle(gMasterGfxPos++, phi_s6 * 4, arg1 + (i * 6), phi_s4 * 4, ((arg1 + (i * 6)) + subroutine_arg5) * 4, G_TX_RENDERTILE, phi_s6, temp_s2_2, 0x0400, -0x0400);
+                }
+            }
+        }
+    }
+}
+#else
+INCLUDE_ASM(void, "world/area_flo/flo_10/CB96B0", flo_10_func_802404B0_CB96B0, s32 arg0, s32 arg1, s32 arg2, s32 arg3);
+#endif
+
+typedef struct {
+    /* 0x00 */ char unk_00[0x4];
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ char unk_08[0x14];
+    /* 0x1C */ s32 unk_1C;
+} N(UnkStruct2);
+
+typedef struct {
+    /* 0x00 */ char unk_00[0xC];
+    /* 0x0C */ N(UnkStruct2)* unk_0C;
+} N(UnkStruct);
+
+void N(func_80240A98_CB9C98)(void) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+    Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(0x30));
+    // modelNode propertylist? Causes too many derefences and conflicts with the modelNode load below
+    N(UnkStruct2)* unk1 = ((N(UnkStruct)*)model->modelNode)->unk_0C;
+    f32 temp_f24;
+    f32 temp_f26;
+    f32 temp_f20;
+    f32 temp_f22;
+    s32 test;
+
+    f32 sp3C;
+    f32 sp38;
+    f32 sp34;
+    f32 sp30;
+    f32 sp2C;
+    f32 sp28;
+
+    sp3C = unk1->unk_04;
+    sp38 = unk1->unk_1C;
+
+    transform_point(camera->perspectiveMatrix,
+                    model->center[0] - sp3C, model->center[1], model->center[2] - sp38, 1.0f,
+                    &sp28, &sp2C, &sp30, &sp34);
+
+    sp28 = sp28 * (1.0f / sp34);
+    sp2C = sp2C * -(1.0f / sp34);
+    sp30 = sp30 * (1.0f / sp34);
+    sp34 = (1.0f / sp34);
+
+    if (sp34 < 0.0f) {
+        sp28 = 0.0f;
+        sp2C = 1.0f;
+    }
+    temp_f20 = sp28;
+    temp_f22 = sp2C;
+
+    transform_point(camera->perspectiveMatrix,
+                    model->center[0] - sp3C, model->center[1], model->center[2] + sp38, 1.0f,
+                    &sp28, &sp2C, &sp30, &sp34);
+
+    sp28 = sp28 * (1.0f / sp34);
+    sp2C = sp2C * -(1.0f / sp34);
+    sp30 = sp30 * (1.0f / sp34);
+    sp34 = 1.0f / sp34;
+
+    temp_f24 = temp_f20;
+    temp_f26 = temp_f22;
+    if (sp34 < 0.0f) {
+        sp28 = 0.0f;
+        sp2C = 1.0f;
+    }
+
+    if (sp28 < temp_f20) {
+        temp_f24 = sp28;
+    }
+
+    if (sp2C < temp_f22) {
+        temp_f26 = sp2C;
+    }
+
+    if (temp_f20 < sp28) {
+        temp_f20 = sp28;
+    }
+
+    if (temp_f22 < sp2C) {
+        temp_f22 = sp2C;
+    }
+
+    transform_point(camera->perspectiveMatrix,
+                    model->center[0] + sp3C, model->center[1], model->center[2] + sp38, 1.0f,
+                    &sp28, &sp2C, &sp30, &sp34);
+
+    sp28 = sp28 * (1.0f / sp34);
+    sp2C = sp2C * -(1.0f / sp34);
+    sp30 = sp30 * (1.0f / sp34);
+    sp34 = (1.0f / sp34);
+
+    if (sp34 < 0.0f) {
+        sp28 = 1.0f;
+        sp2C = 1.0f;
+    }
+
+    if (sp28 < temp_f24) {
+        temp_f24 = sp28;
+    }
+
+    if (sp2C < temp_f26) {
+        temp_f26 = sp2C;
+    }
+
+    if (temp_f20 < sp28) {
+        temp_f20 = sp28;
+    }
+
+    if (temp_f22 < sp2C) {
+        temp_f22 = sp2C;
+    }
+
+    transform_point(camera->perspectiveMatrix,
+                    model->center[0] + sp3C, model->center[1], model->center[2] - sp38, 1.0f,
+                    &sp28, &sp2C, &sp30, &sp34);
+
+    sp28 = sp28 * (1.0f / sp34);
+    sp2C = sp2C * -(1.0f / sp34);
+    sp30 = sp30 * (1.0f / sp34);
+    sp34 = (1.0f / sp34);
+
+    if (sp34 < 0.0f) {
+        sp28 = 1.0f;
+        sp2C = 1.0f;
+    }
+
+    if (sp28 < temp_f24) {
+        temp_f24 = sp28;
+    }
+
+    if (sp2C < temp_f26) {
+        temp_f26 = sp2C;
+    }
+
+    if (temp_f20 < sp28) {
+        temp_f20 = sp28;
+    }
+
+    if (temp_f22 < sp2C) {
+        temp_f22 = sp2C;
+    }
+
+    if ((temp_f24 != temp_f20) || (temp_f26 != temp_f22)) {
+        temp_f24 = ((temp_f24 * camera->viewportW) + camera->viewportW) * 0.5f;
+        temp_f26 = ((temp_f26 * camera->viewportH) + camera->viewportH) * 0.5f;
+        temp_f20 = ((temp_f20 * camera->viewportW) + camera->viewportW) * 0.5f;
+        temp_f22 = ((temp_f22 * camera->viewportH) + camera->viewportH) * 0.5f;
+
+        temp_f24 += camera->viewportStartX;
+        temp_f26 += camera->viewportStartY;
+        temp_f20 += camera->viewportStartX;
+        temp_f22 += camera->viewportStartY;
+
+        gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE);
+        gDPSetRenderMode(gMasterGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1));
+        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(nuGfxZBuffer));
+        gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0);
+        gDPSetPrimColor(gMasterGfxPos++, 0, 0, 248, 240, 240, 0);
+        gDPPipeSync(gMasterGfxPos++);
+
+        gSPDisplayList(gMasterGfxPos++, model->modelNode[1]->type);
+        gDPPipeSync(gMasterGfxPos++);
+
+        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, osVirtualToPhysical(D_8009A64C));
+        gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM);
+        gDPSetPrimDepth(gMasterGfxPos++, 32734, 0);
+        gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2);
+        gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT);
+        gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE);
+        gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
+        gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE);
+        gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP);
+        gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE);
+        gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE);
+        gDPPipeSync(gMasterGfxPos++);
+
+        N(func_802404B0_CB96B0)(temp_f24, temp_f26, temp_f20, temp_f22);
+
+        gDPPipeSync(gMasterGfxPos++);
+        gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE);
+        gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL);
+    }
+}
diff --git a/src/world/area_flo/flo_10/CBA430.c b/src/world/area_flo/flo_10/CBA430.c
index 9fabc3813d..cd03a087bd 100644
--- a/src/world/area_flo/flo_10/CBA430.c
+++ b/src/world/area_flo/flo_10/CBA430.c
@@ -2,3 +2,38 @@
 
 #include "world/common/foliage.inc.c"
 
+FoliageModelList N(tree1_Leaves) = {
+    .count = 3,
+    .models = { 33, 34, 35 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 32 }
+};
+
+FoliageDropList N(tree1_Drops) = {
+    .count = 1,
+    .drops = {
+        {
+            .itemID = ITEM_JAMMIN_JELLY,
+            .pos = { 80, 100, -240 },
+            .spawnMode = 0xF,
+            .pickupFlag = SI_SAVE_FLAG(1383),
+        },
+    }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .drops = &N(tree1_Drops),
+};
+
+Vec4f N(triggerCoord_80244A40) = { 137.0f, 0.0f, -283.0f, 0.0f };
+
+Script N(80244A50) = SCRIPT({
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 9;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80244A40);
+});
diff --git a/src/world/area_flo/flo_10/flo_10.h b/src/world/area_flo/flo_10/flo_10.h
index 87af0241c9..976ff10f60 100644
--- a/src/world/area_flo/flo_10/flo_10.h
+++ b/src/world/area_flo/flo_10/flo_10.h
@@ -2,3 +2,20 @@
 #include "map.h"
 
 #define NAMESPACE flo_10
+
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall);
+s32 N(func_80240000_CB9200)(void);
+ApiStatus N(func_80240040_CB9240)(ScriptInstance* script, s32 isInitialCall);
+
+extern s32 N(D_80244070_CBD270);
+extern s32** N(D_80241CB0_CBAEB0);
+extern NpcGroupList N(npcGroupList_80244054);
+extern Script N(802427EC);
+extern Script N(80242AE8);
+extern Script N(8024324C);
+extern Script N(802435F8);
+extern Script N(80244074);
+extern Script N(80244A50);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c
index 17b2ac1c65..7513f18479 100644
--- a/src/world/area_flo/flo_11/CBDCD0.c
+++ b/src/world/area_flo/flo_11/CBDCD0.c
@@ -1,10 +1,845 @@
 #include "flo_11.h"
+#include "message_ids.h"
+#include "sprite/npc/lakitu.h"
+
+enum {
+    NPC_LAKITU0,
+    NPC_LAKITU1,
+};
+
+EntryList N(entryList) = {
+    {  470.0f,  0.0f,  -15.0f, 270.0f },
+    { -470.0f,  0.0f,  -15.0f,  90.0f },
+    {  360.0f, 50.0f, -237.0f, 270.0f },
+    {  118.0f, 50.0f, -420.0f, 270.0f },
+    {    0.0f, 50.0f,    0.0f, 270.0f },
+    { -120.0f, 50.0f,  357.0f,  90.0f },
+    { -360.0f, 50.0f, -240.0f,  90.0f },
+    { -360.0f, 35.0f,    0.0f,  90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_11_tattle },
+};
+
+Script N(802403E0) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(80240450) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(802406FC) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    DisablePartnerAI(0);
+    HidePlayerShadow(TRUE);
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        EnableNpcShadow(NPC_PARTNER, FALSE);
+        SetNpcPos(NPC_PARTNER, 0, -1000, 0);
+    }
+    GetEntryID(SI_VAR(0));
+    N(GetEntryPos)();
+    SI_VAR(2) -= 40;
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    InterpPlayerYaw(SI_VAR(4), 0);
+    PlaySound(0x163);
+    func_802D286C(256);
+    func_802D2520(ANIM_STAND_STILL, 5, 2, 1, 1, 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    loop 40 {
+        SI_VAR(1) += 1;
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+    }
+    sleep 3;
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        spawn {
+            DisablePartnerAI(0);
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(2) -= 3;
+            SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetNpcFlagBits(NPC_PARTNER, ((0x00000002)), FALSE);
+            EnablePartnerAI();
+            EnableNpcShadow(NPC_PARTNER, TRUE);
+        }
+    }
+    sleep 2;
+    func_802D2520(ANIM_STAND_STILL, 0, 0, 0, 0, 0);
+    sleep 1;
+    SetPlayerAnimation(ANIM_10002);
+    DisablePlayerPhysics(FALSE);
+    DisablePlayerInput(FALSE);
+    HidePlayerShadow(FALSE);
+0:
+    N(GetCurrentFloor)();
+    sleep 1;
+    if (SI_VAR(0) != -1) {
+        goto 0;
+    }
+    spawn 0xFE363C8A;
+});
+
+Script N(80240A50) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    HidePlayerShadow(TRUE);
+    ModifyColliderFlags(0, SI_VAR(11), 0x7FFFFE00);
+    GetEntryID(SI_VAR(0));
+    N(GetEntryPos)();
+    SI_VAR(5) = SI_VAR(1);
+    SI_VAR(6) = SI_VAR(2);
+    SI_VAR(7) = SI_VAR(3);
+    SI_VAR(2) += 2;
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    InterpPlayerYaw(SI_VAR(4), 0);
+    if (SI_VAR(4) == 90) {
+        SI_VAR(5) += 40;
+    } else {
+        SI_VAR(5) -= 40;
+    }
+    UseSettingsFrom(0, SI_VAR(5), SI_VAR(6), SI_VAR(7));
+    SetPanTarget(0, SI_VAR(5), SI_VAR(6), SI_VAR(7));
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        DisablePartnerAI(0);
+        EnableNpcShadow(NPC_PARTNER, FALSE);
+        SetNpcPos(NPC_PARTNER, 0, -1000, 0);
+        InterpNpcYaw(NPC_PARTNER, SI_VAR(0), 0);
+    }
+    sleep 1;
+    PlaySound(0x163);
+    spawn {
+        sleep 25;
+        HidePlayerShadow(FALSE);
+    }
+    func_802D286C(2304);
+    func_802D2520(ANIM_10002, 5, 3, 1, 1, 0);
+    loop 40 {
+        N(SomeXYZFunc2)(1.0);
+        SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+    }
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        spawn {
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(2) -= 3;
+            SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            EnableNpcShadow(NPC_PARTNER, TRUE);
+            EnablePartnerAI();
+        }
+    }
+    sleep 5;
+    func_802D2520(ANIM_10002, 0, 0, 0, 0, 0);
+    ModifyColliderFlags(1, SI_VAR(11), 0x7FFFFE00);
+    DisablePlayerInput(FALSE);
+    DisablePlayerPhysics(FALSE);
+    PanToTarget(0, 0, 0);
+    spawn 0xFE363C8A;
+});
+
+Script N(80240E40) = SCRIPT({
+    N(UnkFunc25)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        GetCurrentPartnerID(SI_VAR(1));
+        if (SI_VAR(1) != 6) {
+            return;
+        } else {
+            func_802D2B6C();
+            DisablePlayerInput(TRUE);
+        }
+    } else {
+        DisablePlayerInput(TRUE);
+    }
+    await N(80240F1C);
+});
+
+Script N(80240F1C) = SCRIPT({
+    N(SetPlayerStatusAnimFlags100000)();
+    group 27;
+    DisablePlayerPhysics(TRUE);
+    HidePlayerShadow(TRUE);
+    SI_VAR(0) = SI_VAR(10);
+    N(GetEntryPos)();
+    PlayerMoveTo(SI_VAR(1), SI_VAR(3), 3);
+    SI_VAR(0) = SI_VAR(10);
+    N(GetEntryPos)();
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    SetPlayerFlagBits(2097152, 1);
+    N(GetCurrentCameraYawClamped180)();
+    InterpPlayerYaw(SI_VAR(0), 0);
+    sleep 2;
+    SetPlayerFlagBits(2097152, 0);
+    PlaySound(0x163);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    spawn {
+        sleep 4;
+        loop 40 {
+            SI_VAR(1) -= 1;
+            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+    }
+    func_802D286C(2048);
+    func_802D2520(ANIM_10002, 5, 2, 1, 1, 0);
+    sleep 25;
+    await 0xFE363C8C;
+});
+
+Script N(802410F8) = SCRIPT({
+    IsPlayerOnValidFloor(SI_VAR(0));
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    GetPlayerActionState(SI_VAR(0));
+    if (SI_VAR(0) == 26) {
+        return;
+    }
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        GetCurrentPartnerID(SI_VAR(1));
+        if (SI_VAR(1) != 6) {
+            return;
+        } else {
+            func_802D2B6C();
+            DisablePlayerInput(TRUE);
+        }
+    } else {
+        DisablePlayerInput(TRUE);
+    }
+    group 27;
+    N(SetPlayerStatusAnimFlags100000)();
+    DisablePlayerPhysics(TRUE);
+    ModifyColliderFlags(0, SI_VAR(11), 0x7FFFFE00);
+    SI_VAR(0) = SI_VAR(10);
+    N(GetEntryPos)();
+    SI_VAR(5) = SI_VAR(1);
+    SI_VAR(6) = SI_VAR(2);
+    SI_VAR(6) += 2;
+    SI_VAR(7) = SI_VAR(3);
+    SI_VAR(8) = SI_VAR(4);
+    SI_VAR(8) += 180;
+    if (SI_VAR(4) >= 360) {
+        SI_VAR(4) -= 360;
+    }
+    InterpPlayerYaw(SI_VAR(8), 1);
+    sleep 1;
+    PlaySound(0x163);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPlayerPos(SI_VAR(0), SI_VAR(6), SI_VAR(7));
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    func_802D286C(2048);
+    func_802D2520(ANIM_STAND_STILL, 5, 3, 1, 1, 0);
+    spawn {
+        sleep 8;
+        HidePlayerShadow(TRUE);
+    }
+    spawn {
+        sleep 3;
+        loop 40 {
+            N(SomeXYZFunc2)(1.0);
+            SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 1;
+        }
+    }
+    sleep 25;
+    await 0xFE363C8C;
+});
+
+Script N(exitWalk_8024142C) = EXIT_WALK_SCRIPT(60,  0, "flo_23",  1);
+
+Script N(exitWalk_80241488) = EXIT_WALK_SCRIPT(60,  1, "flo_12",  0);
+
+Script N(802414E4) = SCRIPT({
+    group 27;
+    GotoMap("flo_11", 5);
+    sleep 100;
+});
+
+Script N(80241520) = SCRIPT({
+    group 27;
+    GotoMap("flo_11", 6);
+    sleep 100;
+});
+
+Script N(8024155C) = SCRIPT({
+    group 27;
+    GotoMap("flo_11", 7);
+    sleep 100;
+});
+
+Script N(80241598) = SCRIPT({
+    group 27;
+    GotoMap("flo_11", 2);
+    sleep 100;
+});
+
+Script N(802415D4) = SCRIPT({
+    group 27;
+    GotoMap("flo_11", 3);
+    sleep 100;
+});
+
+Script N(80241610) = SCRIPT({
+    group 27;
+    GotoMap("flo_11", 4);
+    sleep 100;
+});
+
+Script N(8024164C) = SCRIPT({
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    await N(80240E40);
+});
+
+Script N(80241698) = SCRIPT({
+    bind N(exitWalk_80241488) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_8024142C) to TRIGGER_FLOOR_ABOVE 4;
+    SI_VAR(0) = 2;
+    SI_VAR(1) = 35;
+    SI_VAR(2) = N(802414E4);
+    bind N(8024164C) to TRIGGER_FLOOR_TOUCH SI_VAR(1);
+    SI_VAR(0) = 3;
+    SI_VAR(1) = 34;
+    SI_VAR(2) = N(80241520);
+    bind N(8024164C) to TRIGGER_FLOOR_TOUCH SI_VAR(1);
+    SI_VAR(0) = 4;
+    SI_VAR(1) = 33;
+    SI_VAR(2) = N(8024155C);
+    bind N(8024164C) to TRIGGER_FLOOR_TOUCH SI_VAR(1);
+    SI_VAR(0) = 5;
+    SI_VAR(1) = 32;
+    SI_VAR(2) = N(80241598);
+    bind N(8024164C) to TRIGGER_FLOOR_TOUCH SI_VAR(1);
+    SI_VAR(0) = 6;
+    SI_VAR(1) = 31;
+    SI_VAR(2) = N(802415D4);
+    bind N(8024164C) to TRIGGER_FLOOR_TOUCH SI_VAR(1);
+    SI_VAR(0) = 7;
+    SI_VAR(1) = 30;
+    SI_VAR(2) = N(80241610);
+    bind N(8024164C) to TRIGGER_FLOOR_TOUCH SI_VAR(1);
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    func_80044238(5);
+    MakeNpcs(0, N(npcGroupList_802430D4));
+    await N(makeEntities);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) <= 1) {
+        SI_VAR(0) = N(80241698);
+        spawn EnterWalk;
+        spawn N(80242240);
+        sleep 1;
+    } else {
+        SI_VAR(10) = N(80241698);
+        spawn N(802406FC);
+        sleep 1;
+    }
+    await N(802403E0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_802402E0_CBDFB0)();
+    }
+    ModifyColliderFlags(3, 9, 0x00000009);
+    ModifyColliderFlags(3, 10, 0x00000009);
+    ModifyColliderFlags(3, 11, 0x00000009);
+    ModifyColliderFlags(3, 12, 0x00000009);
+});
+
+static s32 N(pad_1AB8)[] = {
+    0x00000000, 0x00000000,
+};
+
+NpcSettings N(npcSettings_80241AC0) = {
+    .height = 32,
+    .radius = 24,
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 20,
+};
+
+s32 N(vectorList_80241AEC)[] = {
+    0x43E60000, 0x43480000, 0xC3700000, 0x43B40000, 0x43160000, 0xC30C0000, 0x43820000, 0x42C80000,
+    0xC3700000, 0x43B40000, 0x42C80000, 0xC3DC0000, 0x43E60000, 0x42C80000, 0xC3700000, 0x43B40000,
+    0x42C80000, 0xC30C0000, 0x43820000, 0x42C80000, 0xC3700000, 0x43B40000, 0x42C80000, 0xC3DC0000,
+};
+
+s32 N(vectorList_80241B4C)[] = {
+    0xC2C80000, 0x43480000, 0xC2480000, 0x00000000, 0x43160000, 0xC3160000, 0x42C80000, 0x42C80000,
+    0xC2480000, 0x00000000, 0x42C80000, 0x42480000, 0xC2C80000, 0x42C80000, 0xC2480000, 0x00000000,
+    0x42C80000, 0xC3160000, 0x42C80000, 0x42C80000, 0xC2480000, 0x00000000, 0x42C80000, 0x42480000,
+};
+
+s32 N(vectorList_80241BAC)[] = {
+    0x43B40000, 0x42C80000, 0xC3DC0000, 0x43AF0000, 0x42F00000, 0xC35C0000, 0x43960000, 0x42F00000,
+    0xC3240000, 0x43200000, 0x42DC0000, 0xC3340000,
+};
+
+s32 N(vectorList_80241BDC)[] = {
+    0x00000000, 0x42C80000, 0x42480000, 0x43480000, 0x42DC0000, 0x41E80000, 0x43670000, 0x42DC0000,
+    0xC1900000, 0x42E60000, 0x42C80000, 0xC3160000,
+};
+
+s32 N(vectorList_80241C0C)[] = {
+    0x438E8000, 0x42F00000, 0xC2D80000, 0x43B90000, 0x42C80000, 0xC3020000, 0x43E30000, 0x42700000,
+    0xC1A00000,
+};
+
+s32 N(vectorList_80241C30)[] = {
+    0x43838000, 0x42DC0000, 0xC2840000, 0x43B40000, 0x42B40000, 0x42480000, 0x43E30000, 0x42480000,
+    0x41A00000,
+};
+
+s32 N(vectorList_80241C54)[] = {
+    0x43C80000, 0x41F00000, 0xC2200000, 0x43960000, 0x42A00000, 0xC2200000, 0x43160000, 0x43480000,
+    0xC2200000, 0x42C80000, 0x43AF0000, 0xC2200000,
+};
+
+s32 N(vectorList_80241C84)[] = {
+    0x43C80000, 0x41F00000, 0x42200000, 0x43960000, 0x42A00000, 0x42200000, 0x43160000, 0x43480000,
+    0x42200000, 0x42C80000, 0x43AF0000, 0x42200000,
+};
+
+Script N(80241CB4) = SCRIPT({
+    loop {
+        PlaySound(0x295);
+        sleep SI_VAR(0);
+    }
+});
+
+Script N(80241CF4) = SCRIPT({
+    SI_VAR(0) = 5;
+    SI_MAP_VAR(11) = spawn N(80241CB4);
+    spawn {
+        LoadPath(160, N(vectorList_80241AEC), 8, 0);
+        loop {
+            GetNextPathPos();
+            SetNpcPos(NPC_LAKITU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            sleep 1;
+            if (SI_VAR(0) == 0) {
+                break loop;
+            }
+        }
+    }
+    LoadPath(160, N(vectorList_80241B4C), 8, 0);
+    loop {
+        GetNextPathPos();
+        SetNpcPos(NPC_LAKITU1, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        sleep 1;
+        if (SI_VAR(0) == 0) {
+            break loop;
+        }
+    }
+    SI_MAP_VAR(10) = 1;
+});
+
+Script N(80241E4C) = SCRIPT({
+    spawn {
+        LoadPath(30, N(vectorList_80241BAC), 4, 0);
+        loop {
+            GetNextPathPos();
+            SetNpcPos(NPC_LAKITU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            sleep 1;
+            if (SI_VAR(0) == 0) {
+                break loop;
+            }
+        }
+    }
+    LoadPath(45, N(vectorList_80241BDC), 4, 0);
+    loop {
+        GetNextPathPos();
+        SetNpcPos(NPC_LAKITU1, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        sleep 1;
+        if (SI_VAR(0) == 0) {
+            break loop;
+        }
+    }
+    kill SI_MAP_VAR(11);
+});
+
+Script N(80241F80) = SCRIPT({
+    SI_VAR(0) = 4;
+    SI_MAP_VAR(11) = spawn N(80241CB4);
+    spawn {
+        LoadPath(35, N(vectorList_80241C0C), 3, 0);
+        loop {
+            GetNextPathPos();
+            SetNpcPos(NPC_LAKITU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            sleep 1;
+            if (SI_VAR(0) == 0) {
+                break loop;
+            }
+        }
+    }
+    LoadPath(35, N(vectorList_80241C30), 3, 0);
+    loop {
+        GetNextPathPos();
+        SetNpcPos(NPC_LAKITU1, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        sleep 1;
+        if (SI_VAR(0) == 0) {
+            break loop;
+        }
+    }
+});
+
+Script N(802420C8) = SCRIPT({
+    spawn {
+        LoadPath(40, N(vectorList_80241C54), 4, 0);
+        loop {
+            GetNextPathPos();
+            SetNpcPos(NPC_LAKITU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            sleep 1;
+            if (SI_VAR(0) == 0) {
+                break loop;
+            }
+        }
+        SetNpcPos(NPC_LAKITU0, 0, -1000, 0);
+    }
+    LoadPath(40, N(vectorList_80241C84), 4, 0);
+    loop {
+        GetNextPathPos();
+        SetNpcPos(NPC_LAKITU1, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        sleep 1;
+        if (SI_VAR(0) == 0) {
+            break loop;
+        }
+    }
+    SetNpcPos(NPC_LAKITU1, 0, -1000, 0);
+    sleep 40;
+    kill SI_MAP_VAR(11);
+});
+
+Script N(80242240) = SCRIPT({
+    if (SI_SAVE_FLAG(1377) == 1) {
+        return;
+    }
+    if (STORY_PROGRESS < STORY_CH6_GOT_MAGICAL_BEAN) {
+        return;
+    }
+    if (SI_SAVE_FLAG(1375) == 0) {
+        return;
+    }
+    SetNpcPos(NPC_LAKITU0, 460, 200, -240);
+    SetNpcPos(NPC_LAKITU1, -100, 200, -50);
+    loop {
+        sleep 1;
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        if (SI_VAR(0) < 440) {
+            break loop;
+        }
+    }
+    DisablePlayerInput(TRUE);
+    SI_MAP_VAR(10) = 0;
+    spawn N(80241CF4);
+    SetCamType(0, 1, 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 90.0);
+    SetCamPitch(0, 25.0, -7.0);
+    SetCamDistance(0, 450);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 20;
+    SI_VAR(0) = 270;
+    SI_VAR(1) = 100;
+    SI_VAR(2) = -87;
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamPitch(0, 14.0, -11.0);
+    SetCamPosA(0, 87, 0);
+    SetCamPosB(0, 0, -50);
+    SetCamPosC(0, 87, 0);
+    SetCamSpeed(0, 1.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 30;
+    SetCamDistance(0, 150);
+    SetCamPitch(0, 17.0, -16.0);
+    PanToTarget(0, 0, 1);
+    loop {
+        sleep 1;
+        if (SI_MAP_VAR(10) == 1) {
+            break loop;
+        }
+    }
+    NpcFaceNpc(NPC_LAKITU0, NPC_LAKITU1, 1);
+    NpcFaceNpc(NPC_LAKITU1, NPC_LAKITU0, 1);
+    spawn N(80241E4C);
+    sleep 30;
+    SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0088));
+    NpcFaceNpc(NPC_LAKITU1, NPC_LAKITU0, 1);
+    SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0089));
+    InterpNpcYaw(NPC_LAKITU0, 0, 1);
+    sleep 20;
+    SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x008A));
+    SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x008B));
+    SetCamType(0, 1, 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 90.0);
+    SetCamPitch(0, 14.0, -11.0);
+    SetCamDistance(0, 450);
+    SetCamPosA(0, 87, 0);
+    SetCamPosB(0, 0, -50);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    spawn N(80241F80);
+    SetNpcVar(0, 0, 1);
+});
+
+Script N(idle_80242810) = SCRIPT({
+    loop {
+        GetSelfVar(0, SI_VAR(0));
+        if (SI_VAR(0) != 0) {
+            break loop;
+        }
+        sleep 1;
+    }
+    spawn {
+        AdjustCam(0, 4.0, 0, 1000, 14.0, -11.0);
+    }
+    StartBossBattle(3);
+});
+
+Script N(defeat_802428B8) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            SetNpcPos(NPC_LAKITU0, 400, 20, -40);
+            SetNpcPos(NPC_LAKITU1, 400, 20, 40);
+            InterpNpcYaw(NPC_LAKITU0, 270, 0);
+            InterpNpcYaw(NPC_LAKITU1, 270, 0);
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(2) += -60;
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 900);
+            SetCamPitch(0, 24.0, -4.0);
+            SetCamPosA(0, -95.0, 0.0);
+            SetCamPosB(0, 0.0, -50.0);
+            SetCamSpeed(0, 90.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            await N(802420C8);
+            ResetCam(0, 4.0);
+            SI_SAVE_FLAG(1377) = 1;
+            SI_MAP_VAR(0) = 1;
+            DisablePlayerInput(FALSE);
+        }
+        == 1 {}
+        == 2 {
+        }
+    }
+});
+
+Script N(defeat_80242AC4) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+        0:
+            if (SI_MAP_VAR(0) == 0) {
+                sleep 1;
+                goto 0;
+            }
+        }
+        == 1 {}
+        == 2 {
+        }
+    }
+});
+
+Script N(init_80242B58) = SCRIPT({
+    SetNpcPos(NPC_LAKITU0, 0, -1000, 0);
+    if (SI_SAVE_FLAG(1377) == 0) {
+        if (STORY_PROGRESS >= STORY_CH6_GOT_MAGICAL_BEAN) {
+            if (SI_SAVE_FLAG(1375) == 1) {
+                SI_MAP_VAR(0) = 0;
+                BindNpcIdle(NPC_SELF, N(idle_80242810));
+                BindNpcDefeat(NPC_SELF, N(defeat_802428B8));
+                SetNpcPos(NPC_LAKITU0, 350, 120, -220);
+                InterpNpcYaw(NPC_LAKITU0, 270, 1);
+            }
+        }
+    }
+});
+
+Script N(init_80242C38) = SCRIPT({
+    SetNpcPos(NPC_LAKITU1, 0, -1000, 0);
+    if (SI_SAVE_FLAG(1377) == 0) {
+        if (STORY_PROGRESS >= STORY_CH6_GOT_MAGICAL_BEAN) {
+            if (SI_SAVE_FLAG(1375) == 1) {
+                BindNpcDefeat(NPC_SELF, N(defeat_80242AC4));
+                SetNpcPos(NPC_LAKITU1, 200, 110, 29);
+                InterpNpcYaw(NPC_LAKITU1, 0, 1);
+            }
+        }
+    }
+});
+
+StaticNpc N(npcGroup_80242CF4)[] = {
+    {
+        .id = NPC_LAKITU0,
+        .settings = &N(npcSettings_80241AC0),
+        .pos = { 553.0f, 60.0f, 52.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000,
+        .init = &N(init_80242B58),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .itemDropChance = 25,
+        .itemDrops = {
+                { ITEM_SUPER_SHROOM, 2, 0 },
+                { ITEM_MAPLE_SYRUP, 2, 0 },
+                { ITEM_THUNDER_RAGE, 2, 0 },
+                { ITEM_STOP_WATCH, 2, 0 },
+        },
+        .heartDrops = STANDARD_HEART_DROPS(2),
+        .flowerDrops = STANDARD_FLOWER_DROPS(3),
+        .maxCoinBonus = 2,
+        .animations = {
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_2),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+        },
+    },
+    {
+        .id = NPC_LAKITU1,
+        .settings = &N(npcSettings_80241AC0),
+        .pos = { 553.0f, 60.0f, 52.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000,
+        .init = &N(init_80242C38),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .itemDropChance = 25,
+        .itemDrops = {
+                { ITEM_SUPER_SHROOM, 2, 0 },
+                { ITEM_MAPLE_SYRUP, 2, 0 },
+                { ITEM_THUNDER_RAGE, 2, 0 },
+                { ITEM_STOP_WATCH, 2, 0 },
+        },
+        .heartDrops = STANDARD_HEART_DROPS(2),
+        .flowerDrops = STANDARD_FLOWER_DROPS(3),
+        .maxCoinBonus = 2,
+        .animations = {
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_2),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+        },
+    },
+};
+
+NpcGroupList N(npcGroupList_802430D4) = {
+    NPC_GROUP(N(npcGroup_80242CF4), BATTLE_ID(24, 7, 0, 9)),
+    {},
+};
+
+static s32 N(pad_30EC) = {
+    0x00000000,
+};
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802EA0E8, -220, 60, -75, 0, MAKE_ENTITY_END);
+    AssignBlockFlag(SI_SAVE_FLAG(1384));
+});
 
 #include "world/common/SetPlayerStatusAnimFlags100000.inc.c"
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240034_CBDD04);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -12,4 +847,9 @@ INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240034_CBDD04);
 
 #include "world/common/SomeXYZFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_802402E0_CBDFB0);
+void func_80072950();
+
+ApiStatus N(func_802402E0_CBDFB0)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_11/flo_11.h b/src/world/area_flo/flo_11/flo_11.h
index fc118673ac..32d29daacf 100644
--- a/src/world/area_flo/flo_11/flo_11.h
+++ b/src/world/area_flo/flo_11/flo_11.h
@@ -2,3 +2,17 @@
 #include "map.h"
 
 #define NAMESPACE flo_11
+
+ApiStatus N(GetCurrentCameraYawClamped180)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetCurrentFloor)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(GetEntryPos)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SetPlayerStatusAnimFlags100000)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(SomeXYZFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc25)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802402E0_CBDFB0)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_802430D4);
+extern Script N(80240F1C);
+extern Script N(80242240);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_flo/flo_12/CC0E30.c b/src/world/area_flo/flo_12/CC0E30.c
index d4da55a001..05b6b5fe55 100644
--- a/src/world/area_flo/flo_12/CC0E30.c
+++ b/src/world/area_flo/flo_12/CC0E30.c
@@ -1,3 +1,8 @@
 #include "flo_12.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E30", func_80240000_CC0E30);
+void func_80072950();
+
+ApiStatus N(func_80240000_CC0E30)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c
index 81cb98c0c8..9b01a28b2a 100644
--- a/src/world/area_flo/flo_12/CC0E70.c
+++ b/src/world/area_flo/flo_12/CC0E70.c
@@ -1,32 +1,491 @@
 #include "flo_12.h"
+#include "message_ids.h"
+#include "sprite/npc/rosie.h"
+
+enum {
+    NPC_ROSIE0,
+    NPC_ROSIE1,
+};
+
+static N(D_802429E0)[112];
+
+EntryList N(entryList) = {
+    { 280.0f, 0.0f, 0.0f, 270.0f },
+    { 280.0f, 0.0f, 0.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_12_tattle },
+};
+
+Script N(80240750) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
+    } else {
+        match STORY_PROGRESS {
+            < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+            }
+            else {
+                SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+            }
+        }
+    }
+});
+
+Script N(8024080C) = SCRIPT({
+    func_802D5FF8(137, 3);
+});
+
+Script N(80240830) = SCRIPT({
+    FadeOutMusic(0, 250);
+    sleep 10;
+    func_802D5FD8();
+});
+
+static s32 N(pad_86C) = {
+    0x00000000,
+};
+
+Script N(80240870) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_80240B1C) = EXIT_WALK_SCRIPT(60,  0, "flo_11",  1);
+
+Script N(80240B78) = SCRIPT({
+    bind N(exitWalk_80240B1C) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    SI_AREA_FLAG(22) = 0;
+    MakeNpcs(0, N(npcGroupList_802429B8));
+    ModifyColliderFlags(3, 11, 0x00000006);
+    SI_VAR(0) = -65;
+    SI_VAR(1) = -210;
+    SI_VAR(2) = 90;
+    SI_VAR(3) = -110;
+    SI_VAR(4) = 0;
+    spawn N(80240870);
+    SI_VAR(0) = -200;
+    SI_VAR(1) = 130;
+    SI_VAR(2) = -80;
+    SI_VAR(3) = 170;
+    SI_VAR(4) = 0;
+    spawn N(80240870);
+    SI_VAR(0) = -270;
+    SI_VAR(1) = -80;
+    SI_VAR(2) = -225;
+    SI_VAR(3) = 125;
+    SI_VAR(4) = 0;
+    spawn N(80240870);
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        spawn N(802419F4);
+    } else {
+        ModifyColliderFlags(0, 1, 0x7FFFFE00);
+        SI_VAR(0) = N(80240B78);
+        spawn EnterWalk;
+    }
+    await N(80240750);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CC0E30)();
+    }
+});
+
+static s32 N(pad_E28)[] = {
+    0x00000000, 0x00000000,
+};
+
+NpcSettings N(npcSettings_80240E30) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80240E5C) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
 
 #include "world/common/foliage.inc.c"
 
+s32** N(D_802417EC_CC261C) = NULL;
+
+Script N(802417F0) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 0);
+    return;
+});
+
+Script N(80241820) = SCRIPT({
+    ShowGotItem(SI_VAR(0), 1, 16);
+    return;
+});
+
+s32 N(D_80241850_CC2680) = {
+    0x00000000,
+};
+
+s32 N(D_80241854_CC2684) = {
+    0x00000000,
+};
+
+Script N(80241858) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D6420();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveKeyItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            SI_VAR(0) |= (const)  0x50000;
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_80240614_CC1444)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(8024199C) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_8024064C_CC147C), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80241858), 0x10, 0, N(D_802429E0), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_802405C0_CC13F0), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+s32 N(D_802419EC_CC281C)[] = {
+    0x0000001E, 0x00000000,
+};
+
+Script N(802419F4) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    GetNpcPos(NPC_ROSIE0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 350);
+    SetCamPitch(0, 17.0, -9.5);
+    SetCamPosA(0, 0, 0);
+    SetCamPosB(0, 0, -50);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 20;
+    SpeakToPlayer(NPC_ROSIE0, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x00C7));
+    sleep 10;
+    GotoMap("flo_03", 2);
+    sleep 100;
+});
+
+Script N(80241B6C) = SCRIPT({
+    sleep 10;
+    SetNpcFlagBits(NPC_ROSIE0, ((NPC_FLAG_100)), TRUE);
+    PlayerMoveTo(-5, 20, 20);
+    SetNpcFlagBits(NPC_ROSIE0, ((NPC_FLAG_100)), FALSE);
+    PlayerFaceNpc(0, 1);
+});
+
+Script N(80241BE4) = SCRIPT({
+    sleep 10;
+    SetNpcFlagBits(NPC_ROSIE0, ((NPC_FLAG_100)), TRUE);
+    SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), TRUE);
+    PlayerMoveTo(-5, 20, 20);
+    SetNpcFlagBits(NPC_ROSIE0, ((NPC_FLAG_100)), FALSE);
+    SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE);
+    PlayerFaceNpc(0, 1);
+});
+
+Script N(interact_80241C8C) = SCRIPT({
+    await N(8024080C);
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_CRYSTAL_BERRY {
+            match SI_SAVE_FLAG(1378) {
+                == 0 {
+                    spawn N(80241B6C);
+                    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                    SI_VAR(0) += 30;
+                    SetCamProperties(0, 4.0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 325, 19.0, -9.5);
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_3), NPC_ANIM(rosie, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x008C));
+                    ShowChoice(MESSAGE_ID(0x1E, 0x0011));
+                    sleep 10;
+                    match SI_VAR(0) {
+                        == 0 {
+                            ContinueSpeech(-1, NPC_ANIM(rosie, Palette_00, Anim_3), NPC_ANIM(rosie, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x008D));
+                        }
+                        == 1 {
+                            ContinueSpeech(-1, NPC_ANIM(rosie, Palette_00, Anim_3), NPC_ANIM(rosie, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x008E));
+                        }
+                    }
+                    SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE);
+                    SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_5));
+                    sleep 10;
+                    SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2));
+                    MakeItemEntity(ITEM_WATER_STONE, -33, 14, 19, 1, 1380);
+                    sleep 10;
+                    match SI_SAVE_FLAG(1375) {
+                        == 0 {
+                            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, 0x008F));
+                        }
+                        == 1 {
+                            SetPlayerAnimation(0x60002);
+                            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, 0x008F));
+                            SetPlayerAnimation(0x60005);
+                            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0091));
+                            SetPlayerAnimation(ANIM_PRAY);
+                            sleep 40;
+                            SetPlayerAnimation(ANIM_10002);
+                            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0092));
+                            SI_SAVE_FLAG(1379) = 1;
+                        }
+                    }
+                    SI_SAVE_FLAG(1378) = 1;
+                }
+                == 1 {
+                    match SI_SAVE_FLAG(1379) {
+                        == 0 {
+                            if (SI_SAVE_FLAG(1375) == 1) {
+                                spawn N(80241BE4);
+                                SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, 0x0090));
+                                SetPlayerAnimation(0x60005);
+                                SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0091));
+                                SetPlayerAnimation(ANIM_PRAY);
+                                sleep 40;
+                                SetPlayerAnimation(ANIM_10002);
+                                SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0092));
+                                SI_SAVE_FLAG(1379) = 1;
+                            } else {
+                                SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, 0x0090));
+                            }
+                        }
+                        == 1 {
+                            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0093));
+                        }
+                    }
+                }
+            }
+        }
+        < 48 {
+            FindKeyItem(ITEM_CRYSTAL_BERRY, SI_VAR(0));
+            if (SI_VAR(0) != -1) {
+                spawn N(80241BE4);
+                GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SI_VAR(0) += 30;
+                SetCamProperties(0, 4.0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 325, 19.0, -9.5);
+            }
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0094));
+            SI_VAR(0) = N(D_802419EC_CC281C);
+            SI_VAR(1) = 0;
+            await N(8024199C);
+            match SI_VAR(0) {
+                <= 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0093));
+                }
+                else {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0095));
+                    RemoveItemEntity(SI_VAR(7));
+                    MakeItemEntity(ITEM_CRYSTAL_BERRY, -33, 14, 19, 1, 1380);
+                    SI_VAR(0) = 87;
+                    SI_VAR(1) = 1;
+                    await N(802417F0);
+                    AddKeyItem(ITEM_WATER_STONE);
+                    sleep 10;
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0096));
+                    SI_AREA_FLAG(22) = 1;
+                    STORY_PROGRESS = STORY_CH6_GOT_WATER_STONE;
+                }
+            }
+        }
+        < 53 {
+            match SI_AREA_FLAG(22) {
+                == 0 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0097));
+                }
+                == 1 {
+                    SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0096));
+                }
+            }
+        }
+        < 60 {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0098));
+        }
+        else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0099));
+        }
+    }
+    ResetCam(0, 4.0);
+    await N(80240830);
+});
+
+Script N(init_802423D0) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80241C8C));
+    GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 35;
+    SetNpcPos(NPC_ROSIE1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetNpcFlagBits(NPC_ROSIE1, ((0x00000002)), TRUE);
+    SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_HAS_SHADOW)), TRUE);
+    match STORY_PROGRESS {
+        < STORY_CH6_GOT_CRYSTAL_BERRY {
+            if (SI_SAVE_FLAG(1378) == 1) {
+                SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE);
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2));
+                MakeItemEntity(ITEM_WATER_STONE, -33, 14, 19, 1, 1380);
+                SI_VAR(10) = SI_VAR(0);
+            }
+        }
+        < STORY_CH6_GOT_WATER_STONE {
+            SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2));
+            MakeItemEntity(ITEM_WATER_STONE, -33, 14, 19, 1, 1380);
+            SI_VAR(10) = SI_VAR(0);
+        }
+        else {
+            SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE);
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2));
+            MakeItemEntity(ITEM_CRYSTAL_BERRY, -33, 14, 19, 1, 1380);
+            SI_VAR(10) = SI_VAR(0);
+        }
+    }
+});
+
+StaticNpc N(npcGroup_802425D8)[] = {
+    {
+        .id = NPC_ROSIE0,
+        .settings = &N(npcSettings_80240E30),
+        .pos = { -70.0f, 0.0f, 20.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000,
+        .init = &N(init_802423D0),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E0),
+    },
+    {
+        .id = NPC_ROSIE1,
+        .settings = &N(npcSettings_80240E5C),
+        .pos = { -70.0f, 0.0f, 20.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY,
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+            NPC_ANIM(rosie, Palette_00, Anim_1),
+        },
+    },
+};
+
+NpcGroupList N(npcGroupList_802429B8) = {
+    NPC_GROUP(N(npcGroup_802425D8), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
 
-INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC);
-/*
 ApiStatus N(func_8024027C_CC10AC)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802417EC_CC261C) == NULL) {
+        N(D_802417EC_CC261C) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802417EC_CC261C)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802417EC_CC261C)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802417EC_CC261C));
+        N(D_802417EC_CC261C) = NULL;
     }
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/GetItemName.inc.c"
 
@@ -34,38 +493,45 @@ ApiStatus N(func_8024027C_CC10AC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_802405C0_CC13F0);
-/*
 ApiStatus N(func_802405C0_CC13F0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80241850_CC2680) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80241850_CC2680)) {
+        N(D_80241850_CC2680) = FALSE;
+        set_variable(script, *args, N(D_80241854_CC2684));
         return ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_80240614_CC1444);
-/*
 ApiStatus N(func_80240614_CC1444)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241854_CC2684) = get_variable(script, *args);
+    N(D_80241850_CC2680) = TRUE;
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024064C_CC147C);
+ApiStatus N(func_8024064C_CC147C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_802429E0)[i] = ptr[i];
+        }
+        N(D_802429E0)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_802429E0)[i] = i + 16;
+            N(D_802429E0)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_12/flo_12.h b/src/world/area_flo/flo_12/flo_12.h
index 1ef8fcea0d..5ed6124177 100644
--- a/src/world/area_flo/flo_12/flo_12.h
+++ b/src/world/area_flo/flo_12/flo_12.h
@@ -2,3 +2,14 @@
 #include "map.h"
 
 #define NAMESPACE flo_12
+
+ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CC0E30)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802405C0_CC13F0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240614_CC1444)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024064C_CC147C)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_802429B8);
+extern Script N(802419F4);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_13/CC3810.c b/src/world/area_flo/flo_13/CC3810.c
index 059ecf5a7d..da3b0b15f3 100644
--- a/src/world/area_flo/flo_13/CC3810.c
+++ b/src/world/area_flo/flo_13/CC3810.c
@@ -1,3 +1,8 @@
 #include "flo_13.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3810", func_80240000_CC3810);
+void func_80072950();
+
+ApiStatus N(func_80240000_CC3810)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c
index 944992fec4..8535b56683 100644
--- a/src/world/area_flo/flo_13/CC3850.c
+++ b/src/world/area_flo/flo_13/CC3850.c
@@ -1,9 +1,1187 @@
 #include "flo_13.h"
+#include "message_ids.h"
+#include "sprite/npc/lakilulu.h"
+#include "sprite/npc/lakitu.h"
+#include "sprite/npc/spiny.h"
+#include "sprite/npc/world_lakilester.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240040_CC3850);
+enum {
+    NPC_WORLD_LAKILESTER,
+    NPC_LAKILULU0,
+    NPC_LAKILULU1,
+    NPC_LAKITU0,
+    NPC_LAKITU1,
+    NPC_SPINY0 = 50,
+    NPC_SPINY1,
+    NPC_SPINY2,
+    NPC_SPINY3,
+    NPC_SPINY4,
+    NPC_SPINY5,
+};
+
+EntryList N(entryList) = {
+    {  570.0f, 0.0f, 0.0f, 270.0f },
+    { -570.0f, 0.0f, 0.0f,  90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_13_tattle },
+};
+
+Script N(802436D0) = SCRIPT({
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    if (SI_VAR(0) < -500) {
+        goto 10;
+    }
+0:
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+    loop {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        if (SI_VAR(0) < -500) {
+            break loop;
+        }
+        sleep 1;
+    }
+10:
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_SUN_TOWER_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_SUN_TOWER_SUNNY, 0, 8);
+        }
+    }
+    loop {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        if (SI_VAR(0) > -500) {
+            break loop;
+        }
+        sleep 1;
+    }
+    goto 0;
+});
+
+Script N(802438B0) = SCRIPT({
+    spawn N(802436D0);
+});
+
+Script N(802438CC) = SCRIPT({
+    SetMusicTrack(0, SONG_NEW_PARTNER, 0, 8);
+});
+
+Script N(802438F8) = SCRIPT({
+    FadeOutMusic(0, 500);
+    sleep 15;
+    SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+});
+
+static s32 N(pad_3944)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80243950) = SCRIPT({
+    ModifyColliderFlags(0, 14, 0x7FFFFE00);
+});
+
+Script N(makeEntities) = SCRIPT({
+    MakeItemEntity(ITEM_MEGA_SMASH, -61, 60, -85, 17, SI_SAVE_FLAG(1385));
+    MakeItemEntity(ITEM_SHOOTING_STAR, 128, 0, 157, 17, SI_SAVE_FLAG(1386));
+    if (SI_SAVE_FLAG(1385) == 0) {
+        MakeEntity(0x802BCF00, -160, 160, -90, 0, MAKE_ENTITY_END);
+        AssignScript(N(80243950));
+    } else {
+        ModifyColliderFlags(0, 14, 0x7FFFFE00);
+    }
+});
+
+static s32 N(pad_3A3C) = {
+    0x00000000,
+};
+
+Script N(80243A40) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_80243CEC) = EXIT_WALK_SCRIPT(60,  0, "flo_14",  1);
+
+Script N(exitWalk_80243D48) = EXIT_WALK_SCRIPT(60,  1, "flo_15",  0);
+
+Script N(80243DA4) = SCRIPT({
+    bind N(exitWalk_80243D48) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_80243CEC) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80247984));
+    await N(makeEntities);
+    ModifyColliderFlags(3, 13, 0x00000006);
+    SI_VAR(0) = 274;
+    SI_VAR(1) = -137;
+    SI_VAR(2) = 583;
+    SI_VAR(3) = -64;
+    SI_VAR(4) = 0;
+    spawn N(80243A40);
+    SI_VAR(0) = 433;
+    SI_VAR(1) = 108;
+    SI_VAR(2) = 580;
+    SI_VAR(3) = 169;
+    SI_VAR(4) = 0;
+    spawn N(80243A40);
+    SI_VAR(0) = -460;
+    SI_VAR(1) = 90;
+    SI_VAR(2) = -125;
+    SI_VAR(3) = 130;
+    SI_VAR(4) = 0;
+    spawn N(80243A40);
+    SI_VAR(0) = -420;
+    SI_VAR(1) = -130;
+    SI_VAR(2) = -260;
+    SI_VAR(3) = -90;
+    SI_VAR(4) = 0;
+    spawn N(80243A40);
+    SI_VAR(0) = -220;
+    SI_VAR(1) = -137;
+    SI_VAR(2) = 0;
+    SI_VAR(3) = -50;
+    SI_VAR(4) = 160;
+    spawn N(80243A40);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(80243DA4);
+    spawn EnterWalk;
+    await N(802438B0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CC3810)();
+    }
+});
+
+NpcSettings N(npcSettings_80244100) = {
+    .height = 32,
+    .radius = 24,
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 20,
+};
+
+f32 N(D_8024412C_CC793C)[] = {
+     4.5f, 3.5f, 2.6f, 2.0f,
+     1.5f, 20.0f,
+};
+
+NpcAISettings N(npcAISettings_80244144) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 60,
+    .waitTime = 30,
+    .alertRadius = 60.0f,
+    .unk_10 = { .f = 50.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 3.5f,
+    .unk_1C = { .s = 60 },
+    .unk_20 = 10,
+    .chaseRadius = 80.0f,
+    .unk_28 = { .f = 70.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80244174) = SCRIPT({
+    SetSelfVar(0, 0);
+    SetSelfVar(5, -650);
+    SetSelfVar(6, 30);
+    SetSelfVar(1, 400);
+    N(func_80241DB8_CC55C8)(N(npcAISettings_80244144));
+});
+
+NpcSettings N(npcSettings_802441E4) = {
+    .height = 28,
+    .radius = 24,
+    .ai = &N(npcAI_80244174),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 20,
+};
+
+NpcAISettings N(npcAISettings_80244210) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 30,
+    .waitTime = 50,
+    .alertRadius = 60.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 6.0f,
+    .chaseRadius = 100.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 3,
+};
+
+Script N(npcAI_80244240) = SCRIPT({
+    SetSelfVar(2, 3);
+    SetSelfVar(3, 18);
+    SetSelfVar(5, 3);
+    SetSelfVar(7, 4);
+    N(func_80242A6C_CC627C)(N(npcAISettings_80244210));
+});
+
+Script N(802442B0) = SCRIPT({
+    SetNpcRotation(NPC_SELF, 0, 0, 0);
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            SetSelfVar(10, 100);
+            DoNpcDefeat();
+        }
+        == 2 {
+            func_80045900(0);
+        }
+        == 3 {
+            SetEnemyFlagBits(-1, 16, 1);
+            RemoveNpc(NPC_SELF);
+        }
+    }
+});
+
+NpcSettings N(npcSettings_8024437C) = {
+    .height = 21,
+    .radius = 22,
+    .ai = &N(npcAI_80244240),
+    .onHit = EnemyNpcHit,
+    .onDefeat = &N(802442B0),
+    .level = 19,
+};
+
+Vec3f N(vectorList_802443A8)[] = {
+     { -250.0, 130.0, 100.0 }, { -150.0, 90.0, 70.0 },
+     { 50.0, 70.0, 10.0 }, { 200.0, 35.0, 30.0 },
+     { 30.0, 10.0, 45.0 },
+};
+
+Vec3f N(vectorList_802443E4)[] = {
+     { -285.0, 130.0, 45.0 }, { -185.0, 90.0, 25.0 },
+     { 15.0, 70.0, 10.0 }, { 165.0, 35.0, 30.0 },
+     { -5.0, 10.0, 45.0 },
+};
+
+Vec3f N(vectorList_80244420)[] = {
+     { 10.0, 0.0, 45.0 }, { -90.0, 20.0, 45.0 },
+     { -190.0, 60.0, 45.0 }, { -290.0, 140.0, 45.0 },
+     { -390.0, 300.0, 45.0 },
+};
+
+Script N(8024445C) = SCRIPT({
+    GetNpcPos(NPC_WORLD_LAKILESTER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+0:
+    GetNpcPos(NPC_WORLD_LAKILESTER, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    N(UnkFunc42)();
+    InterpNpcYaw(NPC_WORLD_LAKILESTER, SI_VAR(10), 0);
+    SI_VAR(0) = SI_VAR(3);
+    SI_VAR(1) = SI_VAR(4);
+    SI_VAR(2) = SI_VAR(5);
+    GetAngleBetweenNPCs(-4, 0, SI_VAR(10));
+    InterpNpcYaw(NPC_PARTNER, SI_VAR(10), 0);
+    PlayerFaceNpc(0, 0);
+    sleep 1;
+    goto 0;
+});
+
+Script N(80244560) = SCRIPT({
+    GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+0:
+    GetNpcPos(NPC_LAKILULU0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    N(UnkFunc42)();
+    InterpNpcYaw(NPC_LAKILULU0, SI_VAR(10), 0);
+    SI_VAR(0) = SI_VAR(3);
+    SI_VAR(1) = SI_VAR(4);
+    SI_VAR(2) = SI_VAR(5);
+    GetAngleBetweenNPCs(-4, 1, SI_VAR(10));
+    InterpNpcYaw(NPC_PARTNER, SI_VAR(10), 0);
+    if (STORY_PROGRESS < STORY_CH6_LAKILESTER_JOINED_PARTY) {
+        GetAngleBetweenNPCs(0, 1, SI_VAR(11));
+        InterpNpcYaw(NPC_WORLD_LAKILESTER, SI_VAR(11), 0);
+    }
+    PlayerFaceNpc(1, 0);
+    sleep 1;
+    goto 0;
+});
+
+Script N(802446AC) = SCRIPT({
+    SI_MAP_VAR(10) = 0;
+    loop {
+        loop 2 {
+            GetNpcPos(NPC_LAKILULU1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) += 1;
+            SetNpcPos(NPC_LAKILULU1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) += 1;
+            SetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 2;
+        }
+        sleep 1;
+        loop 2 {
+            GetNpcPos(NPC_LAKILULU1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) += -1;
+            SetNpcPos(NPC_LAKILULU1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) += -1;
+            SetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep 2;
+        }
+        sleep 1;
+        if (SI_MAP_VAR(10) == 1) {
+            SI_MAP_VAR(10) = 2;
+            break loop;
+        }
+    }
+});
+
+Script N(80244888) = SCRIPT({
+    spawn N(802446AC);
+    SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_C));
+    GetNpcPos(NPC_LAKILULU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    SI_VAR(1) += -5;
+    SI_VAR(2) += 30;
+    SI_VAR(3) += 2;
+    SetNpcYaw(NPC_LAKILULU1, 270);
+    SetNpcPos(NPC_LAKILULU1, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    spawn {
+        sleep 5;
+        SetPlayerAnimation(ANIM_1002B);
+    }
+    ContinueSpeech(1, -1, -1, 512, MESSAGE_ID(0x11, 0x00A8));
+    spawn {
+        sleep 15;
+        EndSpeech(1, -1, -1, 512);
+    }
+    SI_MAP_VAR(10) = 1;
+    loop {
+        sleep 1;
+        if (SI_MAP_VAR(10) == 2) {
+            break loop;
+        }
+    }
+    SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_D));
+    GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    SI_VAR(1) += 5;
+    SI_VAR(2) += 20;
+    SetNpcJumpscale(NPC_LAKILULU1, 0.0);
+    NpcJump0(NPC_LAKILULU1, SI_VAR(1), SI_VAR(2), SI_VAR(3), 7);
+    SI_VAR(1) += -100;
+    SI_VAR(2) += 10;
+    spawn {
+        SetNpcJumpscale(NPC_LAKILULU1, 1.5);
+        NpcJump0(NPC_LAKILULU1, SI_VAR(1), SI_VAR(2), SI_VAR(3), 15);
+        SetNpcPos(NPC_LAKILULU1, 0, -1000, 0);
+    }
+    spawn {
+        ShakeCam(0, 0, 10, 2.0);
+    }
+    PlaySoundAtPlayer(225, 0);
+    SetPlayerAnimation(ANIM_FALL_BACK);
+    SI_VAR(0) = 90;
+    loop 20 {
+        SI_VAR(0) += 144;
+        if (SI_VAR(0) > 359) {
+            SI_VAR(0) -= 360;
+        }
+        InterpPlayerYaw(SI_VAR(0), 1);
+        sleep 1;
+    }
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_1));
+});
+
+Script N(idle_80244BF8) = SCRIPT({
+    if (STORY_PROGRESS != STORY_CH6_SPOKE_WITH_THE_SUN) {
+        return;
+    }
+    AwaitPlayerApproach(200, 20, 275);
+    DisablePlayerInput(TRUE);
+    SetNpcPos(NPC_WORLD_LAKILESTER, -250, 120, 45);
+    SetMusicTrack(0, SONG_LAKILESTER_THEME, 0, 8);
+    ShowMessageAtScreenPos(MESSAGE_ID(0x11, 0x00A0), 160, 40);
+    func_802D2B6C();
+    SetPlayerAnimation(0x1002A);
+    sleep 20;
+    InterpPlayerYaw(270, 1);
+    sleep 20;
+    InterpPlayerYaw(90, 1);
+    sleep 20;
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    func_802CF56C(2);
+    SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_7));
+    spawn {
+        N(func_802434D4_CC6CE4)();
+    }
+    SI_VAR(9) = spawn N(8024445C);
+    LoadPath(80, N(vectorList_802443A8), 5, 0);
+0:
+    GetNextPathPos();
+    SetNpcPos(NPC_WORLD_LAKILESTER, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    sleep 1;
+    if (SI_VAR(0) == 1) {
+        goto 0;
+    }
+    kill SI_VAR(9);
+    SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1));
+    PlayerFaceNpc(0, 0);
+    sleep 15;
+    GetNpcPos(NPC_WORLD_LAKILESTER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 200);
+    SetCamPitch(0, 18.0, -8.5);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    spawn {
+        PlayerMoveTo(-75, 65, 10);
+        PlayerFaceNpc(0, 0);
+    }
+    SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00A1));
+    SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_7));
+    sleep 10;
+    SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1));
+    spawn {
+        SetCamDistance(0, 1000);
+        SetCamPitch(0, 17.0, -6.0);
+        SetCamSpeed(0, 4.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+    }
+    DisablePlayerInput(FALSE);
+    StartBossBattle(3);
+});
+
+Script N(80245014) = SCRIPT({
+    GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    AwaitPlayerLeave(SI_VAR(0), SI_VAR(2), 120);
+    DisablePlayerInput(TRUE);
+    GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), 0, SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 250);
+    SetCamPitch(0, 5.5, -7.5);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    NpcFaceNpc(NPC_LAKILULU0, NPC_WORLD_LAKILESTER, 1);
+    SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00B4));
+    NpcFaceNpc(NPC_PARTNER, NPC_LAKILULU0, 1);
+    SetCamDistance(0, 600);
+    SetCamPitch(0, 10.0, -8.0);
+    SetCamPosA(0, 0, 0);
+    SetCamPosB(0, 130, -200);
+    SetCamPosC(0, 0, 0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    spawn {
+        N(func_802433C0_CC6BD0)(55);
+    }
+    SetNpcFlagBits(NPC_LAKILULU0, ((NPC_FLAG_100)), TRUE);
+    SI_VAR(9) = spawn N(80244560);
+    LoadPath(55, N(vectorList_80244420), 5, 0);
+20:
+    GetNextPathPos();
+    SetNpcPos(NPC_LAKILULU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    sleep 1;
+    if (SI_VAR(0) == 1) {
+        goto 20;
+    }
+    kill SI_VAR(9);
+    GetCurrentPartnerID(SI_VAR(0));
+    BringPartnerOut(8);
+    if (SI_VAR(0) != 8) {
+        SetNpcJumpscale(NPC_PARTNER, 0.0);
+        GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        SI_VAR(1) += 20;
+        SI_VAR(2) += 20;
+        SI_VAR(3) += 20;
+        NpcJump0(NPC_PARTNER, SI_VAR(1), SI_VAR(2), SI_VAR(3), 30);
+    }
+    DisablePartnerAI(0);
+    InterpNpcYaw(NPC_PARTNER, 270, 0);
+    sleep 5;
+    SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00B5));
+    EnablePartnerAI();
+    PutPartnerAway();
+    ResetCam(0, 90.0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80245444) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    sleep 30;
+    SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_A), NPC_ANIM(world_lakilester, Palette_00, Anim_4), 0, MESSAGE_ID(0x11, 0x00A2));
+    SetNpcPos(NPC_LAKILULU0, -290, 120, 45);
+    spawn {
+        sleep 10;
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(world_lakilester, Palette_00, Anim_1));
+        SetPlayerAnimation(0x1002A);
+        sleep 20;
+        InterpPlayerYaw(270, 1);
+    }
+    SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00A3));
+    SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_7));
+    UseSettingsFrom(0, 0, 0, 0);
+    SetPanTarget(0, 0, 0, 0);
+    SetCamDistance(0, 500);
+    SetCamPitch(0, 5.5, -6.0);
+    SetCamPosA(0, 0, 0);
+    SetCamPosB(0, 130, -200);
+    SetCamPosC(0, 0, 0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    sleep 1;
+    spawn {
+        SetCamDistance(0, 400);
+        SetCamPosB(0, 130, 60);
+        SetCamSpeed(0, 1.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+    }
+    spawn {
+        N(func_802433C0_CC6BD0)(80);
+    }
+    SI_VAR(9) = spawn N(80244560);
+    LoadPath(80, N(vectorList_802443E4), 5, 0);
+0:
+    GetNextPathPos();
+    SetNpcPos(NPC_LAKILULU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    sleep 1;
+    if (SI_VAR(0) == 1) {
+        goto 0;
+    }
+    kill SI_VAR(9);
+    SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_9));
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    sleep 20;
+    GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 20;
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 250);
+    SetCamPitch(0, 5.5, -7.5);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00A4));
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 40;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 300);
+    SetCamSpeed(0, 4.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_8), NPC_ANIM(lakilulu, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x00A5));
+    GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 20;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 250);
+    SetCamSpeed(0, 4.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, Palette_00, Anim_3), 0, MESSAGE_ID(0x11, 0x00A6));
+    SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1));
+    EndSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0);
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 40;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 350);
+    SetCamSpeed(0, 10.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+10:
+    SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_A), NPC_ANIM(lakilulu, Palette_00, Anim_9), 0, MESSAGE_ID(0x11, 0x00A7));
+    ShowChoice(MESSAGE_ID(0x1E, 0x0020));
+    if (SI_VAR(0) != 0) {
+        await N(80244888);
+        sleep 10;
+        goto 10;
+    } else {
+        ContinueSpeech(1, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00A9));
+        SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_1));
+        SetPlayerAnimation(ANIM_NOD_YES);
+        sleep 10;
+        SetPlayerAnimation(ANIM_STAND_STILL);
+        sleep 20;
+        GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(0) += 20;
+        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetCamDistance(0, 250);
+        SetCamSpeed(0, 90.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+        SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, Palette_00, Anim_3), 0, MESSAGE_ID(0x11, 0x00AA));
+        SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1));
+        EndSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0);
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(0) += 40;
+        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetCamDistance(0, 350);
+        SetCamSpeed(0, 5.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+        sleep 10;
+        SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, Palette_00, Anim_3), 0, MESSAGE_ID(0x11, 0x00AB));
+        sleep 10;
+        ShowChoice(MESSAGE_ID(0x1E, 0x0021));
+        match SI_VAR(0) {
+            == -1 {}
+            == 0 {
+                ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AC));
+            }
+            == 1 {
+                ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AD));
+            }
+            == 2 {
+                ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AE));
+            }
+            == 3 {
+                ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AF));
+            }
+        }
+    }
+    InterpNpcYaw(NPC_LAKILULU0, 90, 1);
+    SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_9));
+    SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_A), NPC_ANIM(lakilulu, Palette_00, Anim_9), 5, MESSAGE_ID(0x11, 0x00B0));
+    SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00B1));
+    sleep 15;
+    SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_A), NPC_ANIM(lakilulu, Palette_00, Anim_9), 5, MESSAGE_ID(0x11, 0x00B2));
+    SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00B3));
+    sleep 10;
+    spawn {
+        ResetCam(0, 90.0);
+    }
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 30;
+    SetNpcSpeed(NPC_WORLD_LAKILESTER, 3.5);
+    NpcMoveTo(NPC_WORLD_LAKILESTER, SI_VAR(0), 60, 0);
+    N(UnkFunc41)(0, 8);
+    N(func_802435D0_CC6DE0)();
+    spawn N(802438CC);
+    sleep 15;
+    ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x0190), 160, 40);
+    spawn N(802438F8);
+    sleep 10;
+    PanToTarget(0, 0, 0);
+    STORY_PROGRESS = STORY_CH6_LAKILESTER_JOINED_PARTY;
+    EnablePartnerAI();
+    DisablePlayerInput(FALSE);
+    await N(80245014);
+});
+
+Script N(defeat_80246038) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(world_lakilester, Palette_00, Anim_4));
+            SetCamType(0, 6, 1);
+            GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(1), SI_VAR(2));
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(0) += SI_VAR(3);
+            SI_VAR(0) /= 2;
+            UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 300);
+            SetCamPitch(0, 17.0, -7.5);
+            SetCamSpeed(0, 90.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            spawn N(80245444);
+        }
+        == 1 {}
+        == 2 {
+        }
+    }
+});
+
+Script N(interact_802461C0) = SCRIPT({
+    if (STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0032));
+    } else {
+        GetCurrentPartnerID(SI_VAR(0));
+        if (SI_VAR(0) != 8) {
+            SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0034));
+        } else {
+            SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0032));
+        }
+    }
+});
+
+Script N(init_80246280) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_LAKILESTER_JOINED_PARTY) {
+        BindNpcIdle(NPC_SELF, N(idle_80244BF8));
+        BindNpcDefeat(NPC_SELF, N(defeat_80246038));
+    }
+});
+
+Script N(init_802462D0) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_BEGAN_PEACH_MISSION) {
+        BindNpcInteract(NPC_SELF, N(interact_802461C0));
+        SetNpcCollisionSize(-1, 36, 28);
+        if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+            SetNpcPos(NPC_SELF, -50, 180, -50);
+        }
+    } else {
+        RemoveNpc(NPC_SELF);
+    }
+});
+
+Script N(init_80246370) = SCRIPT({
+    SetNpcPos(NPC_LAKILULU1, 0, -1000, 0);
+    SetNpcAnimation(NPC_LAKILULU1, NPC_ANIM(lakilulu, Palette_00, Anim_B));
+});
+
+Script N(init_802463B0) = SCRIPT({
+    if (STORY_PROGRESS == STORY_CH6_SPOKE_WITH_THE_SUN) {
+        RemoveNpc(NPC_SELF);
+    }
+});
+
+Script N(init_802463E8) = SCRIPT({
+    if (STORY_PROGRESS == STORY_CH6_SPOKE_WITH_THE_SUN) {
+        RemoveNpc(NPC_SELF);
+    }
+    SetSelfVar(13, 1);
+});
+
+StaticNpc N(npcGroup_80246434) = {
+    .id = NPC_WORLD_LAKILESTER,
+    .settings = &N(npcSettings_80244100),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000,
+    .init = &N(init_80246280),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+        NPC_ANIM(world_lakilester, Palette_00, Anim_1),
+    },
+};
+
+StaticNpc N(npcGroup_80246624) = {
+    .id = NPC_LAKILULU0,
+    .settings = &N(npcSettings_80244100),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_802462D0),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00E2),
+};
+
+StaticNpc N(npcGroup_80246814) = {
+    .id = NPC_LAKILULU1,
+    .settings = &N(npcSettings_80244100),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80246370),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+        NPC_ANIM(lakilulu, Palette_00, Anim_1),
+    },
+};
+
+StaticNpc N(npcGroup_80246A04) = {
+    .id = NPC_LAKITU0,
+    .settings = &N(npcSettings_802441E4),
+    .pos = { 335.0f, 90.0f, 45.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_802463B0),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 25,
+    .itemDrops = {
+        { ITEM_SUPER_SHROOM, 2, 0 },
+        { ITEM_MAPLE_SYRUP, 2, 0 },
+        { ITEM_THUNDER_RAGE, 2, 0 },
+        { ITEM_STOP_WATCH, 2, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(3),
+    .maxCoinBonus = 2,
+    .movement = { 335, 90, 45, 30, 0, -32767, 0, 335, 90, 45, 250, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_2),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80246BF4) = {
+    .id = NPC_LAKITU1,
+    .settings = &N(npcSettings_802441E4),
+    .pos = { -320.0f, 90.0f, 0.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_802463B0),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 25,
+    .itemDrops = {
+        { ITEM_SUPER_SHROOM, 2, 0 },
+        { ITEM_MAPLE_SYRUP, 2, 0 },
+        { ITEM_THUNDER_RAGE, 2, 0 },
+        { ITEM_STOP_WATCH, 2, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(3),
+    .maxCoinBonus = 2,
+    .movement = { -320, 90, 0, 30, 0, -32767, 0, -320, 90, 0, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_2),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80246DE4) = {
+    .id = NPC_SPINY0,
+    .settings = &N(npcSettings_8024437C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS,
+    .init = &N(init_802463E8),
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80246FD4) = {
+    .id = NPC_SPINY1,
+    .settings = &N(npcSettings_8024437C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS,
+    .init = &N(init_802463E8),
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_802471C4) = {
+    .id = NPC_SPINY2,
+    .settings = &N(npcSettings_8024437C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS,
+    .init = &N(init_802463E8),
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_802473B4) = {
+    .id = NPC_SPINY3,
+    .settings = &N(npcSettings_8024437C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS,
+    .init = &N(init_802463E8),
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_802475A4) = {
+    .id = NPC_SPINY4,
+    .settings = &N(npcSettings_8024437C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS,
+    .init = &N(init_802463E8),
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80247794) = {
+    .id = NPC_SPINY5,
+    .settings = &N(npcSettings_8024437C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS,
+    .init = &N(init_802463E8),
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_80247984) = {
+    NPC_GROUP(N(npcGroup_80246A04), BATTLE_ID(24, 6, 0, 5)),
+    NPC_GROUP(N(npcGroup_80246BF4), BATTLE_ID(24, 4, 0, 5)),
+    NPC_GROUP(N(npcGroup_80246DE4), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_80246FD4), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_802471C4), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_802473B4), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_802475A4), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_80247794), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_80246434), BATTLE_ID(25, 5, 0, 2)),
+    NPC_GROUP(N(npcGroup_80246624), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80246814), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+#include "world/common/UnkFunc41.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802401C4_CC39D4);
-/*
 void N(func_802401C4_CC39D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -27,9 +1205,154 @@ void N(func_802401C4_CC39D4)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     script->functionTemp[0].s = 1;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374_CC3B84);
+#ifdef NON_MATCHING
+void N(func_802404D0_CB54D0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 temp_f24;
+    f32 posX, posY, posZ, posW;
+    s32 var;
+    f32 temp_f0;
+    f32 phi_f4;
+    s32 phi_v0;
+    s32 phi_s4 = 0;
+
+    f32 a = enemy->varTable[7];
+    f32 temp_f2  = a / 100.0;
+    f32 b = enemy->varTable[3];
+    f32 temp_f26 = b / 100.0;
+    f32 c = enemy->varTable[4];
+    f32 temp_f20 = c / 100.0;
+    f32 d = enemy->varTable[1];
+    f32 temp_f22 = d / 100.0;
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    temp_f24 = temp_f26 + temp_f2;
+
+    if ((enemy->varTable[0] & 0x11) == 1) {
+        if (npc->flags & 8) {
+            if (temp_f22 < (temp_f24 - npc->pos.y)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            if (temp_f22 < (temp_f26 - posW)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        }
+    }
+
+    if ((enemy->varTable[0] & 0x11) == 0x11) {
+        // original m2c reference:
+        //if ((temp_s0->flags & 8) != 0) {
+        //    phi_f0 = temp_f20 + ((temp_f24 - temp_f20) * D_802441A8_CB91A8);
+        //    phi_f4 = temp_f24;
+        //} else {
+        //    func_800DCB7C(temp_s0->unk_80, &subroutine_argA, &subroutine_argB, &subroutine_argC, &subroutine_argD, temp_s0->pos.x, temp_f20, temp_s0->pos.z, 1000.0f);
+        //    temp_f4 = subroutine_argB + temp_f26;
+        //    phi_f0 = temp_f20 + ((temp_f4 - temp_f20) * D_802441B0_CB91B0);
+        //    phi_f4 = temp_f4;
+        //}
+        //temp_s0->pos.y = phi_f0;
+
+        f64 test;
+        if (npc->flags & 8) {
+            phi_f4 = temp_f24;
+            npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        } else {
+            posX = npc->pos.x;
+            posY = temp_f20;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            phi_f4 = posY + temp_f26;
+            npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        }
+
+        if (fabsf(phi_f4 - npc->pos.y) < 1.0) {
+            npc->pos.y = phi_f4;
+            enemy->varTable[0] &= ~0x10;
+        }
+    } else if (enemy->varTable[1] > 0) {
+        temp_f0 = sin_deg(enemy->varTable[2]);
+        if (npc->flags & 8) {
+            phi_v0 = FALSE;
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+        }
+        if (phi_v0) {
+            npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22);
+        } else {
+            npc->pos.y = temp_f24 + (temp_f0 * temp_f22);
+        }
+        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
+    }
+
+    if (enemy->varTable[9] <= 0) {
+        if (aiSettings->unk_14 >= 0) {
+            if (script->functionTemp[1].s <= 0) {
+                script->functionTemp[1].s = aiSettings->unk_14;
+                if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
+                    func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
+                    fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
+                    npc->moveToPos.y = npc->pos.y;
+                    func_800494C0(npc, 0x2F4, 0x200000);
+                    if (enemy->npcSettings->unk_2A & 1) {
+                        script->functionTemp[0].s = 10;
+                    } else {
+                        script->functionTemp[0].s = 12;
+                    }
+                    return;
+                }
+            }
+            script->functionTemp[1].s--;
+        }
+    } else {
+        enemy->varTable[9]--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape,
+            enemy->territory->wander.point.x, enemy->territory->wander.point.z,
+            npc->pos.x, npc->pos.z,
+            enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) {
+        posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z);
+        if (npc->moveSpeed < posW) {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+            phi_s4 = 1;
+        }
+    }
+
+    if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        } else {
+            return;
+        }
+    }
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    if (aiSettings->moveTime > 0) {
+        if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+            script->functionTemp[0].s = 2;
+            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
+                script->functionTemp[0].s = 0;
+            }
+        }
+    }
+}
+#else
+INCLUDE_ASM(void, "world/area_flo/flo_13/CC3850", flo_13_func_80240374_CC3B84, ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory);
+#endif
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
@@ -37,18 +1360,15 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374_CC3B84);
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240E18_CC4628);
-/*
 void N(func_80240E18_CC4628)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_8024412C_CC793C)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
 }
-*/
 
 #include "world/common/UnkNpcAIFunc14.inc.c"
 
@@ -58,8 +1378,6 @@ void N(func_80240E18_CC4628)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkFunc5.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802414D0_CC4CE0);
-/*
 ApiStatus N(func_802414D0_CC4CE0)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Bytecode* args = script->ptrReadPos;
@@ -74,11 +1392,11 @@ ApiStatus N(func_802414D0_CC4CE0)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_802413AC_CC4BBC)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -99,7 +1417,7 @@ ApiStatus N(func_802414D0_CC4CE0)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80240A5C_CC426C)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -113,36 +1431,710 @@ ApiStatus N(func_802414D0_CC4CE0)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_8024101C_CC482C)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802416BC_CC4ECC);
+s32 N(func_802416BC_CC4ECC)(void) {
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241704_CC4F14);
+    for (i = 50; i < 56; i++) {
+        if (get_enemy(i)->varTable[10] == 0) {
+            return i;
+        }
+    }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241B68_CC5378);
+    return -1;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241DB8_CC55C8);
+void N(func_80241704_CC4F14)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    f32 temp_f20;
+    f32 temp_f22;
+    f32 temp_f24;
+    f32 var1 = enemy->varTable[4];
+    f32 var2 = enemy->varTable[3];
+    f32 var3;
+
+    temp_f22 = var1 / 100.0;
+    temp_f24 = var2 / 100.0;
+    if (npc->duration > 0) {
+        npc->duration--;
+    }
+    var3 = enemy->varTable[1];
+    temp_f20 = var3 / 100.0;
+
+    x = npc->pos.x;
+    y = npc->pos.y;
+    z = npc->pos.z;
+    w = 1000.0f;
+
+    func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+    npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20);
+    enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
+
+    if (aiSettings->unk_14 >= 0) {
+        if (script->functionTemp[1].s <= 0) {
+            script->functionTemp[1].s = aiSettings->unk_14;
+            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) {
+                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+                func_800494C0(npc, 0x2F4, 0x200000);
+                x = npc->pos.x;
+                y = npc->pos.y;
+                z = npc->pos.z;
+                w = 1000.0f;
+                func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+                npc->moveToPos.y = y + temp_f24;
+                script->functionTemp[0].s = 12;
+                return;
+            }
+        }
+        script->functionTemp[1].s--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ) != 0) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+    }
+
+    if (npc->turnAroundYawAdjustment == 0) {
+        if (npc->duration > 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+            if (enemy->varTable[0] & 1) {
+                x = npc->pos.x;
+                y = temp_f22;
+                z = npc->pos.z;
+                w = 1000.0f;
+                func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+                y += temp_f24;
+                w = y - temp_f22;
+                if (w > 2.0) {
+                    temp_f22 += 2.0;
+                } else if (w < -2.0) {
+                    temp_f22 -= 2.0;
+                } else {
+                    temp_f22 = y;
+                }
+                enemy->varTable[4] = (temp_f22 * 100.0);
+            }
+            if (npc->duration > 0) {
+                return;
+            }
+        }
+        script->functionTemp[0].s = 2;
+        script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+        if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1].s == 0)) {
+            script->functionTemp[0].s = 0;
+        }
+    }
+}
+
+void N(func_80241B68_CC5378)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    f32 var1 = enemy->varTable[3];
+    f32 var2;
+    f32 temp_f20;
+    f32 temp_f22;
+
+    temp_f22 = var1 / 100.0;
+    if (npc->duration > 0) {
+        npc->duration--;
+    }
+    var2 = enemy->varTable[1];
+    temp_f20 = var2 / 100.0;
+
+    x = npc->pos.x;
+    y = npc->pos.y;
+    z = npc->pos.z;
+    w = 1000.0f;
+
+    func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+    npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20);
+    enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) {
+        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        func_800494C0(npc, 0x2F4, 0x200000);
+        script->functionTemp[0].s = 12;
+        return;
+    }
+
+    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
+        script->functionTemp[1].s--;
+        if (script->functionTemp[1].s > 0) {
+            npc->yaw = clamp_angle(npc->yaw + 180.0f);
+            npc->duration = (rand_int(1000) % 11) + 5;
+            return;
+        }
+        script->functionTemp[0].s = 0;
+    }
+}
+
+// enemy2 is being copied to a0
+#ifdef NON_MATCHING
+ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+    f32 temp_f4;
+    f32 dist;
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 120.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall) {
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
+        script->functionTemp[0].s = 0;
+    }
+    npc->unk_AB = -3;
+
+    if (enemy->unk_B0 & 4) {
+        if (enemy->unk_B4 != 0) {
+            return ApiStatus_BLOCK;
+        }
+        enemy->unk_B0 &= ~4;
+    }
+
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            N(func_802401C4_CC39D4)(script, aiSettings, territoryPtr);
+
+        case 1:
+            N(func_80241704_CC4F14)(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
+
+        case 3:
+            N(func_80241B68_CC5378)(script, aiSettings, territoryPtr);
+            break;
+    }
+
+    if (script->functionTemp[0].s == 12) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+        enemy->varTable[4] = N(func_802416BC_CC4ECC)();
+        if (enemy->varTable[4] >= 0) {
+            Enemy* enemy2 = get_enemy(enemy->varTable[4]);
+            enemy2->varTable[10] = 1;
+            enemy2->varTable[11] = enemy->npcID;
+            npc->duration = 15;
+            npc->currentAnim = 0x490014;
+            script->functionTemp[0].s = 30;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 12:
+            N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
+            break;
+
+        case 14:
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
+            break;
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 30:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                get_enemy(enemy->varTable[4])->varTable[10] = 2;
+                npc->duration = 5;
+                script->functionTemp[0].s = 31;
+            }
+
+        case 31:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                npc->currentAnim = 0x490015;
+                get_enemy(enemy->varTable[4])->varTable[10] = 3;
+                npc->duration = 10;
+                script->functionTemp[0].s = 32;
+            }
+
+        case 32:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                npc->duration = 3;
+                script->functionTemp[0].s = 33;
+            }
+
+        case 33:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                script->functionTemp[0].s = 0;
+            }
+            break;
+    }
+
+    if (((u32)script->functionTemp[0].s - 30) < 2) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+        dist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, npc->pos.x, npc->pos.z);
+        if (!is_point_within_region(territoryPtr->shape, territoryPtr->pointX, territoryPtr->pointZ, npc->pos.x, npc->pos.z, territoryPtr->sizeX, territoryPtr->sizeZ)) {
+            if ((dist > 30.0) && (npc->turnAroundYawAdjustment == 0)) {
+                temp_f4 = dist - 20.0;
+                if (temp_f4 < 0.0) {
+                    temp_f4 = 0.0f;
+                }
+                if (temp_f4 > 200.0) {
+                    temp_f4 = 200.0f;
+                }
+                npc->moveSpeed = update_lerp(0, aiSettings->moveSpeed, aiSettings->chaseSpeed, temp_f4, 200);
+                npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+            }
+        }
+    }
+
+    return ApiStatus_BLOCK;
+}
+#else
+INCLUDE_ASM(ApiStatus, "world/area_flo/flo_13/CC3850", flo_13_func_80241DB8_CC55C8, ScriptInstance *script, s32 isInitialCall);
+#endif
 
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242314_CC5B24);
+void N(func_80242314_CC5B24)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
 #include "world/common/set_script_owner_npc_col_height.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024262C_CC5E3C);
+ApiStatus N(func_8024262C_CC5E3C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    Bytecode* args = script->ptrReadPos;
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+    s32 var;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242A6C_CC627C);
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 100.0f;
+    territory.unk_1C = 0;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80243368_CC6B78);
+    if (isInitialCall) {
+        enemy->varTable[6] = npc->collisionHeight;
+        enemy->varTable[8] = 0;
+        enemy->unk_B5 = 0;
+        enemy->unk_B0 |= 8;
+    }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802433C0_CC6BD0);
+    if (isInitialCall || (enemy->unk_B0 & 4)) {
+        script->functionTemp[0].s = 0;
+        npc->duration = 0;
+        enemy->unk_07 = 0;
+        npc->currentAnim = enemy->animList[0];
+        npc->flags &= ~0x800;
+        npc->collisionHeight = enemy->varTable[6];
+        enemy->varTable[9] = 0;
+        if (!enemy->territory->wander.isFlying) {
+            npc->flags = (npc->flags | 0x200) & ~8;
+        } else {
+            npc->flags = (npc->flags & ~0x200) | 8;
+        }
+        if (enemy->unk_B0 & 4) {
+            script->functionTemp[0].s = 99;
+            script->functionTemp[1].s = 0;
+            fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
+            enemy->unk_B0 &= ~4;
+        } else if (enemy->flags & 0x40000000) {
+            script->functionTemp[0].s = 12;
+            enemy->flags &= ~0x40000000;
+        }
+    }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802434D4_CC6CE4);
+    if (enemy->varTable[9] > 0) {
+        enemy->varTable[9]--;
+        if (enemy->varTable[9] == 0) {
+            if ((npc->currentAnim + 0xFFAAFFD2) < 2) {
+                npc->currentAnim = 0x55000C;
+            }
+        } else {
+            return ApiStatus_BLOCK;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800495A0(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+
+        case 1:
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            base_UnkNpcAIFunc1(script, aiSettings, territoryPtr);
+            if (enemy->varTable[7] == 6) {
+                if (rand_int(100) < 0x21) {
+                    if (enemy->varTable[8] != 0) {
+                        enemy->varTable[8] = 0;
+                        enemy->unk_B5 = 0;
+                        npc->currentAnim = 0x55002F;
+                    } else {
+                        enemy->varTable[8] = 1;
+                        enemy->unk_B5 = 1;
+                        npc->currentAnim = 0x55002E;
+                    }
+                    enemy->varTable[9] = 7;
+                    return ApiStatus_BLOCK;
+                }
+            }
+
+        case 3:
+            func_80049C04(script, aiSettings, territoryPtr);
+            break;
+
+        case 12:
+            N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(func_80242314_CC5B24)(script, aiSettings, territoryPtr);
+            break;
+
+        case 14:
+            N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr);
+            break;
+
+        case 15:
+            N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr);
+            break;
+
+        case 99:
+            func_8004A73C(script);
+            break;
+
+    }
+
+    if (enemy->varTable[7] == 6) {
+        if (enemy->varTable[8] != 0) {
+            enemy->unk_B5 = 1;
+        } else {
+            enemy->unk_B5 = 0;
+        }
+        if (enemy->varTable[8] != 0) {
+            switch (npc->currentAnim + 0xFFAAFFFC) {
+                case 0:
+                case 8:
+                case 10:
+                case 12:
+                case 14:
+                case 18:
+                case 20:
+                    npc->currentAnim++;
+                    break;
+            }
+        }
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_80242A6C_CC627C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    Bytecode* args = script->ptrReadPos;
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+    s32 var;
+    u32 x, y, z;
+    f32 x2, y2, z2, w2;
+    Npc* npc2;
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 65.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall) {
+        enemy->varTable[6] = npc->collisionHeight;
+        enemy->unk_B0 |= 8;
+    }
+
+    if (isInitialCall || (enemy->varTable[10] == 100)) {
+        script->functionTemp[0].s = 100;
+        npc->duration = 0;
+        npc->currentAnim = enemy->animList[0];
+        npc->flags &= ~0x800;
+        enemy->flags |= 0x200000;
+        npc->flags = (npc->flags & ~0x200) | 8;
+        enemy->varTable[10] = 0;
+        enemy->varTable[11] = -1;
+        npc->pos.x = 0.0f;
+        npc->pos.y = -1000.0f;
+        npc->pos.z = 0.0f;
+    }
+
+    if (enemy->unk_B0 & 4) {
+        npc->duration = 0;
+        npc->collisionHeight = enemy->varTable[6];
+        enemy->unk_B0 &= ~4;
+        if (npc->flags & 0x800) {
+            npc->currentAnim = 0x4A0018;
+            npc->moveSpeed = 0.0f;
+            npc->jumpVelocity = 0.0f;
+            npc->jumpScale = 1.0f;
+            script->functionTemp[0].s = 102;
+        } else {
+            fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
+            npc->currentAnim = enemy->animList[0];
+            script->functionTemp[1].s = 0;
+            script->functionTemp[0].s = 200;
+        }
+    }
+    get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z);
+    if ((script->functionTemp[0].s < 100) && ((x + 50) >= 421)) {
+        script->functionTemp[0].s = 110;
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800495A0(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+            if (enemy->varTable[13] != 0) {
+                if (npc->pos.y <= 0.0) {
+                    npc->flags = (npc->flags & ~0x200) | 8;
+                } else {
+                    npc->flags = (npc->flags | 0x200) & ~8;
+                }
+            }
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 1:
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            base_UnkNpcAIFunc1(script, aiSettings, territoryPtr);
+
+        case 3:
+            func_80049C04(script, aiSettings, territoryPtr);
+            break;
+
+        case 12:
+            N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(func_80242314_CC5B24)(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+            break;
+
+        case 14:
+            N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr);
+            break;
+
+        case 15:
+            N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr);
+            break;
+
+        case 100:
+            if (enemy->varTable[10] != 2) {
+                break;
+            }
+            npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID);
+            if (npc2->yaw < 180.0) {
+                npc->pos.x = npc2->pos.x + 12.0;
+            } else {
+                npc->pos.x = npc2->pos.x - 12.0;
+            }
+            npc->pos.y = npc2->pos.y + 25.0;
+            npc->pos.z = npc2->pos.z + 1.0;
+            npc->rotation.y = 0.0f;
+            npc->flags |= 8;
+            npc->flags &= ~2;
+            npc->flags &= ~0x200;
+            npc->renderYaw = 0.0f;
+            npc->currentAnim = 0x4A0018;
+            script->functionTemp[0].s = 101;
+
+        case 101:
+            if (enemy->varTable[10] != 3) {
+                break;
+            }
+            enemy->varTable[10] = 4;
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+            npc->moveSpeed = 2.5f;
+            npc->jumpVelocity = 8.0f;
+            npc->jumpScale = 0.8f;
+            npc->flags |= 0x800;
+            script->functionTemp[0].s = 102;
+
+        case 102:
+            if (npc->moveSpeed > 0.0) {
+                x2 = npc->pos.x;
+                y2 = npc->pos.y;
+                z2 = npc->pos.z;
+                if (func_800DDC44(npc->unk_80, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius) == 0) {
+                    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+                } else {
+                    npc->moveSpeed = 0.0f;
+                }
+            }
+
+
+            if (npc->jumpVelocity < 0.0) {
+                x2 = npc->pos.x;
+                y2 = npc->pos.y + 13.0;
+                z2 = npc->pos.z;
+                w2 = fabsf(npc->jumpVelocity) + 16.0;
+                if ((func_800DCB7C(npc->unk_80, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) {
+                    npc->pos.y = y2;
+                    enemy->territory->wander.point.x = npc->pos.x;
+                    enemy->territory->wander.point.y = npc->pos.y;
+                    enemy->territory->wander.point.z = npc->pos.z;
+                    enemy->territory->wander.detect.x = npc->pos.x;
+                    enemy->territory->wander.detect.y = npc->pos.y;
+                    enemy->territory->wander.detect.z = npc->pos.z;
+                    enemy->varTable[10] = 5;
+                    if (enemy->varTable[13] != 0) {
+                        if (npc->pos.y <= 0.0) {
+                            npc->flags = (npc->flags & ~0x200) | 8;
+                        } else {
+                            npc->flags = (npc->flags | 0x200) & ~8;
+                        }
+                    } else if (!enemy->territory->wander.isFlying) {
+                        npc->flags = (npc->flags | 0x200) & ~8;
+                    } else {
+                        npc->flags = (npc->flags & ~0x200) | 8;
+                    }
+                    npc->flags = (npc->flags | 0x40000) & ~0x800;
+                    npc->jumpVelocity = 0.0f;
+                    npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+                    npc->currentAnim = 0x4A001A;
+                    npc->duration = 3;
+                    script->functionTemp[0].s = 103;
+                    break;
+                }
+            }
+            npc->pos.y += npc->jumpVelocity;
+            npc->jumpVelocity -= npc->jumpScale;
+            break;
+
+        case 103:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                npc->flags &= 0xFFFBFFFF;
+                npc->currentAnim = 0x4A0001;
+                script->functionTemp[0].s = 0;
+            }
+            break;
+
+        case 110:
+            npc->duration = 30;
+            npc->pos.x = 0.0f;
+            npc->pos.z = 0.0f;
+            npc->pos.y = -1000.0f;
+            npc->flags = (npc->flags | 0xA) & ~0x200;
+            script->functionTemp[0].s = 111;
+
+        case 111:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                enemy->varTable[10] = 0;
+                script->functionTemp[0].s = 100;
+            }
+            break;
+
+        case 200:
+            func_8004A73C(script);
+            break;
+
+    }
+    return ApiStatus_BLOCK;
+}
+
+#include "world/common/UnkFunc42.inc.c"
+
+ApiStatus N(func_802433C0_CC6BD0)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(1);
+    s16 param1;
+    s16 param2;
+
+    script->functionTemp[1].s = get_variable(script, *script->ptrReadPos);
+
+    if (isInitialCall) {
+        script->functionTemp[0].s = 0;
+    }
+    if (script->functionTemp[0].s == (script->functionTemp[0].s / 5) * 5) {
+
+        sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z,
+            &param1, &param2, 0x200002);
+
+        sfx_play_sound_with_params(0x295, param1, param2,
+            update_lerp(0, 500.0f, 0.0f, script->functionTemp[0].s, script->functionTemp[1].s));
+    }
+
+    script->functionTemp[0].s++;
+    return (script->functionTemp[1].s < script->functionTemp[0].s) * ApiStatus_DONE2;
+}
+
+ApiStatus N(func_802434D4_CC6CE4)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(0);
+    s16 param1;
+    s16 param2;
+
+    if (isInitialCall) {
+        script->functionTemp[0].s = 0;
+    }
+    if (script->functionTemp[0].s == (script->functionTemp[0].s / 5) * 5) {
+
+        sfx_get_spatialized_sound_params(npc->pos.x, npc->pos.y, npc->pos.z,
+            &param1, &param2, 0x200002);
+
+        sfx_play_sound_with_params(0x295, param1, param2,
+            update_lerp(0, 500.0f, 0.0f, script->functionTemp[0].s, 0x50));
+    }
+
+    script->functionTemp[0].s++;
+    return (script->functionTemp[0].s > 0x50) * ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_13/CC6DE0.c b/src/world/area_flo/flo_13/CC6DE0.c
index 6fd5649179..c45012f82d 100644
--- a/src/world/area_flo/flo_13/CC6DE0.c
+++ b/src/world/area_flo/flo_13/CC6DE0.c
@@ -1,3 +1,31 @@
 #include "flo_13.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_13/CC6DE0", func_802435D0_CC6DE0);
+typedef struct {
+    /* 0x00 */ s32* unk_00;
+    /* 0x04 */ s32* unk_04;
+    /* 0x08 */ s16 unk_08;
+    /* 0x0A */ s16 unk_0A;
+    /* 0x0C */ s32 unk_0C;
+    /* 0x10 */ s32 unk_10;
+} N(Unk_bss_struct);
+
+static s8 N(D_80247B00)[0x200];
+static s8 N(D_80247D00)[0x3D90];
+static N(Unk_bss_struct) N(D_8024BA90);
+
+ApiStatus N(func_802435D0_CC6DE0)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_13/flo_13.h b/src/world/area_flo/flo_13/flo_13.h
index a033abed51..be1f47c381 100644
--- a/src/world/area_flo/flo_13/flo_13.h
+++ b/src/world/area_flo/flo_13/flo_13.h
@@ -2,3 +2,15 @@
 #include "map.h"
 
 #define NAMESPACE flo_13
+
+ApiStatus N(func_80240000_CC3810)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc41)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc42)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802433C0_CC6BD0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802434D4_CC6CE4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802435D0_CC6DE0)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80247984);
+extern Script N(main);
\ No newline at end of file
diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c
index 2d6496a04b..7a6377aa52 100644
--- a/src/world/area_flo/flo_14/CCB310.c
+++ b/src/world/area_flo/flo_14/CCB310.c
@@ -1,19 +1,688 @@
 #include "flo_14.h"
+#include "message_ids.h"
+
+EntryList N(entryList) = {
+    {  720.0f, 0.0f, 0.0f, 270.0f },
+    { -720.0f, 0.0f, 0.0f,  90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_14_tattle },
+};
+
+Script N(802423F0) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(updateTexturePan_80242460) = SCRIPT({
+    group 0;
+    if (SI_VAR(5) == 1) {
+        if (SI_VAR(6) == 1) {
+            if (SI_VAR(7) == 1) {
+                if (SI_VAR(8) == 1) {
+                    N(UnkTexturePanFunc)();
+                    return;
+                }
+            }
+        }
+    }
+    N(UnkTexturePanFunc2)();
+});
+
+Script N(exitWalk_802424FC) = EXIT_WALK_SCRIPT(60,  0, "flo_00",  1);
+
+Script N(exitWalk_80242558) = EXIT_WALK_SCRIPT(60,  1, "flo_13",  0);
+
+Script N(802425B4) = SCRIPT({
+    bind N(exitWalk_80242558) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_802424FC) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+s32 N(lavaResetList_802425FC)[] = {
+    0x0000001F, 0xC3FA0000, 0x00000000, 0xC2B40000, 0x00000019, 0xC3FF0000, 0x00000000, 0x00000000,
+    0x00000020, 0xC3FA0000, 0x00000000, 0x42DC0000, 0x00000021, 0xC37A0000, 0x00000000, 0xC2B40000,
+    0x0000001A, 0xC3700000, 0x00000000, 0x00000000, 0x00000022, 0xC37A0000, 0x00000000, 0x42DC0000,
+    0x0000001B, 0xC2480000, 0x00000000, 0x41C80000, 0x0000001C, 0x428C0000, 0x42700000, 0xC2BE0000,
+    0x0000001D, 0x43CD0000, 0x42700000, 0xC2BE0000, 0x0000001E, 0x44098000, 0x00000000, 0x42480000,
+    0x00000023, 0xC2480000, 0x00000000, 0x42DC0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80244F00));
+    spawn N(80244F30);
+    ModifyColliderFlags(3, 9, 0x00000002);
+    spawn {
+        ResetFromLava(N(lavaResetList_802425FC));
+    }
+    EnableTexPanning(29, 1);
+    EnableTexPanning(31, 1);
+    EnableTexPanning(32, 1);
+    EnableTexPanning(35, 1);
+    EnableTexPanning(36, 1);
+    EnableTexPanning(39, 1);
+    EnableTexPanning(41, 1);
+    EnableTexPanning(43, 1);
+    EnableTexPanning(45, 1);
+    EnableTexPanning(47, 1);
+    EnableTexPanning(49, 1);
+    EnableTexPanning(51, 1);
+    EnableTexPanning(53, 1);
+    EnableTexPanning(30, 1);
+    EnableTexPanning(33, 1);
+    EnableTexPanning(34, 1);
+    EnableTexPanning(37, 1);
+    EnableTexPanning(38, 1);
+    EnableTexPanning(42, 1);
+    EnableTexPanning(44, 1);
+    EnableTexPanning(46, 1);
+    EnableTexPanning(48, 1);
+    EnableTexPanning(50, 1);
+    EnableTexPanning(52, 1);
+    EnableTexPanning(54, 1);
+    spawn {
+        SI_VAR(0) = 1;
+        SI_VAR(1) = 140;
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80242460);
+    }
+    spawn {
+        SI_VAR(0) = 2;
+        SI_VAR(1) = -200;
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80242460);
+    }
+    spawn N(80243E78);
+    spawn N(80245224);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(802425B4);
+    spawn EnterWalk;
+    await N(802423F0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_8024030C_CCB61C)();
+    }
+});
+
+static s32 N(pad_2BF4)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80242C00) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(80242EAC) = SCRIPT({
+    SI_VAR(9) = SI_VAR(6);
+    SI_VAR(8) = SI_VAR(5);
+    SI_VAR(7) = SI_VAR(4);
+    SI_VAR(6) = SI_VAR(3);
+    SI_VAR(5) = SI_VAR(2);
+    SI_VAR(4) = SI_VAR(1);
+    SI_VAR(3) = SI_VAR(0);
+    EnableModel(SI_VAR(6), 0);
+0:
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    N(UnkFunc43)();
+    if (SI_VAR(0) == 0) {
+        sleep 1;
+        goto 0;
+    }
+    spawn {
+        sleep 5;
+        EnableModel(SI_VAR(6), 1);
+    }
+    if (SI_VAR(10) != 0) {
+        spawn {
+            sleep 5;
+            SI_VAR(0) = SI_VAR(3);
+            SI_VAR(1) = SI_VAR(4);
+            SI_VAR(2) = SI_VAR(5);
+            SI_VAR(1) += 10;
+            SI_VAR(2) += 8;
+            PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 15, 0, 0, 0, 0, 0, 0, 0, 0);
+            sleep 15;
+            SI_VAR(1) -= 10;
+            MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 14, 0);
+        }
+    }
+    spawn {
+        sleep 10;
+        PlaySoundAt(0xF8, 0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    }
+    MakeLerp(0, 180, 20, 2);
+1:
+    UpdateLerp();
+    RotateModel(SI_VAR(8), SI_VAR(0), 1, 0, 0);
+    RotateModel(SI_VAR(9), SI_VAR(0), 1, 0, 0);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+    EnableModel(SI_VAR(7), 0);
+});
+
+s32 N(D_802431CC_CCE4DC) = {
+    0x00000000,
+};
+
+Script N(802431D0) = SCRIPT({
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    MakeLerp(SI_VAR(1), 48, 15, 0);
+    loop {
+        UpdateLerp();
+        GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        SetCamTarget(0, SI_VAR(2), SI_VAR(0), SI_VAR(4));
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    loop {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetCamTarget(0, SI_VAR(0), 48, SI_VAR(2));
+        sleep 1;
+    }
+});
+
+Script N(802432E8) = SCRIPT({
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_GRAVITY)), FALSE);
+    loop {
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(1) += 20;
+        SI_VAR(2) += -5;
+        SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        sleep 1;
+    }
+});
+
+Vec3f N(vectorList_80243384)[] = {
+     { 531.0, 75.0, 81.0 }, { 481.0, 80.0, 81.0 },
+     { 431.0, 75.0, 81.0 }, { 381.0, 70.0, 81.0 },
+     { 331.0, 75.0, 81.0 }, { 281.0, 80.0, 81.0 },
+     { 231.0, 75.0, 81.0 }, { 181.0, 70.0, 81.0 },
+     { 131.0, 75.0, 81.0 }, { 81.0, 80.0, 81.0 },
+     { 31.0, 75.0, 81.0 }, { -19.0, 70.0, 81.0 },
+     { -69.0, 75.0, 81.0 },
+};
+
+Script N(80243420) = SCRIPT({
+    sleep 20;
+    PlaySound(0x80000023);
+    LoadPath(165, N(vectorList_80243384), 13, 10);
+0:
+    GetNextPathPos();
+    TranslateModel(123, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    SI_VAR(2) += -27;
+    SI_VAR(3) += -10;
+    SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    N(func_8024046C_CCB77C)(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+    sleep 1;
+    if (SI_VAR(0) == 1) {
+        goto 0;
+    }
+    StopSound(0x80000023);
+});
+
+Script N(8024352C) = SCRIPT({
+    IsPlayerWithin(531, 81, 30, SI_VAR(0));
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    DisablePlayerInput(TRUE);
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        func_802D2B6C();
+        sleep 20;
+    }
+    DisablePlayerPhysics(TRUE);
+    DisablePartnerAI(0);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_GRAVITY)), FALSE);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
+    GetModelCenter(123);
+    spawn {
+        SI_VAR(2) += -10;
+        SetPlayerJumpscale(0.2001953125);
+        PlayerJump(531, 48, SI_VAR(2), 10);
+        SetPlayerActionState(10);
+    }
+    spawn {
+        sleep 5;
+        SI_VAR(2) += -15;
+        SetNpcJumpscale(NPC_PARTNER, 0.2001953125);
+        NpcJump0(NPC_PARTNER, 531, 68, SI_VAR(2), 10);
+    }
+    SI_MAP_VAR(9) = spawn N(802431D0);
+    sleep 15;
+    N(func_802403D4_CCB6E4)();
+    if (SI_VAR(14) != 0) {
+        SI_VAR(14) = spawn N(802432E8);
+    }
+    await N(80243420);
+    if (SI_VAR(14) != 0) {
+        kill SI_VAR(14);
+        N(func_8024042C_CCB73C)();
+    }
+    GetModelCenter(123);
+    PlayEffect(0x43, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 2, 0, 0, 0, 0, 0, 0, 0, 0);
+    PlaySoundAt(0x2F3, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    ClearPartnerMoveHistory(-4);
+    EnableModel(123, 0);
+    SI_AREA_FLAG(37) = 0;
+    kill SI_MAP_VAR(9);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_GRAVITY)), TRUE);
+    EnablePartnerAI();
+    DisablePlayerPhysics(FALSE);
+    DisablePlayerInput(FALSE);
+    unbind;
+});
+
+Script N(80243870) = SCRIPT({
+    PlaySoundAt(0x193, 0, 591, 55, 121);
+    EnableModel(123, 1);
+    SI_VAR(2) = 1.0;
+    SI_VAR(4) = 0.0;
+    SI_VAR(5) = 0.0;
+    SI_VAR(6) = 0.0;
+    SI_VAR(7) = -30;
+    SI_VAR(8) = 20;
+    SI_VAR(7) /= 90.0;
+    SI_VAR(8) /= 90.0;
+    SI_VAR(9) = 180;
+    loop SI_VAR(9) {
+        TranslateModel(123, 591, 55, 121);
+        SI_VAR(3) = (float) SI_VAR(2);
+        SI_VAR(3) /= (float) 10;
+        ScaleModel(123, SI_VAR(3), SI_VAR(3), SI_VAR(3));
+        TranslateModel(123, SI_VAR(4), SI_VAR(5), SI_VAR(6));
+        SI_VAR(2) += 0.05078125;
+        if (SI_VAR(9) > 90) {
+            SI_VAR(4) += (float) SI_VAR(7);
+            SI_VAR(5) += (float) SI_VAR(8);
+        }
+        sleep 1;
+    }
+    SI_VAR(7) = -30;
+    SI_VAR(8) = -40;
+    SI_VAR(7) /= 60.0;
+    SI_VAR(8) /= 60.0;
+    loop 60 {
+        TranslateModel(123, 591, 55, 121);
+        ScaleModel(123, SI_VAR(3), SI_VAR(3), SI_VAR(3));
+        TranslateModel(123, SI_VAR(4), SI_VAR(5), SI_VAR(6));
+        SI_VAR(4) += (float) SI_VAR(7);
+        SI_VAR(6) += (float) SI_VAR(8);
+        sleep 1;
+    }
+    SI_AREA_FLAG(36) = 0;
+    SI_AREA_FLAG(37) = 1;
+});
+
+s32 N(D_80243B14_CCEE24) = {
+    0x00000000,
+};
+
+s32 N(D_80243B18_CCEE28) = {
+    0x0000005A,
+};
+
+// *INDENT-OFF*
+Script N(80243B1C) = {
+    SI_CMD(ScriptOpcode_SET_GROUP, 0),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(15), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_LABEL, 0),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_AREA_FLAG(35), 1),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+        SI_CMD(ScriptOpcode_GOTO, 0),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_USE_BUFFER, &N(D_802431CC_CCE4DC)),
+    SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_CALL, RandInt, 10, SI_VAR(0)),
+        SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(0)),
+        SI_CMD(ScriptOpcode_GOTO, 0),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, EnableModel, SI_VAR(15), 1),
+    SI_CMD(ScriptOpcode_CALL, RandInt, 4, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_ADD_F, SI_VAR(0), SI_FIXED(4.0)),
+    SI_CMD(ScriptOpcode_MUL_F, SI_VAR(0), SI_FIXED(-1.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(1), SI_FIXED(2.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(2), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_DIV_F, SI_VAR(2), SI_FIXED(10.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(3), SI_FIXED(0.400390625)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(4), SI_FIXED(591.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(5), SI_FIXED(60.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(6), SI_FIXED(121.0)),
+    SI_CMD(ScriptOpcode_CALL, RandInt, 3, SI_VAR(7)),
+    SI_CMD(ScriptOpcode_ADD_F, SI_VAR(7), SI_FIXED(3.0)),
+    SI_CMD(ScriptOpcode_MUL_F, SI_VAR(7), SI_FIXED(0.0400390625)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(9), SI_VAR(7)),
+    SI_CMD(ScriptOpcode_DIV_F, SI_VAR(9), SI_FIXED(5.0)),
+    SI_CMD(ScriptOpcode_CALL, RandInt, 50, SI_VAR(8)),
+    SI_CMD(ScriptOpcode_ADD, SI_VAR(8), 50),
+    SI_CMD(ScriptOpcode_LOOP, SI_VAR(8)),
+        SI_CMD(ScriptOpcode_SET_F, SI_VAR(14), SI_VAR(2)),
+        SI_CMD(ScriptOpcode_SUB_F, SI_VAR(14), SI_VAR(0)),
+        SI_CMD(ScriptOpcode_MUL_F, SI_VAR(14), SI_FIXED(0.046875)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(0), SI_VAR(14)),
+        SI_CMD(ScriptOpcode_SET_F, SI_VAR(14), SI_VAR(3)),
+        SI_CMD(ScriptOpcode_SUB_F, SI_VAR(14), SI_VAR(1)),
+        SI_CMD(ScriptOpcode_MUL_F, SI_VAR(14), SI_FIXED(0.046875)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(1), SI_VAR(14)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(4), SI_VAR(0)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(5), SI_VAR(1)),
+        SI_CMD(ScriptOpcode_SET_F, SI_VAR(14), SI_VAR(7)),
+        SI_CMD(ScriptOpcode_SUB_F, SI_VAR(14), SI_VAR(9)),
+        SI_CMD(ScriptOpcode_MUL_F, SI_VAR(14), SI_FIXED(0.203125)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(9), SI_VAR(14)),
+        SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_VAR(15), SI_VAR(4), SI_VAR(5), SI_VAR(6)),
+        SI_CMD(ScriptOpcode_CALL, ScaleModel, SI_VAR(15), SI_VAR(9), SI_VAR(9), SI_VAR(9)),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_CALL, EnableModel, SI_VAR(15), 0),
+    SI_CMD(ScriptOpcode_GOTO, 0),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80243E78) = SCRIPT({
+    ModifyColliderFlags(3, 31, 0x00000006);
+    ModifyColliderFlags(3, 32, 0x00000006);
+    ModifyColliderFlags(3, 33, 0x00000006);
+    ModifyColliderFlags(3, 34, 0x00000006);
+    ModifyColliderFlags(3, 35, 0x00000006);
+    SI_VAR(0) = -730;
+    SI_VAR(1) = -130;
+    SI_VAR(2) = -470;
+    SI_VAR(3) = -70;
+    SI_VAR(4) = 0;
+    spawn N(80242C00);
+    SI_VAR(0) = -730;
+    SI_VAR(1) = 70;
+    SI_VAR(2) = -470;
+    SI_VAR(3) = 140;
+    SI_VAR(4) = 0;
+    spawn N(80242C00);
+    SI_VAR(0) = -280;
+    SI_VAR(1) = 130;
+    SI_VAR(2) = -110;
+    SI_VAR(3) = -70;
+    SI_VAR(4) = 0;
+    spawn N(80242C00);
+    SI_VAR(0) = -280;
+    SI_VAR(1) = 70;
+    SI_VAR(2) = -10;
+    SI_VAR(3) = 140;
+    SI_VAR(4) = 0;
+    spawn N(80242C00);
+    GetModelCenter(96);
+    SI_VAR(3) = 96;
+    SI_VAR(4) = 97;
+    SI_VAR(5) = 98;
+    SI_VAR(6) = 99;
+    SI_VAR(10) = 174;
+    spawn N(80242EAC);
+    GetModelCenter(82);
+    SI_VAR(3) = 82;
+    SI_VAR(4) = 83;
+    SI_VAR(5) = 84;
+    SI_VAR(6) = 85;
+    SI_VAR(10) = 0;
+    spawn N(80242EAC);
+    GetModelCenter(76);
+    SI_VAR(3) = 76;
+    SI_VAR(4) = 77;
+    SI_VAR(5) = 78;
+    SI_VAR(6) = 79;
+    SI_VAR(10) = 0;
+    spawn N(80242EAC);
+    GetModelCenter(90);
+    SI_VAR(3) = 90;
+    SI_VAR(4) = 91;
+    SI_VAR(5) = 92;
+    SI_VAR(6) = 93;
+    SI_VAR(10) = 0;
+    spawn N(80242EAC);
+    ModifyColliderFlags(0, 15, 0x7FFFFE00);
+    CloneModel(124, 10001);
+    CloneModel(124, 10002);
+    CloneModel(124, 10003);
+    CloneModel(124, 10004);
+    CloneModel(124, 10005);
+    EnableModel(123, 0);
+    EnableModel(124, 0);
+    EnableModel(10001, 0);
+    EnableModel(10002, 0);
+    EnableModel(10003, 0);
+    EnableModel(10004, 0);
+    EnableModel(10005, 0);
+    SI_VAR(0) = 10001;
+    spawn N(80243B1C);
+    SI_VAR(0) = 10002;
+    spawn N(80243B1C);
+    SI_VAR(0) = 10003;
+    spawn N(80243B1C);
+    SI_VAR(0) = 10004;
+    spawn N(80243B1C);
+    SI_VAR(0) = 10005;
+    spawn N(80243B1C);
+    func_802C9C70(0, 123, 1);
+    func_802C94A0(1, N(func_80240504_CCB814), 0);
+    func_802C90FC(123, 1, -1);
+    func_802C90FC(10001, 1, -1);
+    func_802C90FC(10002, 1, -1);
+    func_802C90FC(10003, 1, -1);
+    func_802C90FC(10004, 1, -1);
+    func_802C90FC(10005, 1, -1);
+    func_802C9C70(1, 57, 1);
+    func_802C94A0(2, N(func_802407D4_CCBAE4), 0);
+    func_802C90FC(57, 2, -1);
+});
 
 #include "world/common/UnkTexturePanFunc.inc.c"
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_8024030C_CCB61C);
+void func_80072950();
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_80240340_CCB650);
+ApiStatus N(func_8024030C_CCB61C)(ScriptInstance *script, s32 isInitialCall) {
+    func_80072950(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_802403D4_CCB6E4);
+#include "world/common/UnkFunc43.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_8024042C_CCB73C);
+ApiStatus N(func_802403D4_CCB6E4)(ScriptInstance *script, s32 isInitialCall) {
+    if (gPlayerData.currentPartner == PARTNER_NONE) {
+        script->varTable[14] = 0;
+        return ApiStatus_DONE2;
+    }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_8024046C_CCB77C);
+    script->varTable[14] = 1;
+    set_variable(NULL, SI_MAP_VAR(0), get_npc_unsafe(-4)->flags);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_80240504_CCB814);
+ApiStatus N(func_8024042C_CCB73C)(ScriptInstance *script, s32 isInitialCall) {
+    Npc* npc = get_npc_unsafe(-4);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCB310", func_802407D4_CCBAE4);
+    npc->flags = get_variable(NULL, SI_MAP_VAR(0));
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_8024046C_CCB77C)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    script->functionTemp[0].s = get_variable(script, *args++);
+    script->functionTemp[1].s = get_variable(script, *args++);
+    script->functionTemp[2].s = get_variable(script, *args++);
+    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0].s, script->functionTemp[1].s, script->functionTemp[2].s);
+    return ApiStatus_DONE2;
+}
+
+// graphics macros
+#ifdef NON_MATCHING
+s32 func_8011C2EC(s32);
+void func_8011C2B0(s32, s32*,s32*, s32*);
+void guMtxF2L(Matrix4f, Mtx *m);
+void guMtxIdentF(Matrix4f);
+
+void N(func_80240504_CCB814)(void) {
+    Matrix4f matrix;
+    s32 x, y, z;
+
+    guMtxIdentF(matrix);
+
+    matrix[0][0] = (sin_rad(N(D_80243B14_CCEE24) / 11.0f) * 0.04) + 0.98;
+    matrix[0][1] = sin_rad(N(D_80243B14_CCEE24) / 12.0f) * 0.04;
+    matrix[0][2] = cos_rad(N(D_80243B14_CCEE24) / 13.0f) * 0.04;
+
+    matrix[1][1] = (sin_rad(N(D_80243B14_CCEE24) / 7.0f + 1.0f) * 0.04) + 0.98;
+    matrix[1][0] = sin_rad(N(D_80243B14_CCEE24) / 14.0f) * 0.04;
+    matrix[1][2] = cos_rad(N(D_80243B14_CCEE24) / 15.0f) * 0.04;
+
+    matrix[2][2] = (sin_rad(N(D_80243B14_CCEE24) * 0.25f + 2.0f)  * 0.04) + 0.98;
+    matrix[2][0] = sin_rad(N(D_80243B14_CCEE24) * 0.0625f) * 0.04;
+    matrix[2][1] = cos_rad(N(D_80243B14_CCEE24) / 17.0f) * 0.04;
+
+    guMtxF2L(matrix, &gDisplayContext->matrixStack[gMatrixListPos]);
+
+    func_8011C2B0(0, &x, &y, &z);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    gSPDisplayList(gMasterGfxPos++, func_8011C2EC(0));
+
+    N(D_80243B14_CCEE24) += 1.0f;
+}
+#else
+INCLUDE_ASM(void, "world/area_flo/flo_14/CCB310", flo_14_func_80240504_CCB814, void);
+#endif
+
+typedef struct {
+    /* 0x00 */s16 unk_00;
+    /* 0x02 */s16 unk_02;
+    /* 0x04 */s16 unk_04;
+    /* 0x06 */char unk_06[0xA];
+} N(UnkStruct); // size = 0x10
+
+void N(func_802407D4_CCBAE4)(void) {
+    s32 i;
+    N(UnkStruct)* x;
+    N(UnkStruct)* y;
+    s32 z;
+    f32 temp_f20;
+    f32 temp_f0;
+
+    func_8011C2B0(1, &x, &y, &z);
+
+    for (i = 0; i < z; i++) {
+        N(UnkStruct)* ptr1 = &x[i];
+        N(UnkStruct)* ptr2 = &y[i];
+
+        if (ptr1->unk_00 < 0x259) {
+            temp_f20 = (sin_rad((N(D_80243B18_CCEE28) / 180.0f) * 3.141592) * 0.3) + 0.7;
+            temp_f0 = 0.2 - (sin_rad((N(D_80243B18_CCEE28) / 180.0f) * 3.141592) * 0.2);
+            ptr2->unk_00 = ((ptr1->unk_00 - 0x268) * temp_f20) + 616.0f + (temp_f0 * -48.0f);
+            ptr2->unk_02 = ((ptr1->unk_02 - 0x2C) * temp_f20) + 44.0f + (temp_f0 * 25.0f);
+            ptr2->unk_04 = ((ptr1->unk_04 - 0x71) * temp_f20) + 113.0f + (temp_f0 * -87.0f);
+        }
+    }
+
+    gSPDisplayList(gMasterGfxPos++, func_8011C2EC(1));
+
+    if (get_variable(NULL, SI_AREA_FLAG(36)) != 0) {
+        if (N(D_80243B18_CCEE28) > 90) {
+            N(D_80243B18_CCEE28) -= 360;
+        }
+        if (N(D_80243B18_CCEE28) >= -90) {
+            N(D_80243B18_CCEE28) += 5;
+        } else {
+            N(D_80243B18_CCEE28) += 20;
+        }
+        if (N(D_80243B18_CCEE28) >= 90) {
+            N(D_80243B18_CCEE28) = 90;
+        }
+    } else {
+        if (((u32)N(D_80243B18_CCEE28) - 141) < 119) {
+            N(D_802431CC_CCE4DC) = 1;
+        } else {
+            N(D_802431CC_CCE4DC) = 0;
+        }
+        N(D_80243B18_CCEE28) += 5;
+    }
+
+    if (N(D_80243B18_CCEE28) >= 360) {
+        N(D_80243B18_CCEE28) -= 360;
+    }
+}
diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c
index 393c168adf..ff27a28d12 100644
--- a/src/world/area_flo/flo_14/CCBE20.c
+++ b/src/world/area_flo/flo_14/CCBE20.c
@@ -1,7 +1,314 @@
 #include "flo_14.h"
+#include "sprite/npc/bubulb.h"
+#include "sprite/npc/bzzap.h"
+
+enum {
+    NPC_BUBULB,
+    NPC_BZZAP,
+};
+
+static s32 N(D_802453B0_EF79C0)[91];
+
+f32 N(D_802444C0_CCF7D0)[] = {
+     4.5f, 3.5f, 2.6f, 2.0f,
+     1.5f, 20.0f,
+};
+
+NpcAISettings N(npcAISettings_802444D8) = {
+    .moveSpeed = 1.0f,
+    .moveTime = 30,
+    .waitTime = 5,
+    .alertRadius = 80.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 2,
+    .chaseSpeed = 4.5f,
+    .unk_1C = { .s = 6 },
+    .unk_20 = 1,
+    .chaseRadius = 90.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80244508) = SCRIPT({
+    SetSelfVar(0, 0);
+    SetSelfVar(5, -630);
+    SetSelfVar(6, 50);
+    SetSelfVar(1, 200);
+    N(func_80241E1C_CCD12C)(N(npcAISettings_802444D8));
+});
+
+NpcSettings N(npcSettings_80244578) = {
+    .height = 26,
+    .radius = 24,
+    .ai = &N(npcAI_80244508),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+NpcSettings N(npcSettings_802445A4) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_802445D0) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+s32 N(D_802445FC_CCF90C) = {
+    0x00000000,
+};
+
+s32 N(D_80244600_CCF910) = {
+    0x00000000,
+};
+
+Script N(80244604) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D663C();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_80242288_CCD598)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(80244738) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_802422C0_CCD5D0), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80244604), 0x10, 0, N(D_802453B0_EF79C0), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_80242234_CCD544), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+s32 N(D_80244788_CCFA98)[] = {
+    0x000000A1, 0x00000000,
+};
+
+Script N(interact_80244790) = SCRIPT({
+    if (SI_AREA_FLAG(37) == 1) {
+        SI_AREA_FLAG(35) = 1;
+        SpeakToPlayer(NPC_SELF, -1, -1, 0, MESSAGE_ID(0x11, 0x0063));
+        SI_AREA_FLAG(35) = 0;
+        return;
+    }
+    SI_AREA_FLAG(35) = 1;
+    if (SI_SAVE_FLAG(1412) == 0) {
+        SpeakToPlayer(NPC_SELF, -1, -1, 0, MESSAGE_ID(0x11, 0x005F));
+    } else {
+        SpeakToPlayer(NPC_SELF, -1, -1, 0, MESSAGE_ID(0x11, 0x0060));
+    }
+    FindItem(161, SI_VAR(0));
+    if (SI_VAR(0) != -1) {
+        SI_VAR(0) = N(D_80244788_CCFA98);
+        SI_VAR(1) = 0;
+        await N(80244738);
+        if (SI_VAR(0) == -1) {
+            SpeakToPlayer(NPC_SELF, -1, -1, 0, MESSAGE_ID(0x11, 0x0064));
+        } else {
+            SpeakToPlayer(NPC_SELF, -1, -1, 0, MESSAGE_ID(0x11, 0x0061));
+            SI_AREA_FLAG(36) = 1;
+            SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE);
+            PlayerMoveTo(555, 110, 20);
+            SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), FALSE);
+            InterpPlayerYaw(90, 0);
+            func_802CF56C(2);
+            sleep 5;
+            AdjustCam(0, 1.0, 0, 350, 17.0, -6.0);
+            spawn N(80243870);
+            SpeakToPlayer(NPC_SELF, -1, -1, 0, MESSAGE_ID(0x11, 0x0062));
+            spawn {
+                sleep 40;
+                InterpPlayerYaw(315, 0);
+            }
+        10:
+            if (SI_AREA_FLAG(37) == 0) {
+                sleep 1;
+                goto 10;
+            }
+            ResetCam(0, 4.0);
+            SpeakToPlayer(NPC_SELF, -1, -1, 5, MESSAGE_ID(0x11, 0x0063));
+            SI_SAVE_FLAG(1412) = 1;
+            bind N(8024352C) to TRIGGER_FLOOR_PRESS_A 30;
+        }
+    }
+    SI_AREA_FLAG(35) = 0;
+});
+
+Script N(init_80244ADC) = SCRIPT({
+    SI_AREA_FLAG(36) = 0;
+    SI_AREA_FLAG(37) = 0;
+    BindNpcInteract(NPC_SELF, N(interact_80244790));
+});
+
+StaticNpc N(npcGroup_80244B20) = {
+    .id = NPC_BUBULB,
+    .settings = &N(npcSettings_802445A4),
+    .pos = { 617.0f, 0.0f, 108.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_4000,
+    .init = &N(init_80244ADC),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_E),
+        NPC_ANIM(bubulb, Palette_00, Anim_E),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+        NPC_ANIM(bubulb, Palette_00, Anim_2),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00E3),
+};
+
+StaticNpc N(npcGroup_80244D10) = {
+    .id = NPC_BZZAP,
+    .settings = &N(npcSettings_80244578),
+    .pos = { -175.0f, 55.0f, 15.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .minCoinBonus = 1,
+    .maxCoinBonus = 4,
+    .movement = { -175, 55, 15, 30, 0, -32767, 0, -175, 55, 15, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_4),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_80244F00) = {
+    NPC_GROUP(N(npcGroup_80244B20), BATTLE_ID(0, 0, 0, 0)),
+    NPC_GROUP(N(npcGroup_80244D10), BATTLE_ID(24, 25, 0, 1)),
+    {},
+};
+
+static s32 N(pad_4F24)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80244F30) = SCRIPT({
+    MakeItemEntity(ITEM_STAR_PIECE, 675, 60, -100, 17, SI_SAVE_FLAG(1387));
+});
+
+static s32 N(pad_4F64)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80244F70) = SCRIPT({
+    loop {
+        N(func_80242360_CCD670)(SI_VAR(0));
+        if (SI_VAR(0) == SI_VAR(4)) {
+            GetPlayerActionState(SI_VAR(0));
+            if (SI_VAR(0) != 23) {
+                if (SI_VAR(8) == 0) {
+                    spawn {
+                        GetModelCenter(SI_VAR(5));
+                        PlaySoundAt(0x1DB, 4194304, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                    }
+                }
+                if (SI_VAR(7) < 90) {
+                    if (SI_VAR(7) == 0) {
+                        sleep 5;
+                        SI_VAR(8) = 6;
+                        ModifyColliderFlags(0, SI_VAR(9), 0x7FFFFE00);
+                    }
+                    SI_VAR(8) += 1;
+                    SI_VAR(7) += SI_VAR(8);
+                }
+                goto 50;
+            }
+        }
+        if (SI_VAR(7) != 0) {
+            SI_VAR(8) -= 1;
+            SI_VAR(7) += SI_VAR(8);
+            if (SI_VAR(7) <= 0) {
+                SI_VAR(8) = 0;
+                SI_VAR(7) = 0;
+                spawn {
+                    GetModelCenter(SI_VAR(5));
+                    PlaySoundAt(0x1DC, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                }
+                ModifyColliderFlags(1, SI_VAR(9), 0x7FFFFE00);
+            }
+        }
+    50:
+        if (SI_VAR(7) >= 90) {
+            SI_VAR(8) = -1;
+            SI_VAR(7) = 90;
+        }
+        RotateModel(SI_VAR(5), SI_VAR(7), -1, 0, 0);
+        RotateModel(SI_VAR(6), SI_VAR(7), -1, 0, 0);
+        sleep 1;
+    }
+});
+
+Script N(80245224) = SCRIPT({
+    SI_VAR(4) = 21;
+    SI_VAR(5) = 21;
+    SI_VAR(6) = 20;
+    SI_VAR(7) = SI_MAP_VAR(10);
+    SI_VAR(8) = SI_MAP_VAR(11);
+    SI_VAR(9) = 22;
+    spawn N(80244F70);
+    SI_VAR(4) = 17;
+    SI_VAR(5) = 26;
+    SI_VAR(6) = 25;
+    SI_VAR(7) = SI_MAP_VAR(12);
+    SI_VAR(8) = SI_MAP_VAR(13);
+    SI_VAR(9) = 18;
+    spawn N(80244F70);
+});
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240B10_CCBE20);
-/*
 void N(func_80240B10_CCBE20)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -25,9 +332,155 @@ void N(func_80240B10_CCBE20)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     script->functionTemp[0].s = 1;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240CC0_CCBFD0);
+#ifdef NON_MATCHING
+// second func_800DCB7C call
+void N(func_80240CC0_CCBFD0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 temp_f24;
+    f32 posX, posY, posZ, posW;
+    s32 var;
+    f32 temp_f0;
+    f32 phi_f4;
+    s32 phi_v0;
+    s32 phi_s4 = 0;
+
+    f32 a = enemy->varTable[7];
+    f32 temp_f2  = a / 100.0;
+    f32 b = enemy->varTable[3];
+    f32 temp_f26 = b / 100.0;
+    f32 c = enemy->varTable[4];
+    f32 temp_f20 = c / 100.0;
+    f32 d = enemy->varTable[1];
+    f32 temp_f22 = d / 100.0;
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    temp_f24 = temp_f26 + temp_f2;
+
+    if ((enemy->varTable[0] & 0x11) == 1) {
+        if (npc->flags & 8) {
+            if (temp_f22 < (temp_f24 - npc->pos.y)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            if (temp_f22 < (temp_f26 - posW)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        }
+    }
+
+    if ((enemy->varTable[0] & 0x11) == 0x11) {
+        // original m2c reference:
+        //if ((temp_s0->flags & 8) != 0) {
+        //    phi_f0 = temp_f20 + ((temp_f24 - temp_f20) * D_802441A8_CB91A8);
+        //    phi_f4 = temp_f24;
+        //} else {
+        //    func_800DCB7C(temp_s0->unk_80, &subroutine_argA, &subroutine_argB, &subroutine_argC, &subroutine_argD, temp_s0->pos.x, temp_f20, temp_s0->pos.z, 1000.0f);
+        //    temp_f4 = subroutine_argB + temp_f26;
+        //    phi_f0 = temp_f20 + ((temp_f4 - temp_f20) * D_802441B0_CB91B0);
+        //    phi_f4 = temp_f4;
+        //}
+        //temp_s0->pos.y = phi_f0;
+
+        f64 test;
+        if (npc->flags & 8) {
+            phi_f4 = temp_f24;
+            npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        } else {
+            posX = npc->pos.x;
+            posY = temp_f20;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            phi_f4 = posY + temp_f26;
+            npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        }
+
+        if (fabsf(phi_f4 - npc->pos.y) < 1.0) {
+            npc->pos.y = phi_f4;
+            enemy->varTable[0] &= ~0x10;
+        }
+    } else if (enemy->varTable[1] > 0) {
+        temp_f0 = sin_deg(enemy->varTable[2]);
+        if (npc->flags & 8) {
+            phi_v0 = FALSE;
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+        }
+        if (phi_v0) {
+            npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22);
+        } else {
+            npc->pos.y = temp_f24 + (temp_f0 * temp_f22);
+        }
+        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
+    }
+
+    if (enemy->varTable[9] <= 0) {
+        if (aiSettings->unk_14 >= 0) {
+            if (script->functionTemp[1].s <= 0) {
+                script->functionTemp[1].s = aiSettings->unk_14;
+                if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
+                    func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
+                    fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
+                    npc->moveToPos.y = npc->pos.y;
+                    func_800494C0(npc, 0x2F4, 0x200000);
+                    if (enemy->npcSettings->unk_2A & 1) {
+                        script->functionTemp[0].s = 10;
+                    } else {
+                        script->functionTemp[0].s = 12;
+                    }
+                    return;
+                }
+            }
+            script->functionTemp[1].s--;
+        }
+    } else {
+        enemy->varTable[9]--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape,
+            enemy->territory->wander.point.x, enemy->territory->wander.point.z,
+            npc->pos.x, npc->pos.z,
+            enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) {
+        posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z);
+        if (npc->moveSpeed < posW) {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+            phi_s4 = 1;
+        }
+    }
+
+    if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        } else {
+            return;
+        }
+    }
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    if (aiSettings->moveTime > 0) {
+        if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+            script->functionTemp[0].s = 2;
+            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
+                script->functionTemp[0].s = 0;
+            }
+        }
+    }
+}
+#else
+INCLUDE_ASM(void, "world/area_flo/flo_14/CCBE20", flo_14_func_80240CC0_CCBFD0, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory);
+#endif
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
@@ -35,18 +488,15 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240CC0_CCBFD0);
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241764_CCCA74);
-/*
 void N(func_80241764_CCCA74)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_802444C0_CCF7D0)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
 }
-*/
 
 #include "world/common/UnkNpcAIFunc14.inc.c"
 
@@ -56,8 +506,6 @@ void N(func_80241764_CCCA74)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkFunc5.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241E1C_CCD12C);
-/*
 ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Bytecode* args = script->ptrReadPos;
@@ -72,11 +520,11 @@ ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80241CF8_CCD008)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -97,7 +545,7 @@ ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802413A8_CCC6B8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -111,50 +559,58 @@ ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80241968_CCCC78)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242234_CCD544);
-/*
 ApiStatus N(func_80242234_CCD544)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802445FC_CCF90C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802445FC_CCF90C)) {
+        N(D_802445FC_CCF90C) = FALSE;
+        set_variable(script, *args, N(D_80244600_CCF910));
         return ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242288_CCD598);
-/*
 ApiStatus N(func_80242288_CCD598)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80244600_CCF910) = get_variable(script, *args);
+    N(D_802445FC_CCF90C) = TRUE;
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802422C0_CCD5D0);
+extern s32 N(D_802453B0_EF79C0)[91];
+
+ApiStatus N(func_802422C0_CCD5D0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_802453B0_EF79C0)[i] = ptr[i];
+        }
+        N(D_802453B0_EF79C0)[i] = 0;
+    } else {
+        for (i = 0; i <= 90; i++) {
+            N(D_802453B0_EF79C0)[i] = i + 128;
+            N(D_802453B0_EF79C0)[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_14/CCD670.c b/src/world/area_flo/flo_14/CCD670.c
index c4882fdba2..a8d0b4e84c 100644
--- a/src/world/area_flo/flo_14/CCD670.c
+++ b/src/world/area_flo/flo_14/CCD670.c
@@ -1,3 +1,8 @@
 #include "flo_14.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_14/CCD670", func_80242360_CCD670);
+ApiStatus N(func_80242360_CCD670)(ScriptInstance *script, s32 isInitialCall) {
+    CollisionStatus* collisionStatus = &gCollisionStatus;
+
+    set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_14/flo_14.h b/src/world/area_flo/flo_14/flo_14.h
index 586f8ceceb..87fd833704 100644
--- a/src/world/area_flo/flo_14/flo_14.h
+++ b/src/world/area_flo/flo_14/flo_14.h
@@ -2,3 +2,28 @@
 #include "map.h"
 
 #define NAMESPACE flo_14
+
+ApiStatus N(func_80242360_CCD670)(ScriptInstance *script, s32 isInitialCall);
+ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024030C_CCB61C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc43)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802403D4_CCB6E4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024042C_CCB73C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024046C_CCB77C)(ScriptInstance* script, s32 isInitialCall);
+void N(func_80240504_CCB814)(void);
+void N(func_802407D4_CCBAE4)(void);
+ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242234_CCD544)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242288_CCD598)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802422C0_CCD5D0)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80244F00);
+extern Script N(80243E78);
+extern Script N(8024352C);
+extern Script N(80243870);
+extern Script N(80244F30);
+extern Script N(80245224);
+extern Script N(d_80242360);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_15/CD06C0.c b/src/world/area_flo/flo_15/CD06C0.c
new file mode 100644
index 0000000000..ea476cb698
--- /dev/null
+++ b/src/world/area_flo/flo_15/CD06C0.c
@@ -0,0 +1,416 @@
+#include "flo_15.h"
+#include "message_ids.h"
+#include "sprite/npc/sun.h"
+
+enum {
+    NPC_SUN0 = 10,
+    NPC_SUN1,
+};
+
+EntryList N(entryList) = {
+    {  320.0f, 0.0f,  0.0f, 270.0f },
+    { -170.0f, 0.0f, 55.0f,   0.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_15_tattle },
+};
+
+Script N(80240060) = SCRIPT({
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8);
+    } else {
+        match STORY_PROGRESS {
+            < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+                SetMusicTrack(0, SONG_SUN_TOWER_CLOUDY, 0, 8);
+            }
+            else {
+                SetMusicTrack(0, SONG_SUN_TOWER_SUNNY, 0, 8);
+            }
+        }
+    }
+});
+
+static s32 N(pad_11C) = {
+    0x00000000,
+};
+
+Script N(exitWalk_80240120) = EXIT_WALK_SCRIPT(60,  0, "flo_13",  1);
+
+Script N(8024017C) = SCRIPT({
+    bind N(exitWalk_80240120) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_802412C0));
+    await N(makeEntities);
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        spawn N(802404D8);
+    } else {
+        ModifyColliderFlags(0, 1, 0x7FFFFE00);
+        SI_VAR(0) = N(8024017C);
+        spawn EnterWalk;
+    }
+    ModifyColliderFlags(0, 14, 0x7FFFFE00);
+    spawn N(802413B0);
+    await N(80240060);
+});
+
+static s32 N(pad_2FC) = {
+    0x00000000,
+};
+
+NpcSettings N(npcSettings_80240300) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+Script N(8024032C) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        SI_VAR(3) = 7;
+        SI_VAR(4) = 5;
+    } else {
+        SI_VAR(3) = 15;
+        SI_VAR(4) = 1;
+    }
+    loop {
+        SI_VAR(5) = SI_VAR(3);
+        loop SI_VAR(5) {
+            GetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) += 1;
+            SetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetNpcPos(NPC_SUN1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep SI_VAR(4);
+        }
+        SI_VAR(5) = SI_VAR(3);
+        loop SI_VAR(5) {
+            GetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(1) += -1;
+            SetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetNpcPos(NPC_SUN1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            sleep SI_VAR(4);
+        }
+    }
+});
+
+Script N(802404D8) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    SetNpcPos(NPC_SUN0, 0, 270, 0);
+    SetNpcPos(NPC_SUN1, 0, -1000, 0);
+    sleep 1;
+    GetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 1050);
+    SetCamPitch(0, 10.0, 4.0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SetCamDistance(0, 300);
+    SetCamPitch(0, 15.0, -10.0);
+    SetCamSpeed(0, 6.5);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_9), NPC_ANIM(sun, Palette_00, Anim_9), 517, MESSAGE_ID(0x11, 0x00C3));
+    SetNpcAnimation(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_9));
+    spawn {
+        SetCamDistance(0, 1000);
+        SetCamSpeed(0, 5.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+    }
+    sleep 15;
+    SetNpcJumpscale(NPC_SUN0, 0.0);
+    GetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(1) += 400;
+    NpcJump0(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 40);
+    GotoMap("flo_00", 9);
+    sleep 70;
+});
+
+Script N(aux_8024079C) = SCRIPT({
+    func_802CDE68(11, 48);
+    loop {
+        MakeLerp(-30, 30, 20, 11);
+        loop {
+            UpdateLerp();
+            SetNpcRotation(NPC_SUN1, 0, 0, SI_VAR(0));
+            GetNpcPos(NPC_SUN0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+            SetNpcPos(NPC_SUN1, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+            sleep 1;
+            if (SI_VAR(1) == 0) {
+                break loop;
+            }
+        }
+        MakeLerp(30, -30, 20, 11);
+        loop {
+            UpdateLerp();
+            SetNpcRotation(NPC_SUN1, 0, 0, SI_VAR(0));
+            GetNpcPos(NPC_SUN0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+            SetNpcPos(NPC_SUN1, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+            sleep 1;
+            if (SI_VAR(1) == 0) {
+                break loop;
+            }
+        }
+    }
+});
+
+Script N(8024094C) = SCRIPT({
+    loop {
+        sleep 1;
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        if (SI_VAR(1) > 220) {
+            break loop;
+        }
+    }
+    spawn {
+        sleep 15;
+        PlayerFaceNpc(10, 0);
+    }
+    SetNpcJumpscale(NPC_SUN0, 0.0);
+    GetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(1) -= 400;
+    NpcJump0(NPC_SUN0, SI_VAR(0), 275, SI_VAR(2), 30);
+    SI_VAR(9) = spawn N(8024032C);
+    loop {
+        sleep 1;
+        if (SI_AREA_FLAG(38) == 1) {
+            break loop;
+        }
+    }
+    DisablePlayerInput(TRUE);
+    sleep 10;
+    kill SI_VAR(9);
+    SetNpcFlagBits(NPC_SUN0, ((NPC_FLAG_100)), TRUE);
+    GetNpcPos(NPC_SUN0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    NpcJump0(NPC_SUN0, SI_VAR(0), 450, SI_VAR(2), 30);
+    DisablePlayerInput(FALSE);
+    unbind;
+});
+
+Script N(interact_80240B28) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_SPOKE_WITH_THE_SUN {
+            SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009A));
+            SetPlayerAnimation(ANIM_THINKING);
+            sleep 20;
+            SetPlayerAnimation(ANIM_80007);
+            sleep 20;
+            SetPlayerAnimation(ANIM_10002);
+            SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009B));
+            STORY_PROGRESS = STORY_CH6_SPOKE_WITH_THE_SUN;
+        }
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009C));
+        }
+        < STORY_CH6_STAR_SPIRIT_RESCUED {
+            if (SI_SAVE_FLAG(1410) == 0) {
+                SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009D));
+                SI_SAVE_FLAG(1410) = 1;
+            } else {
+                SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009E));
+            }
+        }
+        else {
+            SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009F));
+        }
+    }
+    SI_AREA_FLAG(38) = 1;
+});
+
+Script N(init_80240CD0) = SCRIPT({
+    SetNpcCollisionSize(10, 64, 40);
+    EnableNpcShadow(NPC_SUN0, FALSE);
+    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        SetNpcPos(NPC_SUN0, 0, 270, 0);
+        BindNpcInteract(NPC_SELF, N(interact_80240B28));
+        spawn N(8024032C);
+    } else {
+        SetNpcPos(NPC_SUN0, 0, 450, 0);
+        BindNpcInteract(NPC_SELF, N(interact_80240B28));
+        SI_AREA_FLAG(38) = 0;
+        spawn N(8024094C);
+    }
+});
+
+Script N(init_80240DB4) = SCRIPT({
+    EnableNpcShadow(NPC_SUN1, FALSE);
+    SetNpcAnimation(NPC_SUN1, NPC_ANIM(sun, Palette_00, Anim_2));
+    func_802CFE80(10, 3);
+    func_802CFE80(11, 3);
+    func_802CFFC0(10, 0, 1, 5, 5, 13, 5, 0, 0);
+    func_802CFFC0(11, 0, 1, 5, 5, 13, 5, 0, 0);
+    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        SetNpcPos(NPC_SUN1, 0, 270, -5);
+    } else {
+        SetNpcPos(NPC_SUN1, 0, 450, -5);
+        BindNpcAux(-1, N(aux_8024079C));
+    }
+});
+
+StaticNpc N(npcGroup_80240EE0)[] = {
+    {
+        .id = NPC_SUN0,
+        .settings = &N(npcSettings_80240300),
+        .pos = { 0.0f, 250.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000,
+        .init = &N(init_80240CD0),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E1),
+    },
+    {
+        .id = NPC_SUN1,
+        .settings = &N(npcSettings_80240300),
+        .pos = { 0.0f, 250.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_8000,
+        .init = &N(init_80240DB4),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+            NPC_ANIM(sun, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E1),
+    },
+};
+
+NpcGroupList N(npcGroupList_802412C0) = {
+    NPC_GROUP(N(npcGroup_80240EE0), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+static s32 N(pad_12D8)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(802412E0) = SCRIPT({
+    SI_SAVE_FLAG(1401) = 1;
+});
+
+Script N(makeEntities) = SCRIPT({
+    if (SI_SAVE_FLAG(1401) == 0) {
+        MakeEntity(0x802BCF00, -180, 0, -18, 0, MAKE_ENTITY_END);
+        AssignScript(N(802412E0));
+    }
+});
+
+static s32 N(pad_135C) = {
+    0x00000000,
+};
+
+s32 N(intTable_80241360)[] = {
+    0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4,
+    0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80,
+    0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D,
+};
+
+// *INDENT-OFF*
+Script N(802413B0) = {
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1401), 0),
+        SI_CMD(ScriptOpcode_LABEL, 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1401), 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_GOTO, 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_CALL, DisablePlayerInput, 1),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_80241360)),
+            SI_CMD(ScriptOpcode_LOOP, 10),
+                SI_CMD(ScriptOpcode_BUFFER_READ_2, SI_VAR(1), SI_VAR(2)),
+                SI_CMD(ScriptOpcode_CALL, ShakeCam, 0, 0, SI_VAR(1), SI_VAR(2)),
+            SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_CALL, UseSettingsFrom, 0, -170, 0, 35),
+        SI_CMD(ScriptOpcode_CALL, SetPanTarget, 0, -170, 0, 35),
+        SI_CMD(ScriptOpcode_CALL, SetCamDistance, 0, 600),
+        SI_CMD(ScriptOpcode_CALL, SetCamPitch, 0, SI_FIXED(25.0), SI_FIXED(-9.0)),
+        SI_CMD(ScriptOpcode_CALL, SetCamPosA, 0, SI_FIXED(-50.0), SI_FIXED(25.0)),
+        SI_CMD(ScriptOpcode_CALL, SetCamSpeed, 0, SI_FIXED(1.5)),
+        SI_CMD(ScriptOpcode_CALL, PanToTarget, 0, 0, 1),
+        SI_CMD(ScriptOpcode_CALL, WaitForCam, 0, SI_FIXED(1.0)),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 100),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 6, 4, -180, 0, -15, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 6, 4, -190, 0, -35, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_LOOP, 6),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtCollider, 11, 391, 0),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 20),
+            SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_CALL, MakeLerp, 0, -50, 120, 2),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+            SI_CMD(ScriptOpcode_CALL, TranslateGroup, 16, 0, SI_VAR(0), 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+                SI_CMD(ScriptOpcode_BREAK_LOOP),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_CALL, ModifyColliderFlags, 0, 12, 2147483136),
+        SI_CMD(ScriptOpcode_CALL, ModifyColliderFlags, 1, 14, 2147483136),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+        SI_CMD(ScriptOpcode_CALL, ResetCam, 0, SI_FIXED(90.0)),
+        SI_CMD(ScriptOpcode_CALL, DisablePlayerInput, 0),
+    SI_CMD(ScriptOpcode_ELSE),
+        SI_CMD(ScriptOpcode_CALL, ModifyColliderFlags, 0, 12, 2147483136),
+        SI_CMD(ScriptOpcode_CALL, ModifyColliderFlags, 1, 14, 2147483136),
+        SI_CMD(ScriptOpcode_CALL, TranslateGroup, 16, 0, -50, 0),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
diff --git a/src/world/area_flo/flo_15/flo_15.h b/src/world/area_flo/flo_15/flo_15.h
new file mode 100644
index 0000000000..b9ba653cba
--- /dev/null
+++ b/src/world/area_flo/flo_15/flo_15.h
@@ -0,0 +1,10 @@
+#include "common.h"
+#include "map.h"
+
+#define NAMESPACE flo_15
+
+extern NpcGroupList N(npcGroupList_802412C0);
+extern Script N(802404D8);
+extern Script N(802413B0);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_flo/flo_16/CD1E30.c b/src/world/area_flo/flo_16/CD1E30.c
index 75f8df9a28..d9d9145cff 100644
--- a/src/world/area_flo/flo_16/CD1E30.c
+++ b/src/world/area_flo/flo_16/CD1E30.c
@@ -1,3 +1,8 @@
 #include "flo_16.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1E30", func_80240000_CD1E30);
+void func_80072950();
+
+ApiStatus N(func_80240000_CD1E30)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_16/CD1E70.c b/src/world/area_flo/flo_16/CD1E70.c
index 3db86fcec8..99a4c33b51 100644
--- a/src/world/area_flo/flo_16/CD1E70.c
+++ b/src/world/area_flo/flo_16/CD1E70.c
@@ -1,3 +1,3 @@
 #include "flo_16.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1E70", func_80240040_CD1E70);
+#include "world/common/UnkFunc43.inc.c"
diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c
index 4d69205ea1..50652997b9 100644
--- a/src/world/area_flo/flo_16/CD1F10.c
+++ b/src/world/area_flo/flo_16/CD1F10.c
@@ -1,87 +1,569 @@
 #include "flo_16.h"
+#include "message_ids.h"
+
+extern s32 D_800F7F00[];
+extern s32 D_800F7F40[];
+extern s32 D_8008EF20[11][4];
+
+EntryList N(entryList) = {
+    { -720.0f,   0.0f, 0.0f,  90.0f },
+    {  710.0f, 100.0f, 0.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_16_tattle },
+};
+
+Script N(802429D0) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(exitWalk_80242A40) = EXIT_WALK_SCRIPT(60,  0, "flo_00",  4);
+
+Script N(exitWalk_80242A9C) = EXIT_WALK_SCRIPT(60,  1, "flo_17",  0);
+
+Script N(80242AF8) = SCRIPT({
+    bind N(exitWalk_80242A40) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_80242A9C) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+s32 N(lavaResetList_80242B40)[] = {
+    0x0000000A, 0xC39B0000, 0x00000000, 0x00000000, 0x0000000B, 0x43988000, 0x42C80000, 0x00000000,
+    0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_802444D4));
+    await N(makeEntities);
+    spawn N(8024346C);
+    ModifyColliderFlags(3, 9, 0x00000002);
+    spawn {
+        ResetFromLava(N(lavaResetList_80242B40));
+    }
+    EnableTexPanning(16, 1);
+    EnableTexPanning(17, 1);
+    EnableTexPanning(18, 1);
+    EnableTexPanning(20, 1);
+    EnableTexPanning(22, 1);
+    EnableTexPanning(24, 1);
+    EnableTexPanning(19, 1);
+    EnableTexPanning(21, 1);
+    EnableTexPanning(23, 1);
+    EnableTexPanning(25, 1);
+    spawn {
+        SI_VAR(0) = 0;
+        SI_VAR(1) = 0;
+    0:
+        SI_VAR(0) += 140;
+        if (SI_VAR(0) > 65536) {
+            SI_VAR(0) += -65536;
+        }
+        SetTexPanOffset(1, 0, SI_VAR(0), 0);
+        SI_VAR(1) += -200;
+        if (SI_VAR(1) < 0) {
+            SI_VAR(1) += 65536;
+        }
+        SetTexPanOffset(2, 0, SI_VAR(1), 0);
+        sleep 1;
+        goto 0;
+    }
+    spawn N(802451C4);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(80242AF8);
+    spawn EnterWalk;
+    await N(802429D0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CD1E30)();
+    }
+});
+
+Script N(80242EA0) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(8024314C) = SCRIPT({
+    SI_VAR(9) = SI_VAR(6);
+    SI_VAR(8) = SI_VAR(5);
+    SI_VAR(7) = SI_VAR(4);
+    SI_VAR(6) = SI_VAR(3);
+    SI_VAR(5) = SI_VAR(2);
+    SI_VAR(4) = SI_VAR(1);
+    SI_VAR(3) = SI_VAR(0);
+    EnableModel(SI_VAR(6), 0);
+0:
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    N(UnkFunc43)();
+    if (SI_VAR(0) == 0) {
+        sleep 1;
+        goto 0;
+    }
+    spawn {
+        sleep 5;
+        EnableModel(SI_VAR(6), 1);
+    }
+    if (SI_VAR(10) != 0) {
+        spawn {
+            sleep 5;
+            SI_VAR(0) = SI_VAR(3);
+            SI_VAR(1) = SI_VAR(4);
+            SI_VAR(2) = SI_VAR(5);
+            SI_VAR(1) += 10;
+            SI_VAR(2) += 8;
+            PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 15, 0, 0, 0, 0, 0, 0, 0, 0);
+            sleep 15;
+            SI_VAR(1) -= 10;
+            MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 14, 0);
+        }
+    }
+    spawn {
+        sleep 10;
+        PlaySoundAt(0xF8, 0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    }
+    MakeLerp(0, 180, 20, 2);
+1:
+    UpdateLerp();
+    RotateModel(SI_VAR(8), SI_VAR(0), 1, 0, 0);
+    RotateModel(SI_VAR(9), SI_VAR(0), 1, 0, 0);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+    EnableModel(SI_VAR(7), 0);
+});
+
+Script N(8024346C) = SCRIPT({
+    ModifyColliderFlags(3, 20, 0x00000006);
+    SI_VAR(0) = -740;
+    SI_VAR(1) = -140;
+    SI_VAR(2) = -260;
+    SI_VAR(3) = -55;
+    SI_VAR(4) = 100;
+    spawn N(80242EA0);
+    SI_VAR(0) = 250;
+    SI_VAR(1) = -140;
+    SI_VAR(2) = 725;
+    SI_VAR(3) = -55;
+    SI_VAR(4) = 180;
+    spawn N(80242EA0);
+    GetModelCenter(65);
+    SI_VAR(3) = 65;
+    SI_VAR(4) = 66;
+    SI_VAR(5) = 67;
+    SI_VAR(6) = 68;
+    SI_VAR(10) = 0;
+    spawn N(8024314C);
+    GetModelCenter(71);
+    SI_VAR(3) = 71;
+    SI_VAR(4) = 72;
+    SI_VAR(5) = 73;
+    SI_VAR(6) = 74;
+    SI_VAR(10) = 174;
+    spawn N(8024314C);
+    GetModelCenter(79);
+    SI_VAR(3) = 79;
+    SI_VAR(4) = 80;
+    SI_VAR(5) = 81;
+    SI_VAR(6) = 82;
+    SI_VAR(10) = 0;
+    spawn N(8024314C);
+    GetModelCenter(85);
+    SI_VAR(3) = 85;
+    SI_VAR(4) = 86;
+    SI_VAR(5) = 87;
+    SI_VAR(6) = 88;
+    SI_VAR(10) = 0;
+    spawn N(8024314C);
+});
+
+static s32 N(pad_36FC) = {
+    0x00000000,
+};
+
+s32 N(D_80243700_CD5530)[] = {
+    0x001D00F0, 0x001D00F1,
+};
+
+s16 N(D_80243708_CD5538)[] = {
+    0x0001, 0x0002, 0x0003, 0x0004,
+    0x0009, 0x0006, 0x0007, 0x0008
+};
+
+s32 N(D_80243718_CD5548)[8][2] = {
+    { 0x001D00E0, 0x001D00E1 }, { 0x001D00E2, 0x001D00E3 },
+    { 0x001D00E4, 0x001D00E5 }, { 0x001D00E6, 0x001D00E7 },
+    { 0x001D00E8, 0x001D00E9 }, { 0x001D00EA, 0x001D00EB },
+    { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF }
+};
+
+f32 N(D_80243758_CD5588)[] = {
+    140.0f, 180.0f, 220.0f,
+};
+
+Script N(80243764) = SCRIPT({
+    sleep 10;
+    PlaySound(0x212D);
+    N(UnkFunc21)(SI_MAP_VAR(0));
+    sleep 85;
+    spawn {
+        PlaySound(0x212E);
+        N(UnkFunc23)(70, 70);
+        sleep 27;
+        PlaySound(SOUND_UNKNOWN_208E);
+        N(UnkFunc23)(50, 50);
+    }
+    spawn {
+        sleep 3;
+        N(func_8024011C_CD1F4C)(SI_MAP_VAR(0));
+    }
+    spawn {
+        sleep 47;
+        N(UnkFunc22)();
+        N(UnkPartnerPosFunc)();
+        sleep 5;
+        N(UnkPartnerPosFunc2)();
+        sleep 5;
+        N(UnkPartnerPosFunc)();
+    }
+    sleep 3;
+    N(func_802406E0_CD2510)(SI_MAP_VAR(0));
+    sleep 30;
+});
+
+Script N(802438C8) = SCRIPT({
+    if (SI_SAVE_FLAG(1403) == 1) {
+        return;
+    }
+    IsStartingConversation(SI_VAR(0));
+    if (SI_VAR(0) == 1) {
+        return;
+    }
+    N(UnkFunc24)();
+    if (SI_VAR(0) == 1) {
+        return;
+    }
+    func_802D585C(1, 2097152);
+    N(SetOverrideFlags_40)();
+    DisablePlayerInput(TRUE);
+    DisablePartnerAI(0);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
+    N(UnkFunc20)(SI_MAP_VAR(0), SI_VAR(9));
+    FindKeyItem(ITEM_ULTRA_STONE, SI_VAR(12));
+    N(UnkFunc38)();
+    if (SI_VAR(0) == -1) {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DC), 160, 40);
+        sleep 10;
+        N(UnkFunc39)(SI_VAR(9));
+        DisablePlayerInput(FALSE);
+        EnablePartnerAI();
+        func_802D585C(0, 2097152);
+        N(UnkFunc17)();
+        return;
+    }
+    if (SI_SAVE_FLAG(438) == 0) {
+        SI_SAVE_FLAG(438) = 1;
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DA), 160, 40);
+    } else {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DB), 160, 40);
+    }
+    N(func_802402AC_CD20DC)();
+    if (SI_VAR(0) == -1) {
+        N(UnkFunc39)(SI_VAR(9));
+        DisablePlayerInput(FALSE);
+        EnablePartnerAI();
+        func_802D585C(0, 2097152);
+        N(UnkFunc17)();
+        return;
+    }
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    EnablePartnerAI();
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != SI_VAR(11)) {
+        N(func_802404FC_CD232C)(SI_VAR(11));
+    } else {
+        func_802CF56C(2);
+    }
+    sleep 10;
+    ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DF), 160, 40);
+    ShowChoice(MESSAGE_ID(0x1E, 0x000D));
+    CloseMessage();
+    if (SI_VAR(0) != 0) {
+        N(UnkFunc39)(SI_VAR(9));
+        DisablePlayerInput(FALSE);
+        EnablePartnerAI();
+        func_802D585C(0, 2097152);
+        N(UnkFunc17)();
+        return;
+    }
+    await N(80243764);
+    N(UnkFunc18)(SI_VAR(11), SI_VAR(13));
+    SI_SAVE_FLAG(1403) = 1;
+    N(UnkFunc39)(SI_VAR(9));
+    N(UnkFunc19)();
+    if (SI_VAR(13) == 1) {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DD), 160, 40);
+    } else {
+        ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DE), 160, 40);
+    }
+    DisablePlayerInput(FALSE);
+    EnablePartnerAI();
+    func_802D585C(0, 2097152);
+    N(UnkFunc17)();
+});
+
+Script N(80243D48) = SCRIPT({
+0:
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    sleep 1;
+    goto 0;
+});
+
+Script N(80243DB0) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    SetPlayerActionState(6);
+    sleep 2;
+    GetPlayerPos(SI_VAR(7), SI_VAR(8), SI_VAR(9));
+    SI_VAR(10) = spawn N(80243D48);
+    SetPlayerJumpscale(0.7001953125);
+    PlayerJump(450, 180, -120, 30);
+    SetPlayerActionState(0);
+    DisablePlayerPhysics(FALSE);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80243E80) = SCRIPT({
+    if (SI_AREA_FLAG(39) == 0) {
+        N(UnkFunc44)();
+        if (SI_VAR(0) == 0) {
+            return;
+        }
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        match SI_VAR(0) {
+            620..660 {
+                MakeItemEntity(ITEM_STAR_PIECE, 640, 145, -100, 13, SI_SAVE_FLAG(1388));
+                SI_AREA_FLAG(39) = 1;
+            }
+        }
+    }
+});
+
+Script N(makeEntities) = SCRIPT({
+    SI_AREA_FLAG(39) = 0;
+    bind N(80243E80) to TRIGGER_FLOOR_TOUCH 20;
+    MakeEntity(0x802EA910, 350, 240, -100, 0, MAKE_ENTITY_END);
+    SI_MAP_VAR(0) = SI_VAR(0);
+    AssignBlockFlag(SI_SAVE_FLAG(1403));
+    AssignScript(N(802438C8));
+    MakeEntity(0x802EAA30, 472, 100, -100, 0, MAKE_ENTITY_END);
+    AssignScript(N(80243DB0));
+});
 
 #include "world/common/SetOverrideFlags_40.inc.c"
 
 #include "world/common/UnkFunc17.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_8024011C_CD1F4C);
-/*
 ApiStatus N(func_8024011C_CD1F4C)(ScriptInstance* script, s32 isInitialCall) {
-    func_800EB168(get_variable(script, *script->ptrReadPos));
+    func_802E5690(get_variable(script, *script->ptrReadPos));
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802401B4_CD1FE4);
+#ifdef NON_MATCHING
+typedef struct {
+    s32 unk_00[8];
+    char unk_20[0x64];
+    s32 unk_84[8];
+    char unk_A4[0x64];
+    s32 unk_108[8];
+    char unk_128[0x64];
+    s32 unk_18C[8];
+    char unk_1AC[0x64];
+    s32 unk_210[8];
+    char unk_230[0x64];
+    s32 unk_294[8];
+    char unk_2B4[0x64];
+    s32 unk_318;
+    char unk_31C[8];
+    s32 unk_324;
+    s32 unk_328;
+    s16 unk_32C;
+} N(UnkStruct);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240200_CD2030);
-/*
-ApiStatus N(func_80240200_CD2030)(ScriptInstance *script, s32 isInitialCall) {
+ApiStatus N(func_802402AC_CD20DC)(ScriptInstance *script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
+    N(UnkStruct)* ptr;
     s32 i;
-    s16 var = script->varTable[12] >= 0;
+    s32 partnerLevel;
+    s32 var, partnerActiveCount;
+    s32 idx;
 
-    script->varTable[0] = -1;
+    if (isInitialCall) {
+        script->functionTemp[2].s = heap_malloc(0x330);
+        ptr = script->functionTemp[2].s;
 
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
+        partnerActiveCount = 0;
+        var = script->varTable[12] >= 0;
+
+        for (i = 0; i < 8; i++) {
+            idx = N(D_80243708_CD5538)[i];
+
+            if (playerData->partners[idx].enabled) {
+                ptr->unk_108[i] = idx;
+                ptr->unk_84[i] = *D_8008EF20[idx];
+                partnerLevel = N(UnkFunc37)(idx, var);
+                if (partnerLevel >= 0) {
+                    ptr->unk_00[i] = D_800F7F00[idx];
+                    ptr->unk_18C[i] = 1;
+                    ptr->unk_294[i] = N(D_80243718_CD5548)[i][partnerLevel];
+                } else {
+                    ptr->unk_00[i] = D_800F7F40[idx];
+                    ptr->unk_18C[i] = 0;
+                    ptr->unk_294[i] = N(D_80243700_CD5530)[var];
+                }
+                ptr->unk_210[i] = playerData->partners[idx].level;
+                partnerActiveCount++;
+            }
+        }
+
+        ptr->unk_318 = 4;
+        ptr->unk_324 = partnerActiveCount;
+        ptr->unk_328 = 0;
+        func_800F4E40(ptr);
+        script->functionTemp[0].s = 0;
+    }
+
+    ptr = script->functionTemp[2].s;
+    if (script->functionTemp[0].s == 0) {
+        script->functionTemp[1].s = ptr->unk_32C;
+        if (script->functionTemp[1].s != 0) {
+            func_800F13B0();
+        } else {
+            return ApiStatus_BLOCK;
         }
     }
 
+    script->functionTemp[0].s++;
+
+    if (script->functionTemp[0].s < 15) {
+        return ApiStatus_BLOCK;
+    }
+
+    func_800F1538();
+    if (script->functionTemp[1].s != 0xFF) {
+        script->varTable[0] = D_8008EF20[ptr->unk_108[script->functionTemp[1].s - 1]][0];
+        script->varTable[1] = ptr->unk_108[script->functionTemp[1].s - 1];
+    } else {
+        script->varTable[0] = -1;
+    }
+
+    heap_free(script->functionTemp[2].s);
+
     return ApiStatus_DONE2;
 }
-*/
+#else
+INCLUDE_ASM(ApiStatus, "world/area_flo/flo_16/CD1F10", flo_16_func_802402AC_CD20DC, ScriptInstance *script, s32 isInitialCall);
+#endif
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802402AC_CD20DC);
-
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802404FC_CD232C);
-/*
 ApiStatus N(func_802404FC_CD232C)(ScriptInstance* script, s32 isInitialCall) {
     func_800EB168(get_variable(script, *script->ptrReadPos));
     return ApiStatus_DONE2;
 }
-*/
 
 #include "world/common/UnkFunc19.inc.c"
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802405F0_CD2420);
-/*
-ApiStatus N(func_802405F0_CD2420)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
 #include "world/common/UnkFunc22.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802406E0_CD2510);
-/*
+typedef struct {
+    s32 unk_00;
+    s32 unk_04;
+    Effect* unk_08[3];
+    f32 unk_14[3];
+    f32 unk_20[3];
+    f32 unk_2C[3];
+    f32 unk_38[3];
+    f32 unk_44[3];
+    f32 unk_50[3];
+    Entity* unk_5C;
+    s32 unk_60;
+    s32 unk_64;
+} N(UserData);
+
 ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) {
     Bytecode *args = script->ptrReadPos;
     Npc* npc = get_npc_safe(-4);
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +586,7 @@ ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80243758_CD5588)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +595,7 @@ ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +603,7 @@ ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243758_CD5588)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +621,7 @@ ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243758_CD5588)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -193,7 +675,6 @@ ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) {
 
     return ApiStatus_BLOCK;
 }
-*/
 
 #include "world/common/UnkFunc23.inc.c"
 
@@ -201,4 +682,4 @@ ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc24.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240E18_CD2C48);
+#include "world/common/UnkFunc44.inc.c"
diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c
index 144f226d14..2b3a97e059 100644
--- a/src/world/area_flo/flo_16/CD2C80.c
+++ b/src/world/area_flo/flo_16/CD2C80.c
@@ -1,7 +1,346 @@
 #include "flo_16.h"
+#include "sprite/npc/tuff_puff.h"
+
+enum {
+    NPC_TUFF_PUFF0,
+    NPC_TUFF_PUFF1,
+};
+
+f32 N(D_80244010_CD5E40)[] = {
+     4.5f, 3.5f, 2.6f, 2.0f,
+     1.5f, 20.0f,
+};
+
+NpcAISettings N(npcAISettings_80244028) = {
+    .moveSpeed = 1.0f,
+    .moveTime = 45,
+    .waitTime = 60,
+    .alertRadius = 100.0f,
+    .unk_14 = 3,
+    .chaseSpeed = 3.6f,
+    .unk_1C = { .s = 10 },
+    .unk_20 = 1,
+    .chaseRadius = 120.0f,
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80244058) = SCRIPT({
+    SetSelfVar(0, 1);
+    SetSelfVar(5, 0);
+    SetSelfVar(6, 0);
+    SetSelfVar(1, 600);
+    N(func_80242754_CD4584)(N(npcAISettings_80244028));
+});
+
+NpcSettings N(npcSettings_802440C8) = {
+    .height = 24,
+    .radius = 28,
+    .ai = &N(npcAI_80244058),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+StaticNpc N(npcGroup_802440F4) = {
+    .id = NPC_TUFF_PUFF0,
+    .settings = &N(npcSettings_802440C8),
+    .pos = { 440.0f, 145.0f, 15.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 10,
+    .itemDrops = {
+        { ITEM_THUNDER_RAGE, 10, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 2,
+    .movement = { 440, 145, 15, 30, 0, -32767, 0, 485, 145, 55, 225, 95, 1 },
+    .animations = {
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_802442E4) = {
+    .id = NPC_TUFF_PUFF1,
+    .settings = &N(npcSettings_802440C8),
+    .pos = { 600.0f, 145.0f, 15.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 10,
+    .itemDrops = {
+        { ITEM_THUNDER_RAGE, 10, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 2,
+    .movement = { 600, 145, 15, 30, 0, -32767, 0, 485, 145, 55, 225, 95, 1 },
+    .animations = {
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_802444D4) = {
+    NPC_GROUP(N(npcGroup_802440F4), BATTLE_ID(24, 36, 0, 6)),
+    NPC_GROUP(N(npcGroup_802442E4), BATTLE_ID(24, 32, 0, 6)),
+    {},
+};
+
+static s32 N(pad_44F8)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(80244500) = SCRIPT({
+    N(func_80242940_CD4770)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    DisablePlayerInput(TRUE);
+    if (SI_AREA_FLAG(41) == 0) {
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 50;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 180;
+        SI_AREA_FLAG(41) = 1;
+    } else {
+        SI_VAR(5) = 50;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 180;
+        SI_VAR(8) = 0;
+        SI_AREA_FLAG(41) = 0;
+    }
+    sleep 15;
+    PlaySound(0x204D);
+    spawn {
+        ShakeCam(0, 0, 30, 0.80078125);
+        ShakeCam(0, 0, 5, 0.2001953125);
+    }
+    MakeLerp(SI_VAR(5), SI_VAR(6), 30, 0);
+    loop {
+        UpdateLerp();
+        TranslateModel(94, 0, SI_VAR(0), 0);
+        TranslateGroup(97, 0, SI_VAR(0), 0);
+        TranslateModel(108, 0, SI_VAR(0), 0);
+        TranslateGroup(111, 0, SI_VAR(0), 0);
+        RotateGroup(97, SI_VAR(7), 1, 0, 0);
+        RotateGroup(111, SI_VAR(7), 1, 0, 0);
+        UpdateColliderTransform(26);
+        UpdateColliderTransform(27);
+        UpdateColliderTransform(32);
+        UpdateColliderTransform(33);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    DisablePlayerInput(FALSE);
+    sleep 10;
+    MakeLerp(SI_VAR(7), SI_VAR(8), 15, 0);
+    loop {
+        UpdateLerp();
+        TranslateModel(94, 0, SI_VAR(6), 0);
+        TranslateGroup(97, 0, SI_VAR(6), 0);
+        TranslateModel(108, 0, SI_VAR(6), 0);
+        TranslateGroup(111, 0, SI_VAR(6), 0);
+        RotateGroup(97, SI_VAR(0), 1, 0, 0);
+        RotateGroup(111, SI_VAR(0), 1, 0, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+});
+
+Script N(802448FC) = SCRIPT({
+    N(func_80242940_CD4770)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    DisablePlayerInput(TRUE);
+    if (SI_AREA_FLAG(42) == 0) {
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 50;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 180;
+        SI_AREA_FLAG(42) = 1;
+    } else {
+        SI_VAR(5) = 50;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 180;
+        SI_VAR(8) = 0;
+        SI_AREA_FLAG(42) = 0;
+    }
+    sleep 15;
+    PlaySound(0x204D);
+    spawn {
+        ShakeCam(0, 0, 30, 0.80078125);
+        ShakeCam(0, 0, 5, 0.2001953125);
+    }
+    MakeLerp(SI_VAR(5), SI_VAR(6), 30, 0);
+    loop {
+        UpdateLerp();
+        TranslateModel(101, 0, SI_VAR(0), 0);
+        TranslateGroup(104, 0, SI_VAR(0), 0);
+        TranslateModel(115, 0, SI_VAR(0), 0);
+        TranslateGroup(118, 0, SI_VAR(0), 0);
+        TranslateModel(129, 0, SI_VAR(0), 0);
+        TranslateGroup(132, 0, SI_VAR(0), 0);
+        RotateGroup(104, SI_VAR(7), 1, 0, 0);
+        RotateGroup(118, SI_VAR(7), 1, 0, 0);
+        RotateGroup(132, SI_VAR(7), 1, 0, 0);
+        UpdateColliderTransform(29);
+        UpdateColliderTransform(30);
+        UpdateColliderTransform(35);
+        UpdateColliderTransform(36);
+        UpdateColliderTransform(41);
+        UpdateColliderTransform(42);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    DisablePlayerInput(FALSE);
+    sleep 10;
+    MakeLerp(SI_VAR(7), SI_VAR(8), 15, 0);
+    loop {
+        UpdateLerp();
+        TranslateModel(101, 0, SI_VAR(6), 0);
+        TranslateGroup(104, 0, SI_VAR(6), 0);
+        TranslateModel(115, 0, SI_VAR(6), 0);
+        TranslateGroup(118, 0, SI_VAR(6), 0);
+        TranslateModel(129, 0, SI_VAR(6), 0);
+        TranslateGroup(132, 0, SI_VAR(6), 0);
+        RotateGroup(104, SI_VAR(0), 1, 0, 0);
+        RotateGroup(118, SI_VAR(0), 1, 0, 0);
+        RotateGroup(132, SI_VAR(0), 1, 0, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+});
+
+Script N(80244DC8) = SCRIPT({
+    N(func_80242940_CD4770)();
+    if (SI_VAR(0) == 0) {
+        return;
+    }
+    DisablePlayerInput(TRUE);
+    if (SI_AREA_FLAG(43) == 0) {
+        SI_VAR(5) = 0;
+        SI_VAR(6) = -50;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 180;
+        SI_AREA_FLAG(43) = 1;
+    } else {
+        SI_VAR(5) = -50;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 180;
+        SI_VAR(8) = 0;
+        SI_AREA_FLAG(43) = 0;
+    }
+    sleep 15;
+    PlaySound(0x204D);
+    spawn {
+        ShakeCam(0, 0, 30, 0.80078125);
+        ShakeCam(0, 0, 5, 0.2001953125);
+    }
+    MakeLerp(SI_VAR(5), SI_VAR(6), 30, 0);
+    loop {
+        UpdateLerp();
+        TranslateModel(122, 0, SI_VAR(0), 0);
+        TranslateGroup(125, 0, SI_VAR(0), 0);
+        TranslateModel(136, 0, SI_VAR(0), 0);
+        TranslateGroup(139, 0, SI_VAR(0), 0);
+        RotateGroup(125, SI_VAR(7), 1, 0, 0);
+        RotateGroup(139, SI_VAR(7), 1, 0, 0);
+        UpdateColliderTransform(38);
+        UpdateColliderTransform(39);
+        UpdateColliderTransform(44);
+        UpdateColliderTransform(45);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+    DisablePlayerInput(FALSE);
+    sleep 10;
+    MakeLerp(SI_VAR(7), SI_VAR(8), 15, 0);
+    loop {
+        UpdateLerp();
+        TranslateModel(122, 0, SI_VAR(6), 0);
+        TranslateGroup(125, 0, SI_VAR(6), 0);
+        TranslateModel(136, 0, SI_VAR(6), 0);
+        TranslateGroup(139, 0, SI_VAR(6), 0);
+        RotateGroup(125, SI_VAR(0), 1, 0, 0);
+        RotateGroup(139, SI_VAR(0), 1, 0, 0);
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+    }
+});
+
+Script N(802451C4) = SCRIPT({
+    SI_AREA_FLAG(41) = 0;
+    SI_AREA_FLAG(42) = 0;
+    SI_AREA_FLAG(43) = 0;
+    ParentColliderToModel(26, 94);
+    ParentColliderToModel(27, 94);
+    ParentColliderToModel(29, 101);
+    ParentColliderToModel(30, 101);
+    ParentColliderToModel(32, 108);
+    ParentColliderToModel(33, 108);
+    ParentColliderToModel(35, 115);
+    ParentColliderToModel(36, 115);
+    ParentColliderToModel(38, 122);
+    ParentColliderToModel(39, 122);
+    ParentColliderToModel(41, 129);
+    ParentColliderToModel(42, 129);
+    ParentColliderToModel(44, 136);
+    ParentColliderToModel(45, 136);
+    bind N(80244500) to TRIGGER_FLOOR_TOUCH 26;
+    bind N(802448FC) to TRIGGER_FLOOR_TOUCH 29;
+    bind N(80244500) to TRIGGER_FLOOR_TOUCH 32;
+    bind N(802448FC) to TRIGGER_FLOOR_TOUCH 35;
+    bind N(80244DC8) to TRIGGER_FLOOR_TOUCH 38;
+    bind N(802448FC) to TRIGGER_FLOOR_TOUCH 41;
+    bind N(80244DC8) to TRIGGER_FLOOR_TOUCH 44;
+});
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80240E50_CD2C80);
-/*
 void N(func_80240E50_CD2C80)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -25,9 +364,150 @@ void N(func_80240E50_CD2C80)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     script->functionTemp[0].s = 1;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241000_CD2E30);
+#ifdef NON_MATCHING
+// second func_800DCB7C call
+void N(func_80241000_CD2E30)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 temp_f24;
+    f32 posX, posY, posZ, posW;
+    s32 var;
+    f32 temp_f0;
+    f32 phi_f4;
+    s32 phi_v0;
+    s32 phi_s4 = 0;
+
+    f32 a = enemy->varTable[7];
+    f32 temp_f2  = a / 100.0;
+    f32 b = enemy->varTable[3];
+    f32 temp_f26 = b / 100.0;
+    f32 c = enemy->varTable[4];
+    f32 temp_f20 = c / 100.0;
+    f32 d = enemy->varTable[1];
+    f32 temp_f22 = d / 100.0;
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    temp_f24 = temp_f26 + temp_f2;
+
+    if ((enemy->varTable[0] & 0x11) == 1) {
+        if (npc->flags & 8) {
+            if (temp_f22 < (temp_f24 - npc->pos.y)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            if (temp_f22 < (temp_f26 - posW)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        }
+    }
+
+    if ((enemy->varTable[0] & 0x11) == 0x11) {
+        f64 test;
+        if (npc->flags & 8) {
+            phi_f4 = temp_f24;
+            test = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            npc->pos.y = test;
+        } else {
+            posX = npc->pos.x;
+            posY = temp_f20;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            phi_f4 = posY;
+            phi_f4 += temp_f26;
+            d = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            test = d;
+            npc->pos.y = test;
+            //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        }
+        //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+
+        if (fabsf(phi_f4 - npc->pos.y) < 1.0) {
+            npc->pos.y = phi_f4;
+            enemy->varTable[0] &= ~0x10;
+        }
+    } else if (enemy->varTable[1] > 0) {
+        temp_f0 = sin_deg(enemy->varTable[2]);
+        if (npc->flags & 8) {
+            phi_v0 = FALSE;
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+        }
+        if (phi_v0) {
+            npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22);
+        } else {
+            npc->pos.y = temp_f24 + (temp_f0 * temp_f22);
+        }
+        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
+    }
+
+    if (enemy->varTable[9] <= 0) {
+        if (aiSettings->unk_14 >= 0) {
+            if (script->functionTemp[1].s <= 0) {
+                script->functionTemp[1].s = aiSettings->unk_14;
+                if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
+                    func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
+                    fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
+                    npc->moveToPos.y = npc->pos.y;
+                    func_800494C0(npc, 0x2F4, 0x200000);
+                    if (enemy->npcSettings->unk_2A & 1) {
+                        script->functionTemp[0].s = 10;
+                    } else {
+                        script->functionTemp[0].s = 12;
+                    }
+                    return;
+                }
+            }
+            script->functionTemp[1].s--;
+        }
+    } else {
+        enemy->varTable[9]--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape,
+            enemy->territory->wander.point.x, enemy->territory->wander.point.z,
+            npc->pos.x, npc->pos.z,
+            enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) {
+        posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z);
+        if (npc->moveSpeed < posW) {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+            phi_s4 = 1;
+        }
+    }
+
+    if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        } else {
+            return;
+        }
+    }
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    if (aiSettings->moveTime > 0) {
+        if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+            script->functionTemp[0].s = 2;
+            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
+                script->functionTemp[0].s = 0;
+            }
+        }
+    }
+}
+#else
+INCLUDE_ASM(void, "world/area_flo/flo_16/CD2C80", flo_16_func_80241000_CD2E30, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory);
+#endif
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
@@ -35,18 +515,15 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241000_CD2E30);
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241AA4_CD38D4);
-/*
 void N(func_80241AA4_CD38D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80244010_CD5E40)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
 }
-*/
 
 #include "world/common/UnkNpcAIFunc14.inc.c"
 
@@ -56,8 +533,6 @@ void N(func_80241AA4_CD38D4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkFunc5.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_8024215C_CD3F8C);
-/*
 ApiStatus N(func_8024215C_CD3F8C)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Bytecode* args = script->ptrReadPos;
@@ -72,11 +547,11 @@ ApiStatus N(func_8024215C_CD3F8C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80242038_CD3E68)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -97,7 +572,7 @@ ApiStatus N(func_8024215C_CD3F8C)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802416E8_CD3518)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -111,18 +586,117 @@ ApiStatus N(func_8024215C_CD3F8C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80241CA8_CD3AD8)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242478_CD42A8);
+void N(func_80242478_CD42A8)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    s32 flag;
+    f32 temp_f6;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_802426F8_CD4528);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0].s = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242754_CD4584);
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((func_800DCB7C(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0].s = 12;
+}
+
+#include "world/common/UnkFunc45.inc.c"
+
+ApiStatus N(func_80242754_CD4584)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 120.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall) {
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
+        script->functionTemp[0].s = 0;
+    }
+    npc->unk_AB = -2;
+
+    if (enemy->unk_B0 & 4) {
+        if (enemy->unk_B4) {
+            return ApiStatus_BLOCK;
+        }
+        enemy->unk_B0 &= ~4;
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            N(func_80240E50_CD2C80)(script, aiSettings, territoryPtr);
+        case 1:
+            N(func_80241000_CD2E30)(script, aiSettings, territoryPtr);
+            break;
+        case 2:
+            N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
+        case 3:
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
+            break;
+        case 10:
+            N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
+        case 11:
+            N(func_80241AA4_CD38D4)(script, aiSettings, territoryPtr);
+            break;
+        case 12:
+            N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr);
+        case 13:
+            N(func_80242478_CD42A8)(script, aiSettings, territoryPtr);
+            break;
+        case 20:
+            N(UnkFunc45)(script, aiSettings, territoryPtr);
+            break;
+    }
+
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_flo/flo_16/CD4770.c b/src/world/area_flo/flo_16/CD4770.c
index 3a48a53901..23df9422f7 100644
--- a/src/world/area_flo/flo_16/CD4770.c
+++ b/src/world/area_flo/flo_16/CD4770.c
@@ -1,3 +1,10 @@
 #include "flo_16.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_16/CD4770", func_80242940_CD4770);
+ApiStatus N(func_80242940_CD4770)(ScriptInstance *script, s32 isInitialCall) {
+    script->varTable[0] = 0;
+    do {} while(0);
+    if ((gPlayerActionState == ACTION_STATE_GROUND_POUND) || (gPlayerActionState == ACTION_STATE_ULTRA_POUND)) {
+        script->varTable[0] = 1;
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_16/flo_16.h b/src/world/area_flo/flo_16/flo_16.h
index da316a6358..4429746fb8 100644
--- a/src/world/area_flo/flo_16/flo_16.h
+++ b/src/world/area_flo/flo_16/flo_16.h
@@ -2,3 +2,33 @@
 #include "map.h"
 
 #define NAMESPACE flo_16
+
+ApiStatus N(SetOverrideFlags_40)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc17)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc18)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc19)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc20)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc21)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc22)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc23)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc24)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc38)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc39)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc43)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkPartnerPosFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CD1E30)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024011C_CD1F4C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802402AC_CD20DC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802404FC_CD232C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802406E0_CD2510)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc44)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242754_CD4584)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242940_CD4770)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_802444D4);
+extern Script N(8024346C);
+extern Script N(802451C4);
+extern Script N(main);
+extern Script N(makeEntities);
+extern Script N(unkFunc23);
\ No newline at end of file
diff --git a/src/world/area_flo/flo_17/CD72E0.c b/src/world/area_flo/flo_17/CD72E0.c
index 1400a6f221..0ce5338f52 100644
--- a/src/world/area_flo/flo_17/CD72E0.c
+++ b/src/world/area_flo/flo_17/CD72E0.c
@@ -1,3 +1,8 @@
 #include "flo_17.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD72E0", func_80240000_CD72E0);
+void func_80072950();
+
+ApiStatus N(func_80240000_CD72E0)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_17/CD7320.c b/src/world/area_flo/flo_17/CD7320.c
index 10e8f846de..361646c00a 100644
--- a/src/world/area_flo/flo_17/CD7320.c
+++ b/src/world/area_flo/flo_17/CD7320.c
@@ -1,3 +1,8 @@
 #include "flo_17.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7320", func_80240040_CD7320);
+ApiStatus N(func_80240040_CD7320)(ScriptInstance *script, s32 isInitialCall) {
+    CollisionStatus* collisionStatus = &gCollisionStatus;
+
+    set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c
index ae0514b679..222317bbc2 100644
--- a/src/world/area_flo/flo_17/CD7350.c
+++ b/src/world/area_flo/flo_17/CD7350.c
@@ -1,7 +1,615 @@
 #include "flo_17.h"
+#include "message_ids.h"
+#include "sprite/npc/lakitu.h"
+#include "sprite/npc/spiny.h"
+
+enum {
+    NPC_LAKITU0,
+    NPC_LAKITU1,
+    NPC_SPINY0 = 50,
+    NPC_SPINY1,
+    NPC_SPINY2,
+    NPC_SPINY3,
+};
+
+EntryList N(entryList) = {
+    { -730.0f, 0.0f, 0.0f,  90.0f },
+    {  730.0f, 0.0f, 0.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_17_tattle },
+};
+
+Script N(80243280) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(802432F0) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_8024359C) = EXIT_WALK_SCRIPT(60,  0, "flo_16",  1);
+
+Script N(exitWalk_802435F8) = EXIT_WALK_SCRIPT(60,  1, "flo_18",  0);
+
+Script N(80243654) = SCRIPT({
+    bind N(exitWalk_8024359C) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_802435F8) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+s32 N(lavaResetList_8024369C)[] = {
+    0x0000000F, 0xC4048000, 0x00000000, 0xC2DC0000, 0x00000011, 0xC4070000, 0x00000000, 0xC2480000,
+    0x00000010, 0xC4048000, 0x00000000, 0x42A00000, 0x00000014, 0xC3870000, 0x00000000, 0xC2F00000,
+    0x00000013, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000012, 0xC3870000, 0x00000000, 0x420C0000,
+    0x00000017, 0xC3020000, 0x00000000, 0xC2480000, 0x00000016, 0xC3020000, 0x00000000, 0xC2480000,
+    0x00000015, 0xC30C0000, 0x00000000, 0x42960000, 0x0000001B, 0x42F00000, 0x00000000, 0xC2480000,
+    0x0000001A, 0x42F00000, 0x00000000, 0xC2480000, 0x00000018, 0x43020000, 0x00000000, 0x42700000,
+    0x00000019, 0x42F00000, 0x00000000, 0x42F00000, 0x0000001F, 0x438C0000, 0x00000000, 0xC2DC0000,
+    0x0000001E, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001D, 0x43870000, 0x00000000, 0xC2480000,
+    0x0000001C, 0x438C0000, 0x00000000, 0x42480000, 0x00000021, 0x44034000, 0x00000000, 0xC28C0000,
+    0x00000020, 0x44034000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80245228));
+    await N(makeEntities);
+    spawn N(80244284);
+    ModifyColliderFlags(3, 15, 0x00000006);
+    ModifyColliderFlags(3, 16, 0x00000006);
+    ModifyColliderFlags(3, 20, 0x00000006);
+    ModifyColliderFlags(3, 23, 0x00000006);
+    ModifyColliderFlags(3, 25, 0x00000006);
+    ModifyColliderFlags(3, 27, 0x00000006);
+    ModifyColliderFlags(3, 28, 0x00000006);
+    ModifyColliderFlags(3, 31, 0x00000006);
+    ModifyColliderFlags(3, 32, 0x00000006);
+    SI_VAR(0) = -736;
+    SI_VAR(1) = -137;
+    SI_VAR(2) = -522;
+    SI_VAR(3) = -118;
+    SI_VAR(4) = 0;
+    spawn N(802432F0);
+    SI_VAR(0) = -728;
+    SI_VAR(1) = 76;
+    SI_VAR(2) = -496;
+    SI_VAR(3) = 137;
+    SI_VAR(4) = 0;
+    spawn N(802432F0);
+    SI_VAR(0) = -160;
+    SI_VAR(1) = -117;
+    SI_VAR(2) = -92;
+    SI_VAR(3) = -54;
+    SI_VAR(4) = 0;
+    spawn N(802432F0);
+    SI_VAR(0) = 76;
+    SI_VAR(1) = -124;
+    SI_VAR(2) = 150;
+    SI_VAR(3) = -55;
+    SI_VAR(4) = 0;
+    spawn N(802432F0);
+    SI_VAR(0) = 192;
+    SI_VAR(1) = 60;
+    SI_VAR(2) = 309;
+    SI_VAR(3) = 133;
+    SI_VAR(4) = 0;
+    spawn N(802432F0);
+    SI_VAR(0) = 488;
+    SI_VAR(1) = 46;
+    SI_VAR(2) = 733;
+    SI_VAR(3) = 137;
+    SI_VAR(4) = 0;
+    spawn N(802432F0);
+    ModifyColliderFlags(3, 9, 0x00000002);
+    spawn {
+        ResetFromLava(N(lavaResetList_8024369C));
+    }
+    EnableTexPanning(30, 1);
+    EnableTexPanning(32, 1);
+    EnableTexPanning(33, 1);
+    EnableTexPanning(36, 1);
+    EnableTexPanning(37, 1);
+    EnableTexPanning(40, 1);
+    EnableTexPanning(42, 1);
+    EnableTexPanning(44, 1);
+    EnableTexPanning(45, 1);
+    EnableTexPanning(48, 1);
+    EnableTexPanning(49, 1);
+    EnableTexPanning(52, 1);
+    EnableTexPanning(54, 1);
+    EnableTexPanning(56, 1);
+    EnableTexPanning(57, 1);
+    EnableTexPanning(60, 1);
+    EnableTexPanning(61, 1);
+    EnableTexPanning(64, 1);
+    EnableTexPanning(31, 1);
+    EnableTexPanning(34, 1);
+    EnableTexPanning(35, 1);
+    EnableTexPanning(38, 1);
+    EnableTexPanning(39, 1);
+    EnableTexPanning(43, 1);
+    EnableTexPanning(46, 1);
+    EnableTexPanning(47, 1);
+    EnableTexPanning(50, 1);
+    EnableTexPanning(51, 1);
+    EnableTexPanning(55, 1);
+    EnableTexPanning(58, 1);
+    EnableTexPanning(59, 1);
+    EnableTexPanning(62, 1);
+    EnableTexPanning(63, 1);
+    spawn {
+        SI_VAR(0) = 0;
+        SI_VAR(1) = 0;
+    0:
+        SI_VAR(0) += 140;
+        if (SI_VAR(0) > 65536) {
+            SI_VAR(0) += -65536;
+        }
+        SetTexPanOffset(1, 0, SI_VAR(0), 0);
+        SI_VAR(1) += -200;
+        if (SI_VAR(1) < 0) {
+            SI_VAR(1) += 65536;
+        }
+        SetTexPanOffset(2, 0, SI_VAR(1), 0);
+        sleep 1;
+        goto 0;
+    }
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(80243654);
+    spawn EnterWalk;
+    await N(80243280);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CD72E0)();
+    }
+});
+
+static s32 N(pad_3FCC) = {
+    0x00000000,
+};
+
+Script N(80243FD0) = SCRIPT({
+    loop {
+        N(func_80240040_CD7320)(SI_VAR(0));
+        if (SI_VAR(0) == SI_VAR(4)) {
+            GetPlayerActionState(SI_VAR(0));
+            if (SI_VAR(0) != 23) {
+                if (SI_VAR(8) == 0) {
+                    spawn {
+                        GetModelCenter(SI_VAR(5));
+                        PlaySoundAt(0x1DB, 4194304, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                    }
+                }
+                if (SI_VAR(7) < 90) {
+                    if (SI_VAR(7) == 0) {
+                        sleep 5;
+                        SI_VAR(8) = 6;
+                        ModifyColliderFlags(0, SI_VAR(9), 0x7FFFFE00);
+                    }
+                    SI_VAR(8) += 1;
+                    SI_VAR(7) += SI_VAR(8);
+                }
+                goto 50;
+            }
+        }
+        if (SI_VAR(7) != 0) {
+            SI_VAR(8) -= 1;
+            SI_VAR(7) += SI_VAR(8);
+            if (SI_VAR(7) <= 0) {
+                SI_VAR(8) = 0;
+                SI_VAR(7) = 0;
+                spawn {
+                    GetModelCenter(SI_VAR(5));
+                    PlaySoundAt(0x1DC, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                }
+                ModifyColliderFlags(1, SI_VAR(9), 0x7FFFFE00);
+            }
+        }
+    50:
+        if (SI_VAR(7) >= 90) {
+            SI_VAR(8) = -1;
+            SI_VAR(7) = 90;
+        }
+        RotateModel(SI_VAR(5), SI_VAR(7), -1, 0, 0);
+        RotateModel(SI_VAR(6), SI_VAR(7), -1, 0, 0);
+        sleep 1;
+    }
+});
+
+Script N(80244284) = SCRIPT({
+    SI_VAR(4) = 35;
+    SI_VAR(5) = 14;
+    SI_VAR(6) = 15;
+    SI_VAR(7) = SI_MAP_VAR(10);
+    SI_VAR(8) = SI_MAP_VAR(11);
+    SI_VAR(9) = 38;
+    spawn N(80243FD0);
+    SI_VAR(4) = 36;
+    SI_VAR(5) = 19;
+    SI_VAR(6) = 20;
+    SI_VAR(7) = SI_MAP_VAR(12);
+    SI_VAR(8) = SI_MAP_VAR(13);
+    SI_VAR(9) = 39;
+    spawn N(80243FD0);
+    SI_VAR(4) = 37;
+    SI_VAR(5) = 24;
+    SI_VAR(6) = 25;
+    SI_VAR(7) = SI_MAP_VAR(14);
+    SI_VAR(8) = SI_MAP_VAR(15);
+    SI_VAR(9) = 40;
+    spawn N(80243FD0);
+});
+
+static s32 N(pad_XXX)[] = { 0, 0};
+
+NpcSettings N(npcSettings_802443D8) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+f32 N(D_8024440C_CDB6EC)[] = {
+     4.5f, 3.5f, 2.6f, 2.0f,
+     1.5f, 20.0f,
+};
+
+NpcAISettings N(npcAISettings_80244424) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 60,
+    .waitTime = 30,
+    .alertRadius = 60.0f,
+    .unk_10 = { .f = 50.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 3.5f,
+    .unk_1C = { .s = 60 },
+    .unk_20 = 10,
+    .chaseRadius = 80.0f,
+    .unk_28 = { .f = 70.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80244454) = SCRIPT({
+    SetSelfVar(0, 0);
+    SetSelfVar(5, -650);
+    SetSelfVar(6, 30);
+    SetSelfVar(1, 400);
+    N(func_80241C64_CD8F44)(N(npcAISettings_80244424));
+});
+
+NpcSettings N(npcSettings_802444C4) = {
+    .height = 28,
+    .radius = 24,
+    .ai = &N(npcAI_80244454),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 20,
+};
+
+NpcAISettings N(npcAISettings_802444F0) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 30,
+    .waitTime = 50,
+    .alertRadius = 60.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 6.0f,
+    .chaseRadius = 100.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 3,
+};
+
+Script N(npcAI_80244520) = SCRIPT({
+    SetSelfVar(2, 3);
+    SetSelfVar(3, 18);
+    SetSelfVar(5, 3);
+    SetSelfVar(7, 4);
+    N(func_80242918_CD9BF8)(N(npcAISettings_802444F0));
+});
+
+Script N(80244590) = SCRIPT({
+    SetNpcRotation(NPC_SELF, 0, 0, 0);
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            SetSelfVar(10, 100);
+            DoNpcDefeat();
+        }
+        == 2 {
+            func_80045900(0);
+        }
+        == 3 {
+            SetEnemyFlagBits(-1, 16, 1);
+            RemoveNpc(NPC_SELF);
+        }
+    }
+});
+
+NpcSettings N(npcSettings_8024465C) = {
+    .height = 21,
+    .radius = 22,
+    .ai = &N(npcAI_80244520),
+    .onHit = EnemyNpcHit,
+    .onDefeat = &N(80244590),
+    .level = 19,
+};
+
+StaticNpc N(npcGroup_80244688) = {
+    .id = NPC_LAKITU0,
+    .settings = &N(npcSettings_802444C4),
+    .pos = { -185.0f, 90.0f, 10.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 25,
+    .itemDrops = {
+        { ITEM_SUPER_SHROOM, 2, 0 },
+        { ITEM_MAPLE_SYRUP, 2, 0 },
+        { ITEM_THUNDER_RAGE, 2, 0 },
+        { ITEM_STOP_WATCH, 2, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(3),
+    .maxCoinBonus = 2,
+    .movement = { -185, 90, 10, 30, 0, -32767, 0, -185, 90, 0, 85, 120, 1, 1 },
+    .animations = {
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_2),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80244878) = {
+    .id = NPC_LAKITU1,
+    .settings = &N(npcSettings_802444C4),
+    .pos = { 200.0f, 90.0f, -25.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 25,
+    .itemDrops = {
+        { ITEM_SUPER_SHROOM, 2, 0 },
+        { ITEM_MAPLE_SYRUP, 2, 0 },
+        { ITEM_THUNDER_RAGE, 2, 0 },
+        { ITEM_STOP_WATCH, 2, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(3),
+    .maxCoinBonus = 2,
+    .movement = { 200, 90, -25, 30, 0, -32767, 0, 200, 90, 0, 85, 120, 1, 1 },
+    .animations = {
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_2),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_4),
+        NPC_ANIM(lakitu, Palette_00, Anim_3),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+        NPC_ANIM(lakitu, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80244A68) = {
+    .id = NPC_SPINY0,
+    .settings = &N(npcSettings_8024465C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80244C58) = {
+    .id = NPC_SPINY1,
+    .settings = &N(npcSettings_8024465C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80244E48) = {
+    .id = NPC_SPINY2,
+    .settings = &N(npcSettings_8024465C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80245038) = {
+    .id = NPC_SPINY3,
+    .settings = &N(npcSettings_8024465C),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .yaw = 0,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_80245228) = {
+    NPC_GROUP(N(npcGroup_80244688), BATTLE_ID(24, 9, 0, 3)),
+    NPC_GROUP(N(npcGroup_80244878), BATTLE_ID(24, 10, 0, 3)),
+    NPC_GROUP(N(npcGroup_80244A68), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_80244C58), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_80244E48), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_80245038), BATTLE_ID(24, 12, 0, 3)),
+    {},
+};
+
+static s32 N(pad_527C) = {
+    0x00000000,
+};
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802EA588, 660, 60, -115, 0, ITEM_THUNDER_RAGE, MAKE_ENTITY_END);
+    AssignBlockFlag(SI_SAVE_FLAG(1390));
+    MakeItemEntity(ITEM_LETTER09, -245, 0, 105, 17, SI_SAVE_FLAG(1389));
+});
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240070_CD7350);
-/*
 void N(func_80240070_CD7350)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -25,9 +633,150 @@ void N(func_80240070_CD7350)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     script->functionTemp[0].s = 1;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240220_CD7500);
+#ifdef NON_MATCHING
+// second func_800DCB7C call
+void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 temp_f24;
+    f32 posX, posY, posZ, posW;
+    s32 var;
+    f32 temp_f0;
+    f32 phi_f4;
+    s32 phi_v0;
+    s32 phi_s4 = 0;
+
+    f32 a = enemy->varTable[7];
+    f32 temp_f2  = a / 100.0;
+    f32 b = enemy->varTable[3];
+    f32 temp_f26 = b / 100.0;
+    f32 c = enemy->varTable[4];
+    f32 temp_f20 = c / 100.0;
+    f32 d = enemy->varTable[1];
+    f32 temp_f22 = d / 100.0;
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    temp_f24 = temp_f26 + temp_f2;
+
+    if ((enemy->varTable[0] & 0x11) == 1) {
+        if (npc->flags & 8) {
+            if (temp_f22 < (temp_f24 - npc->pos.y)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            if (temp_f22 < (temp_f26 - posW)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        }
+    }
+
+    if ((enemy->varTable[0] & 0x11) == 0x11) {
+        f64 test;
+        if (npc->flags & 8) {
+            phi_f4 = temp_f24;
+            test = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            npc->pos.y = test;
+        } else {
+            posX = npc->pos.x;
+            posY = temp_f20;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            phi_f4 = posY;
+            phi_f4 += temp_f26;
+            d = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            test = d;
+            npc->pos.y = test;
+            //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        }
+        //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+
+        if (fabsf(phi_f4 - npc->pos.y) < 1.0) {
+            npc->pos.y = phi_f4;
+            enemy->varTable[0] &= ~0x10;
+        }
+    } else if (enemy->varTable[1] > 0) {
+        temp_f0 = sin_deg(enemy->varTable[2]);
+        if (npc->flags & 8) {
+            phi_v0 = FALSE;
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+        }
+        if (phi_v0) {
+            npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22);
+        } else {
+            npc->pos.y = temp_f24 + (temp_f0 * temp_f22);
+        }
+        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
+    }
+
+    if (enemy->varTable[9] <= 0) {
+        if (aiSettings->unk_14 >= 0) {
+            if (script->functionTemp[1].s <= 0) {
+                script->functionTemp[1].s = aiSettings->unk_14;
+                if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
+                    func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
+                    fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
+                    npc->moveToPos.y = npc->pos.y;
+                    func_800494C0(npc, 0x2F4, 0x200000);
+                    if (enemy->npcSettings->unk_2A & 1) {
+                        script->functionTemp[0].s = 10;
+                    } else {
+                        script->functionTemp[0].s = 12;
+                    }
+                    return;
+                }
+            }
+            script->functionTemp[1].s--;
+        }
+    } else {
+        enemy->varTable[9]--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape,
+            enemy->territory->wander.point.x, enemy->territory->wander.point.z,
+            npc->pos.x, npc->pos.z,
+            enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) {
+        posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z);
+        if (npc->moveSpeed < posW) {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+            phi_s4 = 1;
+        }
+    }
+
+    if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        } else {
+            return;
+        }
+    }
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    if (aiSettings->moveTime > 0) {
+        if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+            script->functionTemp[0].s = 2;
+            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
+                script->functionTemp[0].s = 0;
+            }
+        }
+    }
+}
+#else
+INCLUDE_ASM(void, "world/area_flo/flo_17/CD7350", flo_17_func_80240220_CD7500, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory);
+#endif
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
@@ -35,18 +784,15 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240220_CD7500);
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240CC4_CD7FA4);
-/*
 void N(func_80240CC4_CD7FA4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_8024440C_CDB6EC)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
 }
-*/
 
 #include "world/common/UnkNpcAIFunc14.inc.c"
 
@@ -56,8 +802,6 @@ void N(func_80240CC4_CD7FA4)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkFunc5.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_8024137C_CD865C);
-/*
 ApiStatus N(func_8024137C_CD865C)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Bytecode* args = script->ptrReadPos;
@@ -72,11 +816,11 @@ ApiStatus N(func_8024137C_CD865C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80241258_CD8538)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -97,7 +841,7 @@ ApiStatus N(func_8024137C_CD865C)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_80240908_CD7BE8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -111,30 +855,664 @@ ApiStatus N(func_8024137C_CD865C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80240EC8_CD81A8)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241568_CD8848);
+s32 N(func_80241568_CD8848)(void) {
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802415B0_CD8890);
+    for (i = 50; i < 54; i++) {
+        if (get_enemy(i)->varTable[10] == 0) {
+            return i;
+        }
+    }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241A14_CD8CF4);
+    return -1;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241C64_CD8F44);
+void N(func_802415B0_CD8890)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    f32 temp_f20;
+    f32 temp_f22;
+    f32 temp_f24;
+    f32 var1 = enemy->varTable[4];
+    f32 var2 = enemy->varTable[3];
+    f32 var3;
+
+    temp_f22 = var1 / 100.0;
+    temp_f24 = var2 / 100.0;
+    if (npc->duration > 0) {
+        npc->duration--;
+    }
+    var3 = enemy->varTable[1];
+    temp_f20 = var3 / 100.0;
+
+    x = npc->pos.x;
+    y = npc->pos.y;
+    z = npc->pos.z;
+    w = 1000.0f;
+
+    func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+    npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20);
+    enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
+
+    if (aiSettings->unk_14 >= 0) {
+        if (script->functionTemp[1].s <= 0) {
+            script->functionTemp[1].s = aiSettings->unk_14;
+            if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) {
+                fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+                func_800494C0(npc, 0x2F4, 0x200000);
+                x = npc->pos.x;
+                y = npc->pos.y;
+                z = npc->pos.z;
+                w = 1000.0f;
+                func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+                npc->moveToPos.y = y + temp_f24;
+                script->functionTemp[0].s = 12;
+                return;
+            }
+        }
+        script->functionTemp[1].s--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ) != 0) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+    }
+
+    if (npc->turnAroundYawAdjustment == 0) {
+        if (npc->duration > 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+            if (enemy->varTable[0] & 1) {
+                x = npc->pos.x;
+                y = temp_f22;
+                z = npc->pos.z;
+                w = 1000.0f;
+                func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+                y += temp_f24;
+                w = y - temp_f22;
+                if (w > 2.0) {
+                    temp_f22 += 2.0;
+                } else if (w < -2.0) {
+                    temp_f22 -= 2.0;
+                } else {
+                    temp_f22 = y;
+                }
+                enemy->varTable[4] = (temp_f22 * 100.0);
+            }
+            if (npc->duration > 0) {
+                return;
+            }
+        }
+        script->functionTemp[0].s = 2;
+        script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+        if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1].s == 0)) {
+            script->functionTemp[0].s = 0;
+        }
+    }
+}
+
+void N(func_80241A14_CD8CF4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    f32 var1 = enemy->varTable[3];
+    f32 var2;
+    f32 temp_f20;
+    f32 temp_f22;
+
+    temp_f22 = var1 / 100.0;
+    if (npc->duration > 0) {
+        npc->duration--;
+    }
+    var2 = enemy->varTable[1];
+    temp_f20 = var2 / 100.0;
+
+    x = npc->pos.x;
+    y = npc->pos.y;
+    z = npc->pos.z;
+    w = 1000.0f;
+
+    func_800DCB7C(npc->unk_80, &x, &y, &z, &w);
+    npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20);
+    enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) {
+        fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        func_800494C0(npc, 0x2F4, 0x200000);
+        script->functionTemp[0].s = 12;
+        return;
+    }
+
+    if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) {
+        script->functionTemp[1].s--;
+        if (script->functionTemp[1].s > 0) {
+            npc->yaw = clamp_angle(npc->yaw + 180.0f);
+            npc->duration = (rand_int(1000) % 11) + 5;
+            return;
+        }
+        script->functionTemp[0].s = 0;
+    }
+}
+
+// enemy2 is being copied to a0
+#ifdef NON_MATCHING
+ApiStatus N(func_80241C64_CD8F44)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Bytecode* args = script->ptrReadPos;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+    f32 temp_f4;
+    f32 dist;
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 120.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall) {
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
+        script->functionTemp[0].s = 0;
+    }
+    npc->unk_AB = -3;
+
+    if (enemy->unk_B0 & 4) {
+        if (enemy->unk_B4 != 0) {
+            return ApiStatus_BLOCK;
+        }
+        enemy->unk_B0 &= ~4;
+    }
+
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            N(func_80240070_CD7350)(script, aiSettings, territoryPtr);
+
+        case 1:
+            N(func_802415B0_CD8890)(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
+
+        case 3:
+            N(func_80241A14_CD8CF4)(script, aiSettings, territoryPtr);
+            break;
+    }
+
+    if (script->functionTemp[0].s == 12) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+        enemy->varTable[4] = N(func_80241568_CD8848)();
+        if (enemy->varTable[4] >= 0) {
+            Enemy* enemy2 = get_enemy(enemy->varTable[4]);
+            enemy2->varTable[10] = 1;
+            enemy2->varTable[11] = enemy->npcID;
+            npc->duration = 15;
+            npc->currentAnim = 0x490014;
+            script->functionTemp[0].s = 30;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 12:
+            N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
+            break;
+
+        case 14:
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
+            break;
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 30:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                get_enemy(enemy->varTable[4])->varTable[10] = 2;
+                npc->duration = 5;
+                script->functionTemp[0].s = 31;
+            }
+
+        case 31:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                npc->currentAnim = 0x490015;
+                get_enemy(enemy->varTable[4])->varTable[10] = 3;
+                npc->duration = 10;
+                script->functionTemp[0].s = 32;
+            }
+
+        case 32:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                npc->duration = 3;
+                script->functionTemp[0].s = 33;
+            }
+
+        case 33:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                script->functionTemp[0].s = 0;
+            }
+            break;
+    }
+
+    if (((u32)script->functionTemp[0].s - 30) < 2) {
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+        dist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, npc->pos.x, npc->pos.z);
+        if (!is_point_within_region(territoryPtr->shape, territoryPtr->pointX, territoryPtr->pointZ, npc->pos.x, npc->pos.z, territoryPtr->sizeX, territoryPtr->sizeZ)) {
+            if ((dist > 30.0) && (npc->turnAroundYawAdjustment == 0)) {
+                temp_f4 = dist - 20.0;
+                if (temp_f4 < 0.0) {
+                    temp_f4 = 0.0f;
+                }
+                if (temp_f4 > 200.0) {
+                    temp_f4 = 200.0f;
+                }
+                npc->moveSpeed = update_lerp(0, aiSettings->moveSpeed, aiSettings->chaseSpeed, temp_f4, 200);
+                npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+            }
+        }
+    }
+
+    return ApiStatus_BLOCK;
+}
+#else
+INCLUDE_ASM(ApiStatus, "world/area_flo/flo_17/CD7350", flo_17_func_80241C64_CD8F44, ScriptInstance *script, s32 isInitialCall);
+#endif
 
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802421C0_CD94A0);
+void N(func_802421C0_CD94A0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
 #include "world/common/set_script_owner_npc_col_height.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802424D8_CD97B8);
+ApiStatus N(func_802424D8_CD97B8)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    Bytecode* args = script->ptrReadPos;
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+    s32 var;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80242918_CD9BF8);
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 100.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall) {
+        enemy->varTable[6] = npc->collisionHeight;
+        enemy->varTable[8] = 0;
+        enemy->unk_B5 = 0;
+        enemy->unk_B0 |= 8;
+    }
+
+    if (isInitialCall || (enemy->unk_B0 & 4)) {
+        script->functionTemp[0].s = 0;
+        npc->duration = 0;
+        enemy->unk_07 = 0;
+        npc->currentAnim = enemy->animList[0];
+        npc->flags &= ~0x800;
+        npc->collisionHeight = enemy->varTable[6];
+        enemy->varTable[9] = 0;
+        if (!enemy->territory->wander.isFlying) {
+            npc->flags = (npc->flags | 0x200) & ~8;
+        } else {
+            npc->flags = (npc->flags & ~0x200) | 8;
+        }
+        if (enemy->unk_B0 & 4) {
+            script->functionTemp[0].s = 99;
+            script->functionTemp[1].s = 0;
+            fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
+            enemy->unk_B0 &= ~4;
+        } else if (enemy->flags & 0x40000000) {
+            script->functionTemp[0].s = 12;
+            enemy->flags &= ~0x40000000;
+        }
+    }
+
+    if (enemy->varTable[9] > 0) {
+        enemy->varTable[9]--;
+        if (enemy->varTable[9] == 0) {
+            if ((npc->currentAnim + 0xFFAAFFD2) < 2) {
+                npc->currentAnim = 0x55000C;
+            }
+        } else {
+            return ApiStatus_BLOCK;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800495A0(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+
+        case 1:
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            base_UnkNpcAIFunc1(script, aiSettings, territoryPtr);
+            if (enemy->varTable[7] == 6) {
+                if (rand_int(100) < 0x21) {
+                    if (enemy->varTable[8] != 0) {
+                        enemy->varTable[8] = 0;
+                        enemy->unk_B5 = 0;
+                        npc->currentAnim = 0x55002F;
+                    } else {
+                        enemy->varTable[8] = 1;
+                        enemy->unk_B5 = 1;
+                        npc->currentAnim = 0x55002E;
+                    }
+                    enemy->varTable[9] = 7;
+                    return ApiStatus_BLOCK;
+                }
+            }
+
+        case 3:
+            func_80049C04(script, aiSettings, territoryPtr);
+            break;
+
+        case 12:
+            N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(func_802421C0_CD94A0)(script, aiSettings, territoryPtr);
+            break;
+
+        case 14:
+            N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr);
+            break;
+
+        case 15:
+            N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr);
+            break;
+
+        case 99:
+            func_8004A73C(script);
+            break;
+
+    }
+
+    if (enemy->varTable[7] == 6) {
+        if (enemy->varTable[8] != 0) {
+            enemy->unk_B5 = 1;
+        } else {
+            enemy->unk_B5 = 0;
+        }
+        if (enemy->varTable[8] != 0) {
+            switch (npc->currentAnim + 0xFFAAFFFC) {
+                case 0:
+                case 8:
+                case 10:
+                case 12:
+                case 14:
+                case 18:
+                case 20:
+                    npc->currentAnim++;
+                    break;
+            }
+        }
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_80242918_CD9BF8)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    Bytecode* args = script->ptrReadPos;
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+    s32 var;
+    u32 x, y, z;
+    f32 x2, y2, z2, w2;
+    Npc* npc2;
+
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 65.0f;
+    territory.unk_1C = 0;
+
+    if (isInitialCall) {
+        enemy->varTable[6] = npc->collisionHeight;
+        enemy->unk_B0 |= 8;
+    }
+
+    if (isInitialCall || (enemy->varTable[10] == 100)) {
+        script->functionTemp[0].s = 100;
+        npc->duration = 0;
+        npc->currentAnim = enemy->animList[0];
+        npc->flags &= ~0x800;
+        enemy->flags |= 0x200000;
+        npc->flags = (npc->flags & ~0x200) | 8;
+        enemy->varTable[10] = 0;
+        enemy->varTable[11] = -1;
+        npc->pos.x = 0.0f;
+        npc->pos.y = -1000.0f;
+        npc->pos.z = 0.0f;
+    }
+
+    if (enemy->unk_B0 & 4) {
+        npc->duration = 0;
+        npc->collisionHeight = enemy->varTable[6];
+        enemy->unk_B0 &= ~4;
+        if (npc->flags & 0x800) {
+            npc->currentAnim = 0x4A0018;
+            npc->moveSpeed = 0.0f;
+            npc->jumpVelocity = 0.0f;
+            npc->jumpScale = 1.0f;
+            script->functionTemp[0].s = 102;
+        } else {
+            fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
+            npc->currentAnim = enemy->animList[0];
+            script->functionTemp[1].s = 0;
+            script->functionTemp[0].s = 200;
+        }
+    }
+    get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z);
+    if ((script->functionTemp[0].s < 100) && ((x + 50) >= 421)) {
+        script->functionTemp[0].s = 110;
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800495A0(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+            if (enemy->varTable[13] != 0) {
+                if (npc->pos.y <= 0.0) {
+                    npc->flags = (npc->flags & ~0x200) | 8;
+                } else {
+                    npc->flags = (npc->flags | 0x200) & ~8;
+                }
+            }
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 1:
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            base_UnkNpcAIFunc1(script, aiSettings, territoryPtr);
+
+        case 3:
+            func_80049C04(script, aiSettings, territoryPtr);
+            break;
+
+        case 12:
+            N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(func_802421C0_CD94A0)(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+            break;
+
+        case 14:
+            N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr);
+            break;
+
+        case 15:
+            N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr);
+            break;
+
+        case 100:
+            if (enemy->varTable[10] != 2) {
+                break;
+            }
+            npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID);
+            if (npc2->yaw < 180.0) {
+                npc->pos.x = npc2->pos.x + 12.0;
+            } else {
+                npc->pos.x = npc2->pos.x - 12.0;
+            }
+            npc->pos.y = npc2->pos.y + 25.0;
+            npc->pos.z = npc2->pos.z + 1.0;
+            npc->rotation.y = 0.0f;
+            npc->flags |= 8;
+            npc->flags &= ~2;
+            npc->flags &= ~0x200;
+            npc->renderYaw = 0.0f;
+            npc->currentAnim = 0x4A0018;
+            script->functionTemp[0].s = 101;
+
+        case 101:
+            if (enemy->varTable[10] != 3) {
+                break;
+            }
+            enemy->varTable[10] = 4;
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+            npc->moveSpeed = 2.5f;
+            npc->jumpVelocity = 8.0f;
+            npc->jumpScale = 0.8f;
+            npc->flags |= 0x800;
+            script->functionTemp[0].s = 102;
+
+        case 102:
+            if (npc->moveSpeed > 0.0) {
+                x2 = npc->pos.x;
+                y2 = npc->pos.y;
+                z2 = npc->pos.z;
+                if (func_800DDC44(npc->unk_80, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius) == 0) {
+                    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+                } else {
+                    npc->moveSpeed = 0.0f;
+                }
+            }
+
+
+            if (npc->jumpVelocity < 0.0) {
+                x2 = npc->pos.x;
+                y2 = npc->pos.y + 13.0;
+                z2 = npc->pos.z;
+                w2 = fabsf(npc->jumpVelocity) + 16.0;
+                if ((func_800DCB7C(npc->unk_80, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) {
+                    npc->pos.y = y2;
+                    enemy->territory->wander.point.x = npc->pos.x;
+                    enemy->territory->wander.point.y = npc->pos.y;
+                    enemy->territory->wander.point.z = npc->pos.z;
+                    enemy->territory->wander.detect.x = npc->pos.x;
+                    enemy->territory->wander.detect.y = npc->pos.y;
+                    enemy->territory->wander.detect.z = npc->pos.z;
+                    enemy->varTable[10] = 5;
+                    if (enemy->varTable[13] != 0) {
+                        if (npc->pos.y <= 0.0) {
+                            npc->flags = (npc->flags & ~0x200) | 8;
+                        } else {
+                            npc->flags = (npc->flags | 0x200) & ~8;
+                        }
+                    } else if (!enemy->territory->wander.isFlying) {
+                        npc->flags = (npc->flags | 0x200) & ~8;
+                    } else {
+                        npc->flags = (npc->flags & ~0x200) | 8;
+                    }
+                    npc->flags = (npc->flags | 0x40000) & ~0x800;
+                    npc->jumpVelocity = 0.0f;
+                    npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+                    npc->currentAnim = 0x4A001A;
+                    npc->duration = 3;
+                    script->functionTemp[0].s = 103;
+                    break;
+                }
+            }
+            npc->pos.y += npc->jumpVelocity;
+            npc->jumpVelocity -= npc->jumpScale;
+            break;
+
+        case 103:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                npc->flags &= 0xFFFBFFFF;
+                npc->currentAnim = 0x4A0001;
+                script->functionTemp[0].s = 0;
+            }
+            break;
+
+        case 110:
+            npc->duration = 30;
+            npc->pos.x = 0.0f;
+            npc->pos.z = 0.0f;
+            npc->pos.y = -1000.0f;
+            npc->flags = (npc->flags | 0xA) & ~0x200;
+            script->functionTemp[0].s = 111;
+
+        case 111:
+            npc->duration--;
+            if (npc->duration <= 0) {
+                enemy->varTable[10] = 0;
+                script->functionTemp[0].s = 100;
+            }
+            break;
+
+        case 200:
+            func_8004A73C(script);
+            break;
+
+    }
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_flo/flo_17/flo_17.h b/src/world/area_flo/flo_17/flo_17.h
index 3912609cea..aaa4244959 100644
--- a/src/world/area_flo/flo_17/flo_17.h
+++ b/src/world/area_flo/flo_17/flo_17.h
@@ -2,3 +2,13 @@
 #include "map.h"
 
 #define NAMESPACE flo_17
+
+ApiStatus N(func_80240000_CD72E0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240040_CD7320)(ScriptInstance *script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80245228);
+extern Script N(80244284);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c
index 458a5e35f7..0aa4f58edb 100644
--- a/src/world/area_flo/flo_18/CDC6A0.c
+++ b/src/world/area_flo/flo_18/CDC6A0.c
@@ -1,11 +1,1717 @@
 #include "flo_18.h"
+#include "message_ids.h"
+#include "sprite/npc/flying_magikoopa.h"
+#include "sprite/npc/lakitu.h"
+#include "sprite/npc/magikoopa.h"
+#include "sprite/npc/world_lakilester.h"
+
+enum {
+    NPC_LAKITU0,
+    NPC_LAKITU1,
+    NPC_LAKITU2,
+    NPC_MAGIKOOPA,
+    NPC_FLYING_MAGIKOOPA,
+};
+
+EntryList N(entryList) = {
+    { -320.0f, 0.0f,  0.0f,  90.0f },
+    {   36.0f, 0.0f, 40.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_18_tattle },
+};
+
+Script N(80240830) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_PUFF_PUFF_MACHINE, 0, 8);
+            PlaySoundAtCollider(20, 0x80000025, 0);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+static s32 N(pad_8B8)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(updateTexturePan_802408C0) = SCRIPT({
+    group 0;
+    if (SI_VAR(5) == 1) {
+        if (SI_VAR(6) == 1) {
+            if (SI_VAR(7) == 1) {
+                if (SI_VAR(8) == 1) {
+                    N(UnkTexturePanFunc)();
+                    return;
+                }
+            }
+        }
+    }
+    N(UnkTexturePanFunc2)();
+});
+
+Script N(exitWalk_8024095C) = EXIT_WALK_SCRIPT(60,  0, "flo_17",  1);
+
+Script N(802409B8) = SCRIPT({
+    bind N(exitWalk_8024095C) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+s32 N(lavaResetList_802409E4)[] = {
+    0x0000000B, 0xC3480000, 0x00000000, 0x42F00000, 0x0000000C, 0x00000000, 0x00000000, 0x42F00000,
+    0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_8024669C));
+    spawn N(80247024);
+    spawn N(802436BC);
+    spawn N(802456D4);
+    ModifyColliderFlags(3, 8, 0x00000002);
+    spawn {
+        ResetFromLava(N(lavaResetList_802409E4));
+    }
+    EnableTexPanning(9, 1);
+    EnableTexPanning(11, 1);
+    EnableTexPanning(12, 1);
+    EnableTexPanning(13, 1);
+    EnableTexPanning(14, 1);
+    EnableTexPanning(15, 1);
+    EnableTexPanning(7, 1);
+    EnableTexPanning(8, 1);
+    EnableTexPanning(10, 1);
+    EnableTexPanning(16, 1);
+    EnableTexPanning(17, 1);
+    spawn {
+        SI_VAR(0) = 1;
+        SI_VAR(1) = -140;
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802408C0);
+    }
+    spawn {
+        SI_VAR(0) = 2;
+        SI_VAR(1) = -200;
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802408C0);
+    }
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 0) {
+        ModifyColliderFlags(0, 1, 0x7FFFFE00);
+        SI_VAR(0) = N(802409B8);
+        spawn EnterWalk;
+    } else {
+        spawn N(80244058);
+        spawn N(802409B8);
+    }
+    await N(80240830);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_8024030C_CDC9AC)();
+    }
+});
+
+static s32 N(pad_E88)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(80240E90) = SCRIPT({
+    group 11;
+    loop {
+        PlayEffect(0x5E, 0, -16.0, 102.0, -4.099609375, 80.900390625, 102.0, -4.099609375, 0.5, 6, 0, 0, 0, 0);
+        N(func_80240340_CDC9E0)();
+        sleep 4;
+        PlayEffect(0x5E, 0, 80.900390625, 102.0, -4.099609375, -16.0, 102.0, -4.099609375, 0.5, 6, 0, 0, 0, 0);
+        N(func_80240340_CDC9E0)();
+        sleep 4;
+        if (SI_SAVE_VAR(253) >= 3) {
+            break loop;
+        }
+    }
+    SI_VAR(0) = 6;
+    loop 5 {
+        PlayEffect(0x5E, 0, -16.0, 102.0, -4.099609375, 80.900390625, 102.0, -4.099609375, 0.5, 6, 0, 0, 0, 0);
+        N(func_80240340_CDC9E0)();
+        sleep SI_VAR(0);
+        SI_VAR(0) += 2;
+        PlayEffect(0x5E, 0, 80.900390625, 102.0, -4.099609375, -16.0, 102.0, -4.099609375, 0.5, 6, 0, 0, 0, 0);
+        N(func_80240340_CDC9E0)();
+        sleep SI_VAR(0);
+        SI_VAR(0) += 2;
+    }
+});
+
+Script N(80241094) = SCRIPT({
+    EnableModel(SI_VAR(15), 1);
+    SI_VAR(14) = 159;
+    loop SI_VAR(14) {
+        SI_VAR(3) += (float) 0;
+        SI_VAR(4) += 0.0;
+        SI_VAR(5) = 0.0107421875;
+        SI_VAR(0) += (float) SI_VAR(3);
+        SI_VAR(1) += (float) SI_VAR(4);
+        SI_VAR(2) += (float) SI_VAR(5);
+        SI_VAR(6) *= 1.0107421875;
+        SI_VAR(7) += 0.0107421875;
+        SI_VAR(8) = (float) SI_VAR(6);
+        N(UnkFloatFunc)(SI_VAR(14), SI_VAR(10), 0.0, 0.203125, 15, 0, 0);
+        SI_VAR(8) += (float) SI_VAR(10);
+        SI_VAR(9) = (float) SI_VAR(7);
+        N(UnkFloatFunc)(SI_VAR(14), SI_VAR(10), 0.0, 0.203125, 20, 0, 90);
+        SI_VAR(9) += (float) SI_VAR(10);
+        SI_VAR(10) = (float) SI_VAR(0);
+        SI_VAR(10) *= 10.0;
+        TranslateModel(SI_VAR(15), SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(SI_VAR(15), SI_VAR(8), SI_VAR(9), 1);
+        RotateModel(SI_VAR(15), SI_VAR(10), 0, 0, 1);
+        sleep 1;
+    }
+    EnableModel(SI_VAR(15), 0);
+});
+
+Script N(80241284) = SCRIPT({
+    SI_VAR(14) = 0;
+0:
+    if (SI_SAVE_VAR(253) >= 3) {
+        return;
+    }
+    SI_VAR(0) = 132.0;
+    SI_VAR(1) = 90.0;
+    SI_VAR(2) = -30.0;
+    RandInt(100, SI_VAR(3));
+    SI_VAR(3) += (float) -50;
+    SI_VAR(3) /= (float) 200.0;
+    SI_VAR(4) = 1.0;
+    SI_VAR(5) = (float) 0;
+    SI_VAR(6) = 0.296875;
+    SI_VAR(7) = 0.296875;
+    SI_VAR(15) = SI_VAR(14);
+    SI_VAR(15) += 10000;
+    spawn N(80241094);
+    SI_VAR(14) += 1;
+    if (SI_VAR(14) >= 16) {
+        SI_VAR(14) = 0;
+    }
+    sleep 10;
+    goto 0;
+});
+
+Script N(802413F0) = SCRIPT({
+    if (SI_MAP_FLAG(2) == 1) {
+        return;
+    }
+    SI_MAP_FLAG(2) = 1;
+    SI_VAR(15) = 0;
+    loop 12 {
+        RandInt(80, SI_VAR(0));
+        SI_VAR(0) -= 40;
+        RandInt(50, SI_VAR(1));
+        RandInt(50, SI_VAR(2));
+        SI_VAR(2) -= 25;
+        PlayEffect(0x0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 5, 10, 1, 1, 0, 0, 0, 0, 0, 0);
+        SI_VAR(15) += 1;
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(14), 1.0, 1.09375, 2, 0, 0);
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(13), 1.09375, 1.0, 2, 0, 0);
+        SI_VAR(0) = (float) SI_VAR(14);
+        SI_VAR(1) = (float) SI_VAR(13);
+        SI_VAR(2) = (float) SI_VAR(14);
+        if (SI_SAVE_VAR(252) == 0) {
+            ScaleModel(31, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(32, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        }
+        if (SI_SAVE_VAR(253) == 0) {
+            ScaleModel(19, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(20, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        }
+        if (SI_SAVE_VAR(252) <= 1) {
+            ScaleModel(21, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        }
+        if (SI_SAVE_VAR(252) <= 2) {
+            if (SI_SAVE_VAR(253) <= 1) {
+                ScaleModel(22, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                ScaleModel(23, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                ScaleModel(24, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                ScaleModel(25, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                ScaleModel(26, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            }
+        }
+        ScaleModel(27, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        if (SI_SAVE_VAR(252) <= 2) {
+            if (SI_SAVE_VAR(253) <= 2) {
+                ScaleModel(29, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                ScaleModel(41, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                ScaleModel(33, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            }
+        }
+        ScaleModel(36, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(37, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(38, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(39, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(40, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(34, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(0) -= 1.046875;
+        SI_VAR(0) *= 100.0;
+        if (SI_SAVE_VAR(252) == 0) {
+            RotateModel(31, SI_VAR(0), 0, 0, 1);
+            RotateModel(32, SI_VAR(0), 0, 0, 1);
+        }
+        if (SI_SAVE_VAR(253) == 0) {
+            RotateModel(19, SI_VAR(0), 0, 0, 1);
+            RotateModel(20, SI_VAR(0), 0, 0, 1);
+        }
+        if (SI_SAVE_VAR(252) <= 1) {
+            RotateModel(21, SI_VAR(0), 0, 0, 1);
+        }
+        if (SI_SAVE_VAR(252) <= 2) {
+            if (SI_SAVE_VAR(253) <= 1) {
+                RotateModel(22, SI_VAR(0), 0, 0, 1);
+                RotateModel(23, SI_VAR(0), 0, 0, 1);
+                RotateModel(24, SI_VAR(0), 0, 0, 1);
+                RotateModel(25, SI_VAR(0), 0, 0, 1);
+                RotateModel(26, SI_VAR(0), 0, 0, 1);
+            }
+        }
+        RotateModel(27, SI_VAR(0), 0, 0, 1);
+        if (SI_SAVE_VAR(252) <= 2) {
+            if (SI_SAVE_VAR(253) <= 2) {
+                RotateModel(29, SI_VAR(0), 0, 0, 1);
+                RotateModel(41, SI_VAR(0), 0, 0, 1);
+                RotateModel(33, SI_VAR(0), 0, 0, 1);
+            }
+        }
+        RotateModel(36, SI_VAR(0), 0, 0, 1);
+        RotateModel(37, SI_VAR(0), 0, 0, 1);
+        RotateModel(38, SI_VAR(0), 0, 0, 1);
+        RotateModel(39, SI_VAR(0), 0, 0, 1);
+        RotateModel(40, SI_VAR(0), 0, 0, 1);
+        RotateModel(34, SI_VAR(0), 0, 0, 1);
+        sleep 1;
+    }
+    SI_VAR(0) = (float) 1;
+    SI_VAR(1) = (float) 1;
+    SI_VAR(2) = (float) 1;
+    if (SI_SAVE_VAR(252) == 0) {
+        ScaleModel(31, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(32, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    }
+    if (SI_SAVE_VAR(253) == 0) {
+        ScaleModel(19, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        ScaleModel(20, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    }
+    if (SI_SAVE_VAR(252) <= 1) {
+        ScaleModel(21, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    }
+    if (SI_SAVE_VAR(252) <= 2) {
+        if (SI_SAVE_VAR(253) <= 1) {
+            ScaleModel(22, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(23, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(24, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(25, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(26, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        }
+    }
+    ScaleModel(27, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    if (SI_SAVE_VAR(252) <= 2) {
+        if (SI_SAVE_VAR(253) <= 2) {
+            ScaleModel(29, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(41, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            ScaleModel(33, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        }
+    }
+    ScaleModel(36, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    ScaleModel(37, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    ScaleModel(38, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    ScaleModel(39, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    ScaleModel(40, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    ScaleModel(34, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    sleep 1;
+    SI_MAP_FLAG(2) = 0;
+});
+
+/*
+Script N(80241ED4) = SCRIPT({
+    SI_VAR(0) = 0;
+    SI_VAR(1) = 0;
+    SI_VAR(2) = 0;
+    SI_VAR(3) = -1.0;
+    SI_VAR(4) = 0.0;
+    SI_VAR(5) = 3.0;
+    spawn {
+        sleep 10;
+        PlaySoundAtCollider(19, 486, 0);
+    }
+    loop 300 {
+        SI_VAR(4) += -0.5;
+        SI_VAR(5) += 0.09375;
+        SI_VAR(0) += (float) SI_VAR(3);
+        SI_VAR(1) += (float) SI_VAR(4);
+        SI_VAR(2) += (float) SI_VAR(5);
+        if (SI_VAR(1) < -10) {
+            SI_VAR(1) = -10.0;
+            SI_VAR(3) = 0.0;
+            SI_VAR(4) = 0.0;
+            if (SI_VAR(2) >= 80) {
+                goto 0;
+            }
+        }
+    }
+    TranslateModel(31, -78, 19, 2);
+    TranslateModel(32, -78, 19, 2);
+    TranslateModel(31, SI_VAR(0), SI_VAR(1), 0);
+    TranslateModel(32, SI_VAR(0), SI_VAR(1), 0);
+    RotateModel(31, SI_VAR(2), 0, 0, 1);
+    RotateModel(32, SI_VAR(2), 0, 0, 1);
+    TranslateModel(31, 78, -19, -2);
+    TranslateModel(32, 78, -19, -2);
+    sleep 1;
+}
+0:
+    sleep 30;
+    ModifyColliderFlags(0, 19, 0x7FFFFE00);
+});
+*/
+// *INDENT-OFF*
+Script N(80241ED4) = {
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(0), 0),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(1), 0),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(2), 0),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(3), SI_FIXED(-1.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(4), SI_FIXED(0.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(5), SI_FIXED(3.0)),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 10),
+        SI_CMD(ScriptOpcode_CALL, PlaySoundAtCollider, 19, 486, 0),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_LOOP, 300),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(4), SI_FIXED(-0.5)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(5), SI_FIXED(0.09375)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(0), SI_VAR(3)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(1), SI_VAR(4)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(2), SI_VAR(5)),
+        SI_CMD(ScriptOpcode_IF_LT, SI_VAR(1), -10),
+            SI_CMD(ScriptOpcode_SET_F, SI_VAR(1), SI_FIXED(-10.0)),
+            SI_CMD(ScriptOpcode_SET_F, SI_VAR(3), SI_FIXED(0.0)),
+            SI_CMD(ScriptOpcode_SET_F, SI_VAR(4), SI_FIXED(0.0)),
+            SI_CMD(ScriptOpcode_IF_GE, SI_VAR(2), 80),
+                SI_CMD(ScriptOpcode_GOTO, 0),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 31, -78, 19, 2),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 32, -78, 19, 2),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 31, SI_VAR(0), SI_VAR(1), 0),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 32, SI_VAR(0), SI_VAR(1), 0),
+    SI_CMD(ScriptOpcode_CALL, RotateModel, 31, SI_VAR(2), 0, 0, 1),
+    SI_CMD(ScriptOpcode_CALL, RotateModel, 32, SI_VAR(2), 0, 0, 1),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 31, 78, -19, -2),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 32, 78, -19, -2),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+SI_CMD(ScriptOpcode_END_LOOP),
+SI_CMD(ScriptOpcode_LABEL, 0),
+SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+SI_CMD(ScriptOpcode_CALL, ModifyColliderFlags, 0, 19, 0x7FFFFE00),
+SI_CMD(ScriptOpcode_RETURN),
+SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80242174) = SCRIPT({
+    SI_VAR(0) = (float) 0;
+    SI_VAR(1) = (float) 0;
+    SI_VAR(2) = (float) 0;
+    SI_VAR(3) = 0.0;
+    SI_VAR(4) = 0.0;
+    SI_VAR(5) = -5.0;
+    spawn {
+        sleep 12;
+        PlaySoundAtCollider(21, 487, 0);
+    }
+    loop 300 {
+        SI_VAR(4) += -0.5;
+        SI_VAR(0) += (float) SI_VAR(3);
+        SI_VAR(1) += (float) SI_VAR(4);
+        SI_VAR(2) += (float) SI_VAR(5);
+        if (SI_VAR(2) < -45) {
+            SI_VAR(5) = 5;
+        }
+        if (SI_VAR(2) > 0) {
+            SI_VAR(2) = 0;
+            SI_VAR(3) = 5;
+        }
+        if (SI_VAR(1) < -25) {
+            SI_VAR(4) = 0;
+            SI_VAR(1) = -25;
+        }
+        if (SI_VAR(0) > 90) {
+            goto 0;
+        }
+        TranslateModel(19, 50, 28, 27);
+        TranslateModel(20, 50, 28, 27);
+        TranslateModel(19, 0, SI_VAR(1), 1);
+        TranslateModel(20, 0, SI_VAR(1), 1);
+        RotateModel(19, SI_VAR(0), 1, 0, 0);
+        RotateModel(20, SI_VAR(0), 1, 0, 0);
+        RotateModel(19, SI_VAR(2), 0, 0, 1);
+        RotateModel(20, SI_VAR(2), 0, 0, 1);
+        TranslateModel(19, -50, -28, -27);
+        TranslateModel(20, -50, -28, -27);
+        sleep 1;
+    }
+0:
+    sleep 30;
+});
+
+Script N(80242474) = SCRIPT({
+    SI_VAR(2) = (float) 0;
+    SI_VAR(1) = (float) 0;
+    SI_VAR(0) = (float) 0;
+    SI_VAR(5) = 0.0;
+    spawn {
+        sleep 15;
+        PlaySoundAtCollider(23, 487, 0);
+    }
+    loop 300 {
+        SI_VAR(5) += 0.5;
+        SI_VAR(2) += (float) SI_VAR(5);
+        if (SI_VAR(2) >= 80) {
+            SI_VAR(2) = (float) 80;
+            SI_VAR(5) *= -0.5;
+            if (SI_VAR(5) == 0) {
+                goto 0;
+            }
+        }
+        TranslateModel(21, -55, 5, 16);
+        TranslateModel(21, SI_VAR(0), SI_VAR(1), 0);
+        RotateModel(21, SI_VAR(2), 0, 0, 1);
+        TranslateModel(21, 55, -5, -16);
+        sleep 1;
+    }
+0:
+    sleep 30;
+});
+
+Script N(80242620) = SCRIPT({
+    SI_VAR(2) = (float) 0;
+    SI_VAR(1) = (float) 0;
+    SI_VAR(0) = (float) 0;
+    SI_VAR(5) = 0.0;
+    spawn {
+        sleep 15;
+        PlaySoundAtCollider(22, 487, 0);
+    }
+    loop 300 {
+        SI_VAR(5) += 0.5;
+        SI_VAR(2) += (float) SI_VAR(5);
+        if (SI_VAR(2) >= 80) {
+            SI_VAR(2) = (float) 80;
+            SI_VAR(5) *= -0.5;
+            if (SI_VAR(5) == 0) {
+                goto 0;
+            }
+        }
+        TranslateModel(24, 60, 0, 16);
+        RotateModel(24, SI_VAR(2), 0, 0, -1);
+        TranslateModel(24, -60, 0, -16);
+        TranslateModel(22, 0, 0, 27);
+        TranslateModel(23, 0, 0, 27);
+        RotateModel(22, SI_VAR(2), 1, 0, 0);
+        RotateModel(23, SI_VAR(2), 1, 0, 0);
+        TranslateModel(22, 0, 0, -27);
+        TranslateModel(23, 0, 0, -27);
+        TranslateModel(25, 0, 0, -41);
+        TranslateModel(26, 0, 0, -41);
+        RotateModel(25, SI_VAR(2), -1, 0, 0);
+        RotateModel(26, SI_VAR(2), -1, 0, 0);
+        TranslateModel(25, 0, 0, 41);
+        TranslateModel(26, 0, 0, 41);
+        sleep 1;
+    }
+0:
+    sleep 30;
+});
+
+/*
+Script N(80242910) = SCRIPT({
+    SI_VAR(0) = 0;
+    SI_VAR(1) = 0;
+    SI_VAR(2) = 0;
+    SI_VAR(3) = -1.0;
+    SI_VAR(4) = 0.0;
+    SI_VAR(5) = 3.0;
+    spawn {
+        sleep 15;
+        PlaySoundAtCollider(18, 486, 0);
+    }
+    loop 300 {
+        SI_VAR(4) += -0.5;
+        SI_VAR(5) += 0.09375;
+        SI_VAR(0) += (float) SI_VAR(3);
+        SI_VAR(1) += (float) SI_VAR(4);
+        SI_VAR(2) += (float) SI_VAR(5);
+        if (SI_VAR(1) < -25) {
+            SI_VAR(1) = -25.0;
+            SI_VAR(3) = 0.0;
+            SI_VAR(4) = 0.0;
+            if (SI_VAR(2) >= 80) {
+                goto 0;
+            }
+        }
+    }
+    TranslateModel(29, 124, 17, 3);
+    TranslateModel(29, SI_VAR(0), SI_VAR(1), 0);
+    RotateModel(29, SI_VAR(2), 0, 0, -1);
+    TranslateModel(29, -124, -17, -3);
+    sleep 1;
+}
+0:
+});
+*/
+// *INDENT-OFF*
+Script N(80242910) = {
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(0), 0),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(1), 0),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(2), 0),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(3), SI_FIXED(-1.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(4), SI_FIXED(0.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_VAR(5), SI_FIXED(3.0)),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+        SI_CMD(ScriptOpcode_CALL, PlaySoundAtCollider, 18, 486, 0),
+    SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+    SI_CMD(ScriptOpcode_LOOP, 300),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(4), SI_FIXED(-0.5)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(5), SI_FIXED(0.09375)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(0), SI_VAR(3)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(1), SI_VAR(4)),
+        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(2), SI_VAR(5)),
+        SI_CMD(ScriptOpcode_IF_LT, SI_VAR(1), -25),
+            SI_CMD(ScriptOpcode_SET_F, SI_VAR(1), SI_FIXED(-25.0)),
+            SI_CMD(ScriptOpcode_SET_F, SI_VAR(3), SI_FIXED(0.0)),
+            SI_CMD(ScriptOpcode_SET_F, SI_VAR(4), SI_FIXED(0.0)),
+            SI_CMD(ScriptOpcode_IF_GE, SI_VAR(2), 80),
+                SI_CMD(ScriptOpcode_GOTO, 0),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 29, 124, 17, 3),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 29, SI_VAR(0), SI_VAR(1), 0),
+    SI_CMD(ScriptOpcode_CALL, RotateModel, 29, SI_VAR(2), 0, 0, -1),
+    SI_CMD(ScriptOpcode_CALL, TranslateModel, 29, -124, -17, -3),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+SI_CMD(ScriptOpcode_END_LOOP),
+SI_CMD(ScriptOpcode_LABEL, 0),
+SI_CMD(ScriptOpcode_RETURN),
+SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80242B18) = SCRIPT({
+    ModifyColliderFlags(0, 18, 0x7FFFFE00);
+    SI_VAR(0) = (float) 0;
+    SI_VAR(1) = (float) 0;
+    SI_VAR(2) = (float) 0;
+    SI_VAR(3) = 3.0;
+    SI_VAR(4) = 1.0;
+    SI_VAR(5) = 5.0;
+    spawn {
+        sleep 15;
+        PlaySoundAtCollider(20, 486, 0);
+    }
+    loop 300 {
+        SI_VAR(4) += -0.5;
+        SI_VAR(0) += (float) SI_VAR(3);
+        SI_VAR(1) += (float) SI_VAR(4);
+        SI_VAR(2) += (float) SI_VAR(5);
+        if (SI_VAR(1) <= -40) {
+            SI_VAR(1) = (float) -40;
+            SI_VAR(4) *= -0.5;
+            if (SI_VAR(4) <= 1) {
+                goto 1;
+            }
+        }
+        if (SI_VAR(2) >= 60) {
+            SI_VAR(2) = (float) 60;
+            SI_VAR(5) = (float) 0;
+        }
+        TranslateModel(41, -34, 50, 10);
+        TranslateModel(33, -34, 50, 10);
+        TranslateModel(41, 0, SI_VAR(1), SI_VAR(0));
+        RotateModel(41, SI_VAR(2), 0, 0, 1);
+        TranslateModel(33, 0, SI_VAR(1), SI_VAR(0));
+        RotateModel(33, SI_VAR(2), 0, 0, 1);
+        TranslateModel(41, 34, -50, -10);
+        TranslateModel(33, 34, -50, -10);
+        sleep 1;
+    }
+1:
+    sleep 30;
+});
+
+s32 N(intTable_80242DC8)[] = {
+    0x00000000, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000003C, 0x0000000A,
+    0x0000001B, 0x0000001E, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000001E,
+    0x00000000, 0x0000001B, 0x00000055, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B,
+};
+
+// *INDENT-OFF*
+Script N(80242E28) = {
+    SI_CMD(ScriptOpcode_SET, SI_VAR(10), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+    SI_CMD(ScriptOpcode_IF_LT, SI_VAR(0), -210),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 485),
+    SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802413F0)),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(0), SI_VAR(10)),
+    SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), 52),
+        SI_CMD(ScriptOpcode_SET, SI_MAP_FLAG(1), 1),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_MAP_FLAG(3), 1),
+        SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_SET, SI_MAP_FLAG(3), 1),
+    SI_CMD(ScriptOpcode_IF_GT, SI_VAR(0), 2),
+        SI_CMD(ScriptOpcode_GOTO, 0),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 2),
+        SI_CMD(ScriptOpcode_GOTO, 11),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_LABEL, 11),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(252), 0),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(252), 1),
+            SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80241ED4)),
+            SI_CMD(ScriptOpcode_GOTO, 0),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 1),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(253), 0),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(253), 1),
+            SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80242174)),
+            SI_CMD(ScriptOpcode_GOTO, 0),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(252), 1),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(252), 2),
+            SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80242474)),
+            SI_CMD(ScriptOpcode_GOTO, 0),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(252), 2),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(253), 1),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(253), 2),
+            SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80242620)),
+            SI_CMD(ScriptOpcode_GOTO, 0),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(252), 2),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_VAR(253), 2),
+            SI_CMD(ScriptOpcode_CALL, DisablePlayerInput, 1),
+            SI_CMD(ScriptOpcode_CALL, UseSettingsFrom, 0, 40, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, SetPanTarget, 0, 40, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, SetCamSpeed, 0, SI_FIXED(1.5)),
+            SI_CMD(ScriptOpcode_CALL, PanToTarget, 0, 0, 1),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(253), 3),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802413F0)),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802413F0)),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(802413F0)),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+            SI_CMD(ScriptOpcode_CALL, GetModelCenter, 27),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 29, 0, SI_VAR(0), 50, SI_VAR(2), 100, 20, 0, 30, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 29, 0, SI_VAR(0), 30, SI_VAR(2), 120, 20, 0, 30, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 29, 0, SI_VAR(0), 10, SI_VAR(2), 100, 20, 0, 30, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 15),
+            SI_CMD(ScriptOpcode_SPAWN_THREAD),
+                SI_CMD(ScriptOpcode_SET, SI_VAR(3), 6),
+                SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_80242DC8)),
+                SI_CMD(ScriptOpcode_LOOP, 8),
+                    SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+                    SI_CMD(ScriptOpcode_CALL, PlaySoundAt, 400, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+                    SI_CMD(ScriptOpcode_CALL, PlayEffect, 39, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 6, 0, 0, 0, 0, 0, 0, 0),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 2),
+                    SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 5),
+                    SI_CMD(ScriptOpcode_CALL, PlaySoundAt, 400, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+                    SI_CMD(ScriptOpcode_CALL, PlayEffect, 39, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 2, 15, 0, 0, 0, 0, 0, 0, 0),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(3)),
+                    SI_CMD(ScriptOpcode_ADD, SI_VAR(3), 1),
+                SI_CMD(ScriptOpcode_END_LOOP),
+                SI_CMD(ScriptOpcode_SET_F, SI_VAR(4), SI_FIXED(2.0)),
+                SI_CMD(ScriptOpcode_LOOP, 2),
+                    SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_80242DC8)),
+                    SI_CMD(ScriptOpcode_LOOP, 8),
+                        SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+                        SI_CMD(ScriptOpcode_CALL, PlaySoundAt, 400, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)),
+                        SI_CMD(ScriptOpcode_CALL, PlayEffect, 39, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 25, 0, 0, 0, 0, 0, 0, 0),
+                        SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(3)),
+                        SI_CMD(ScriptOpcode_ADD, SI_VAR(3), SI_VAR(4)),
+                        SI_CMD(ScriptOpcode_ADD_F, SI_VAR(4), SI_FIXED(0.5)),
+                    SI_CMD(ScriptOpcode_END_LOOP),
+                SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_CALL, PlaySoundAt, 416, 0, 70, 40, 10),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 36, 0, 70, 40, 10, SI_FIXED(3.0), 30, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, ShakeCam, 0, 0, 20, SI_FIXED(1.0)),
+            SI_CMD(ScriptOpcode_CALL, PlaySoundAt, 416, 0, 0, 30, 30),
+            SI_CMD(ScriptOpcode_CALL, PlayEffect, 36, 0, 0, 30, 30, SI_FIXED(4.0), 40, 0, 0, 0, 0, 0, 0, 0),
+            SI_CMD(ScriptOpcode_CALL, ShakeCam, 0, 0, 20, SI_FIXED(2.0)),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80242910)),
+            SI_CMD(ScriptOpcode_CALL, PlaySoundAtCollider, 20, 1169, 0),
+            SI_CMD(ScriptOpcode_CALL, FadeOutMusic, 0, 1000),
+            SI_CMD(ScriptOpcode_CALL, DisablePlayerPhysics, 1),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+            SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80242B18)),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(0), 53),
+            SI_CMD(ScriptOpcode_CALL, GotoMap, "flo_15", 1),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 70),
+            SI_CMD(ScriptOpcode_RETURN),
+        SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_LABEL, 0),
+    SI_CMD(ScriptOpcode_SET, SI_MAP_FLAG(3), 0),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Vec4f N(triggerCoord_8024367C) = { 5.0f, 0.0f, -10.0, 0.0f };
+
+Vec4f N(triggerCoord_8024368C) = { -5.0f, 0.0f, -20.0f, 0.0f };
+
+Vec4f N(triggerCoord_8024369C) = { 50.0f, 0.0f, -10.0, 0.0f };
+
+Vec4f N(triggerCoord_802436AC) = { 105.0f, 0.0f, -10.0, 0.0f };
+
+Script N(802436BC) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        EnableModel(49, 0);
+        ModifyColliderFlags(0, 19, 0x7FFFFE00);
+        EnableModel(31, 0);
+        EnableModel(32, 0);
+        EnableModel(19, 0);
+        EnableModel(20, 0);
+        EnableModel(21, 0);
+        EnableModel(22, 0);
+        EnableModel(23, 0);
+        EnableModel(24, 0);
+        EnableModel(25, 0);
+        EnableModel(26, 0);
+        EnableModel(29, 0);
+        EnableModel(41, 0);
+        EnableModel(33, 0);
+        ModifyColliderFlags(0, 18, 0x7FFFFE00);
+        return;
+    }
+    spawn N(80240E90);
+    EnableModel(49, 0);
+    if (SI_SAVE_VAR(252) >= 1) {
+        ModifyColliderFlags(0, 19, 0x7FFFFE00);
+        EnableModel(31, 0);
+        EnableModel(32, 0);
+    }
+    if (SI_SAVE_VAR(253) >= 1) {
+        EnableModel(19, 0);
+        EnableModel(20, 0);
+    }
+    if (SI_SAVE_VAR(252) >= 2) {
+        EnableModel(21, 0);
+    }
+    if (SI_SAVE_VAR(253) >= 2) {
+        EnableModel(22, 0);
+        EnableModel(23, 0);
+        EnableModel(24, 0);
+        EnableModel(25, 0);
+        EnableModel(26, 0);
+    }
+    if (SI_SAVE_VAR(253) >= 3) {
+        EnableModel(29, 0);
+        EnableModel(41, 0);
+        EnableModel(33, 0);
+        ModifyColliderFlags(0, 18, 0x7FFFFE00);
+        return;
+    }
+    SI_VAR(0) = 0;
+    bind N(80242E28) to TRIGGER_WALL_HAMMER 23;
+    bind N(80242E28) to TRIGGER_POINT_BOMB N(triggerCoord_8024367C);
+    bind N(80242E28) to TRIGGER_POINT_BOMB N(triggerCoord_8024368C);
+    SI_VAR(0) = 1;
+    bind N(80242E28) to TRIGGER_WALL_HAMMER 22;
+    bind N(80242E28) to TRIGGER_POINT_BOMB N(triggerCoord_8024369C);
+    bind N(80242E28) to TRIGGER_POINT_BOMB N(triggerCoord_802436AC);
+    SI_VAR(0) = 3;
+    bind N(80242E28) to TRIGGER_WALL_HAMMER 19;
+    SI_VAR(0) = 4;
+    bind N(80242E28) to TRIGGER_WALL_HAMMER 18;
+    SI_VAR(0) = 0;
+    loop 16 {
+        SI_VAR(1) = SI_VAR(0);
+        SI_VAR(1) += 10000;
+        SI_VAR(0) += 1;
+        CloneModel(49, SI_VAR(1));
+        EnableModel(SI_VAR(1), 0);
+    }
+    spawn N(80241284);
+    EnableTexPanning(36, 1);
+    EnableTexPanning(37, 1);
+    EnableTexPanning(38, 1);
+    EnableTexPanning(39, 1);
+    EnableTexPanning(40, 1);
+    EnableTexPanning(41, 1);
+    spawn {
+        SI_VAR(14) = 1.0;
+    0:
+        if (SI_SAVE_VAR(253) >= 3) {
+            SI_VAR(14) *= 0.953125;
+        }
+        SI_VAR(15) += (float) SI_VAR(14);
+        if (SI_VAR(15) == 1080) {
+            SI_VAR(15) = (float) 0;
+        }
+        SI_VAR(0) = SI_VAR(15);
+        SI_VAR(0) /= 9;
+        SI_VAR(0) %= 4;
+        SI_VAR(0) *= 16384;
+        SI_VAR(1) = SI_VAR(15);
+        SI_VAR(1) /= 4;
+        SI_VAR(1) %= 2;
+        SI_VAR(1) *= 16384;
+        SI_VAR(2) = SI_VAR(15);
+        SI_VAR(2) /= 5;
+        SI_VAR(2) %= 2;
+        SI_VAR(2) *= 16384;
+        SI_VAR(3) = SI_VAR(15);
+        SI_VAR(3) /= 6;
+        SI_VAR(3) %= 2;
+        SI_VAR(3) *= 16384;
+        SI_VAR(4) = SI_VAR(15);
+        SI_VAR(4) /= 2;
+        SI_VAR(4) %= 2;
+        SI_VAR(4) *= 32768;
+        SI_VAR(5) = SI_VAR(15);
+        SI_VAR(5) /= 8;
+        SI_VAR(5) %= 2;
+        SI_VAR(5) *= 16384;
+        SetTexPanOffset(12, 0, SI_VAR(0), 0);
+        SetTexPanOffset(13, 0, SI_VAR(1), 0);
+        SetTexPanOffset(14, 0, SI_VAR(2), 0);
+        SetTexPanOffset(15, 0, SI_VAR(3), 0);
+        SetTexPanOffset(11, 0, SI_VAR(4), 0);
+        SetTexPanOffset(10, 0, SI_VAR(5), 0);
+        SetTexPanOffset(9, 0, SI_VAR(5), 0);
+        sleep 1;
+        goto 0;
+    }
+});
+
+NpcSettings N(npcSettings_80243F10) = {
+    .height = 32,
+    .radius = 24,
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 20,
+};
+
+NpcSettings N(npcSettings_80243F3C) = {
+    .height = 34,
+    .radius = 24,
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 26,
+};
+
+Vec3f N(vectorList_80243F68)[] = {
+     { -55.0, 15.0, 35.0 }, { -155.0, 35.0, 35.0 },
+     { -255.0, 75.0, 35.0 }, { -355.0, 155.0, 35.0 },
+     { -455.0, 315.0, 35.0 },
+};
+
+Vec3f N(vectorList_80243FA4)[] = {
+     { -20.0, 15.0, 30.0 }, { -120.0, 35.0, 30.0 },
+     { -220.0, 75.0, 30.0 }, { -320.0, 155.0, 30.0 },
+     { -420.0, 315.0, 30.0 },
+};
+
+Vec3f N(vectorList_80243FE0)[] = {
+     { 65.0, 15.0, 30.0 }, { -35.0, 35.0, 30.0 },
+     { -135.0, 75.0, 30.0 }, { -235.0, 155.0, 30.0 },
+     { -335.0, 315.0, 30.0 },
+};
+
+Vec3f N(vectorList_8024401C)[] = {
+     { 120.0, 15.0, 30.0 }, { 20.0, 35.0, 30.0 },
+     { -80.0, 75.0, 30.0 }, { -180.0, 155.0, 30.0 },
+     { -280.0, 315.0, 30.0 },
+};
+
+Script N(80244058) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePartnerAI(0);
+    SetPlayerPos(30, 0, 50);
+    InterpPlayerYaw(90, 0);
+    SetNpcPos(NPC_PARTNER, 65, 0, 50);
+    sleep 30;
+    AdjustCam(0, 8.0, 0, 300, 19.0, -8.5);
+    GetCurrentPartnerID(SI_VAR(0));
+    BringPartnerOut(8);
+    if (SI_VAR(0) != 8) {
+        SetNpcJumpscale(NPC_PARTNER, 0.0);
+        GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        SI_VAR(1) += 20;
+        SI_VAR(2) += 20;
+        SI_VAR(3) += 20;
+        NpcJump0(NPC_PARTNER, SI_VAR(1), SI_VAR(2), SI_VAR(3), 30);
+    }
+    PlayerFaceNpc(-4, 0);
+    NpcFacePlayer(NPC_PARTNER, 0);
+    SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00C9));
+    SetPlayerAnimation(ANIM_NOD_YES);
+    sleep 10;
+    SetPlayerAnimation(ANIM_STAND_STILL);
+    sleep 20;
+    EnablePartnerAI();
+    PutPartnerAway();
+    ResetCam(0, 4.0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80244270) = SCRIPT({
+    spawn {
+        PlaySoundAtNpc(NPC_FLYING_MAGIKOOPA, 0x19E, 0);
+        SetNpcFlagBits(NPC_FLYING_MAGIKOOPA, ((NPC_FLAG_100)), TRUE);
+        InterpNpcYaw(NPC_FLYING_MAGIKOOPA, 270, 0);
+        LoadPath(60, N(vectorList_80243F68), 5, 0);
+        loop {
+            GetNextPathPos();
+            SetNpcPos(NPC_FLYING_MAGIKOOPA, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            sleep 1;
+            if (SI_VAR(0) != 1) {
+                break loop;
+            }
+        }
+    }
+    sleep 15;
+    spawn {
+        PlaySoundAtNpc(NPC_LAKITU0, 0x19F, 0);
+        SetNpcFlagBits(NPC_LAKITU0, ((NPC_FLAG_100)), TRUE);
+        InterpNpcYaw(NPC_LAKITU0, 270, 0);
+        LoadPath(60, N(vectorList_80243FA4), 5, 0);
+        loop {
+            GetNextPathPos();
+            SetNpcPos(NPC_LAKITU0, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            sleep 1;
+            if (SI_VAR(0) != 1) {
+                break loop;
+            }
+        }
+    }
+    spawn {
+        SetNpcFlagBits(NPC_LAKITU1, ((NPC_FLAG_100)), TRUE);
+        InterpNpcYaw(NPC_LAKITU1, 270, 0);
+        LoadPath(70, N(vectorList_80243FE0), 5, 0);
+        loop {
+            GetNextPathPos();
+            SetNpcPos(NPC_LAKITU1, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+            sleep 1;
+            if (SI_VAR(0) != 1) {
+                break loop;
+            }
+        }
+    }
+    PlaySoundAtNpc(NPC_LAKITU2, 0x19F, 0);
+    SetNpcFlagBits(NPC_LAKITU2, ((NPC_FLAG_100)), TRUE);
+    InterpNpcYaw(NPC_LAKITU2, 270, 0);
+    LoadPath(80, N(vectorList_8024401C), 5, 0);
+    loop {
+        GetNextPathPos();
+        SetNpcPos(NPC_LAKITU2, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        sleep 1;
+        if (SI_VAR(0) != 1) {
+            break loop;
+        }
+    }
+});
+
+Script N(802445D4) = SCRIPT({
+    sleep 5;
+    IsPlayerWithin(40, 0, 200, SI_VAR(0));
+    if (SI_VAR(0) == 0) {
+        SI_VAR(3) = 45;
+    } else {
+        SI_VAR(3) = 25;
+    }
+    SI_VAR(4) = SI_VAR(3);
+    SI_VAR(4) += -5;
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    if (SI_VAR(2) > -61) {
+        parallel {
+            SetNpcFlagBits(NPC_LAKITU0, ((NPC_FLAG_100)), TRUE);
+            NpcMoveTo(NPC_LAKITU0, SI_VAR(0), 55, SI_VAR(3));
+        }
+        parallel {
+            SetNpcFlagBits(NPC_LAKITU1, ((NPC_FLAG_100)), TRUE);
+            NpcMoveTo(NPC_LAKITU1, SI_VAR(0), 55, SI_VAR(3));
+        }
+        parallel {
+            SetNpcFlagBits(NPC_LAKITU2, ((NPC_FLAG_100)), TRUE);
+            NpcMoveTo(NPC_LAKITU2, SI_VAR(0), 55, SI_VAR(3));
+        }
+        sleep SI_VAR(4);
+    }
+});
+
+Script N(80244774) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePartnerAI(0);
+    GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetNpcPos(NPC_PARTNER, 65, SI_VAR(1), 80);
+    SetNpcYaw(NPC_PARTNER, 270);
+    AdjustCam(0, 8.0, 0, 450, 17.0, -6.0);
+    SpeakToPlayer(NPC_FLYING_MAGIKOOPA, NPC_ANIM(flying_magikoopa, Palette_02, Anim_9), NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x00BB));
+    sleep 20;
+    spawn N(80244270);
+    sleep 80;
+    AdjustCam(0, 8.0, 0, 300, 19.0, -8.5);
+    GetCurrentPartnerID(SI_VAR(0));
+    BringPartnerOut(8);
+    if (SI_VAR(0) != 8) {
+        SetNpcJumpscale(NPC_PARTNER, 0.0);
+        GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        SI_VAR(1) += 20;
+        SI_VAR(2) += 20;
+        SI_VAR(3) += 20;
+        NpcJump0(NPC_PARTNER, SI_VAR(1), SI_VAR(2), SI_VAR(3), 30);
+    }
+    NpcFacePlayer(NPC_PARTNER, 0);
+    DisablePartnerAI(0);
+    SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00C1));
+    EnablePartnerAI();
+    sleep 20;
+    PutPartnerAway();
+    ResetCam(0, 4.0);
+    STORY_PROGRESS = STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS;
+    DisablePlayerInput(FALSE);
+    AwaitPlayerApproach(-250, 0, 50);
+    DisablePlayerInput(TRUE);
+    GetCurrentPartnerID(SI_VAR(0));
+    BringPartnerOut(8);
+    if (SI_VAR(0) != 8) {
+        SetNpcJumpscale(NPC_PARTNER, 0.0);
+        GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        SI_VAR(1) += 20;
+        SI_VAR(2) += 20;
+        SI_VAR(3) += 20;
+        NpcJump0(NPC_PARTNER, SI_VAR(1), SI_VAR(2), SI_VAR(3), 30);
+    }
+    PlayerFaceNpc(-4, 0);
+    NpcFacePlayer(NPC_PARTNER, 0);
+    DisablePartnerAI(0);
+    SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00C2));
+    EnablePartnerAI();
+    PutPartnerAway();
+    ResetCam(0, 4.0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(idle_80244B3C) = SCRIPT({
+    loop {
+        GetSelfVar(0, SI_VAR(0));
+        if (SI_VAR(0) != 0) {
+            break loop;
+        }
+        sleep 1;
+    }
+    DisablePlayerInput(TRUE);
+    sleep 10;
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 1000);
+    SetCamPitch(0, 17.0, -6.0);
+    SetCamSpeed(0, 4.0);
+    PanToTarget(0, 0, 1);
+    DisablePlayerInput(FALSE);
+    StartBossBattle(3);
+});
+
+Script N(defeat_80244C84) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            GetSelfNpcID(SI_VAR(0));
+            if (SI_VAR(0) == 3) {
+                SetNpcPos(NPC_MAGIKOOPA, 0, -1000, 0);
+                SetNpcPos(NPC_FLYING_MAGIKOOPA, -55, 15, 35);
+                GetNpcYaw(3, SI_VAR(0));
+                SetNpcYaw(NPC_FLYING_MAGIKOOPA, 90);
+                InterpPlayerYaw(180, 0);
+                SetPlayerPos(30, 0, 80);
+                SetNpcYaw(NPC_LAKITU0, 90);
+                SetNpcPos(NPC_LAKITU0, -20, 15, 30);
+                SetNpcYaw(NPC_LAKITU1, 270);
+                SetNpcPos(NPC_LAKITU1, 65, 15, 30);
+                SetNpcYaw(NPC_LAKITU2, 270);
+                SetNpcPos(NPC_LAKITU2, 120, 15, 30);
+                spawn N(80244774);
+            }
+        }
+        == 1 {}
+        == 2 {
+        }
+    }
+});
+
+Script N(80244E2C) = SCRIPT({
+    match SI_MAP_VAR(10) {
+        == 0 {
+            NpcFacePlayer(NPC_MAGIKOOPA, 1);
+        }
+        == 1 {
+            NpcFacePlayer(NPC_LAKITU0, 1);
+        }
+        == 2 {
+            NpcFacePlayer(NPC_LAKITU1, 1);
+        }
+        == 3 {
+            NpcFacePlayer(NPC_LAKITU2, 1);
+        }
+    }
+});
+
+Script N(80244ED0) = SCRIPT({
+    match SI_MAP_VAR(10) {
+        == 0 {
+            SpeakToPlayer(NPC_MAGIKOOPA, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 16, MESSAGE_ID(0x11, 0x00B9));
+            InterpNpcYaw(NPC_MAGIKOOPA, 90, 0);
+        }
+        == 1 {
+            SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00BF));
+            InterpNpcYaw(NPC_LAKITU0, 90, 0);
+        }
+        == 2 {
+            SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00BF));
+            InterpNpcYaw(NPC_LAKITU1, 270, 0);
+        }
+        == 3 {
+            SpeakToPlayer(NPC_LAKITU2, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00BF));
+            InterpNpcYaw(NPC_LAKITU2, 270, 0);
+        }
+    }
+});
+
+Script N(80245004) = SCRIPT({
+    match SI_MAP_VAR(10) {
+        == 0 {
+            SpeakToPlayer(NPC_MAGIKOOPA, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 16, MESSAGE_ID(0x11, 0x00BA));
+        }
+        == 1 {
+            SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00C0));
+        }
+        == 2 {
+            SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00C0));
+        }
+        == 3 {
+            SpeakToPlayer(NPC_LAKITU2, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00C0));
+        }
+    }
+    SetNpcVar(3, 0, 1);
+    sleep 5;
+    spawn N(802445D4);
+});
+
+Script N(80245108) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+        return;
+    }
+    DisablePlayerInput(TRUE);
+    func_802D2C14(1);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
+    AdjustCam(0, 8.0, 0, 300, 17.0, -6.0);
+    await N(80244E2C);
+    match SI_AREA_VAR(7) {
+        == 0 {
+            await N(80244ED0);
+            SI_AREA_VAR(7) += 1;
+            ResetCam(0, 4.0);
+        }
+        == 1 {
+            await N(80245004);
+        }
+    }
+    func_802D2C14(0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80245228) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 0;
+        await N(80245108);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Script N(8024527C) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 1;
+        await N(80245108);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Script N(802452D0) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 2;
+        await N(80245108);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Script N(80245324) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 3;
+        await N(80245108);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Script N(80245378) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+        return;
+    }
+    DisablePlayerInput(TRUE);
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamSpeed(0, 8.0);
+    SetCamPitch(0, 17.0, -6.0);
+    SetCamDistance(0, 300);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    await N(80244E2C);
+    if (SI_AREA_VAR(7) == 0) {
+        await N(80244ED0);
+        SI_AREA_VAR(7) += 1;
+        ResetCam(0, 4.0);
+    } else {
+        await N(80245004);
+    }
+    DisablePlayerInput(FALSE);
+});
+
+Script N(802454D4) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 0;
+        GetNpcPos(NPC_MAGIKOOPA, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        await N(80245378);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Script N(80245544) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 1;
+        GetNpcPos(NPC_LAKITU0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        await N(80245378);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Script N(802455B4) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 2;
+        GetNpcPos(NPC_LAKITU1, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        await N(80245378);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Script N(80245624) = SCRIPT({
+    if (SI_MAP_VAR(10) == -1) {
+        SI_MAP_VAR(10) = 3;
+        GetNpcPos(NPC_LAKITU2, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        await N(80245378);
+        SI_MAP_VAR(10) = -1;
+    }
+});
+
+Vec4f N(triggerCoord_80245694) = { 5.0f, 0.0f, -10.0, 0.0f };
+
+Vec4f N(triggerCoord_802456A4) = { -5.0f, 0.0f, -20.0f, 0.0f };
+
+Vec4f N(triggerCoord_802456B4) = { 50.0f, 0.0f, -10.0, 0.0f };
+
+Vec4f N(triggerCoord_802456C4) = { 105.0f, 0.0f, -10.0, 0.0f };
+
+Script N(802456D4) = SCRIPT({
+    SI_MAP_VAR(10) = -1;
+    bind N(80245228) to TRIGGER_WALL_HAMMER 23;
+    bind N(80245228) to TRIGGER_WALL_HAMMER 19;
+    bind N(802454D4) to TRIGGER_POINT_BOMB N(triggerCoord_802456A4);
+    bind N(80245544) to TRIGGER_POINT_BOMB N(triggerCoord_80245694);
+    bind N(802452D0) to TRIGGER_WALL_HAMMER 22;
+    bind N(802455B4) to TRIGGER_POINT_BOMB N(triggerCoord_802456B4);
+    bind N(80245324) to TRIGGER_WALL_HAMMER 18;
+    bind N(80245624) to TRIGGER_POINT_BOMB N(triggerCoord_802456C4);
+});
+
+Script N(interact_802457D4) = SCRIPT({
+    match SI_AREA_VAR(6) {
+        == 0 {
+            GetSelfNpcID(SI_VAR(0));
+            if (SI_VAR(0) == 3) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 5, MESSAGE_ID(0x11, 0x00B6));
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00BC));
+            }
+            SI_AREA_VAR(6) += 1;
+        }
+        == 1 {
+            GetSelfNpcID(SI_VAR(0));
+            if (SI_VAR(0) == 3) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 5, MESSAGE_ID(0x11, 0x00B7));
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00BD));
+            }
+            SI_AREA_VAR(6) += 1;
+        }
+        == 2 {
+            AdjustCam(0, 8.0, 0, 300, 19.0, -9.0);
+            GetSelfNpcID(SI_VAR(0));
+            if (SI_VAR(0) == 3) {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 5, MESSAGE_ID(0x11, 0x00B8));
+                NpcFacePlayer(NPC_SELF, 0);
+                sleep 15;
+                EndSpeech(-1, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 0);
+            } else {
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00BE));
+                NpcFacePlayer(NPC_SELF, 0);
+                sleep 15;
+                EndSpeech(-1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0);
+            }
+            SetNpcVar(3, 0, 1);
+            sleep 5;
+            spawn N(802445D4);
+            BindNpcInteract(NPC_LAKITU0, 0);
+            BindNpcInteract(NPC_LAKITU1, 0);
+            BindNpcInteract(NPC_LAKITU2, 0);
+            BindNpcInteract(NPC_MAGIKOOPA, 0);
+        }
+    }
+});
+
+Script N(init_80245AA8) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+        BindNpcIdle(NPC_SELF, N(idle_80244B3C));
+        BindNpcInteract(NPC_SELF, N(interact_802457D4));
+        BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(init_80245B30) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+        BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(init_80245B90) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+        BindNpcInteract(NPC_SELF, N(interact_802457D4));
+        BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(init_80245C04) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+        BindNpcInteract(NPC_SELF, N(interact_802457D4));
+        BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(init_80245C78) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_PUFF_PUFF_GUARDS) {
+        BindNpcInteract(NPC_SELF, N(interact_802457D4));
+        BindNpcDefeat(NPC_SELF, N(defeat_80244C84));
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+StaticNpc N(npcGroup_80245CEC)[] = {
+    {
+        .id = NPC_LAKITU0,
+        .settings = &N(npcSettings_80243F10),
+        .pos = { 0.0f, 15.0f, 60.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000,
+        .init = &N(init_80245B90),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .itemDropChance = 25,
+        .itemDrops = {
+                { ITEM_SUPER_SHROOM, 2, 0 },
+                { ITEM_MAPLE_SYRUP, 2, 0 },
+                { ITEM_THUNDER_RAGE, 2, 0 },
+                { ITEM_STOP_WATCH, 2, 0 },
+        },
+        .heartDrops = STANDARD_HEART_DROPS(2),
+        .flowerDrops = STANDARD_FLOWER_DROPS(3),
+        .maxCoinBonus = 2,
+        .animations = {
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_2),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E4),
+    },
+    {
+        .id = NPC_LAKITU1,
+        .settings = &N(npcSettings_80243F10),
+        .pos = { 65.0f, 15.0f, 60.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000,
+        .init = &N(init_80245C04),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .itemDropChance = 25,
+        .itemDrops = {
+                { ITEM_SUPER_SHROOM, 2, 0 },
+                { ITEM_MAPLE_SYRUP, 2, 0 },
+                { ITEM_THUNDER_RAGE, 2, 0 },
+                { ITEM_STOP_WATCH, 2, 0 },
+        },
+        .heartDrops = STANDARD_HEART_DROPS(2),
+        .flowerDrops = STANDARD_FLOWER_DROPS(3),
+        .maxCoinBonus = 2,
+        .animations = {
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_2),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E4),
+    },
+    {
+        .id = NPC_LAKITU2,
+        .settings = &N(npcSettings_80243F10),
+        .pos = { 135.0f, 15.0f, 35.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000,
+        .init = &N(init_80245C78),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .itemDropChance = 25,
+        .itemDrops = {
+                { ITEM_SUPER_SHROOM, 2, 0 },
+                { ITEM_MAPLE_SYRUP, 2, 0 },
+                { ITEM_THUNDER_RAGE, 2, 0 },
+                { ITEM_STOP_WATCH, 2, 0 },
+        },
+        .heartDrops = STANDARD_HEART_DROPS(2),
+        .flowerDrops = STANDARD_FLOWER_DROPS(3),
+        .maxCoinBonus = 2,
+        .animations = {
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_2),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_4),
+            NPC_ANIM(lakitu, Palette_00, Anim_3),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+            NPC_ANIM(lakitu, Palette_00, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E4),
+    },
+    {
+        .id = NPC_MAGIKOOPA,
+        .settings = &N(npcSettings_80243F3C),
+        .pos = { -60.0f, 0.0f, 50.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000,
+        .init = &N(init_80245AA8),
+        .yaw = 90,
+        .dropFlags = 0x80,
+        .itemDropChance = 25,
+        .itemDrops = {
+                { ITEM_SUPER_SHROOM, 2, 0 },
+                { ITEM_MAPLE_SYRUP, 2, 0 },
+                { ITEM_THUNDER_RAGE, 2, 0 },
+                { ITEM_STOP_WATCH, 2, 0 },
+        },
+        .heartDrops = STANDARD_HEART_DROPS(2),
+        .flowerDrops = STANDARD_FLOWER_DROPS(3),
+        .maxCoinBonus = 2,
+        .animations = {
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_4),
+            NPC_ANIM(magikoopa, Palette_02, Anim_4),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(magikoopa, Palette_02, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E4),
+    },
+    {
+        .id = NPC_FLYING_MAGIKOOPA,
+        .settings = &N(npcSettings_80243F3C),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000,
+        .init = &N(init_80245B30),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .itemDropChance = 25,
+        .itemDrops = {
+                { ITEM_SUPER_SHROOM, 2, 0 },
+                { ITEM_MAPLE_SYRUP, 2, 0 },
+                { ITEM_THUNDER_RAGE, 2, 0 },
+                { ITEM_STOP_WATCH, 2, 0 },
+        },
+        .heartDrops = STANDARD_HEART_DROPS(2),
+        .flowerDrops = STANDARD_FLOWER_DROPS(3),
+        .maxCoinBonus = 2,
+        .animations = {
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_4),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_4),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+            NPC_ANIM(flying_magikoopa, Palette_02, Anim_1),
+        },
+        .tattle = MESSAGE_ID(0x1A, 0x00E4),
+    },
+};
+
+NpcGroupList N(npcGroupList_8024669C) = {
+    NPC_GROUP(N(npcGroup_80245CEC), BATTLE_ID(24, 11, 0, 7)),
+    {},
+};
+
+static s32 N(pad_66B4)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
 
 #include "world/common/UnkTexturePanFunc.inc.c"
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_8024030C_CDC9AC);
+void func_80072950();
 
-INCLUDE_ASM(s32, "world/area_flo/flo_18/CDC6A0", func_80240340_CDC9E0);
+ApiStatus N(func_8024030C_CDC9AC)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
+
+typedef struct N(unk_effect) {
+    char unk_00[0x30];
+    s32 unk_30;
+    s32 unk_34;
+    s32 unk_38;
+    char unk_3C[0x4];
+    s32 unk_40;
+    s32 unk_44;
+    s32 unk_48;
+} N(unk_effect);
+
+typedef struct N(temp) {
+    char unk_00[0xC];
+    N(unk_effect)* unk_0C;
+} N(temp);
+
+ApiStatus N(func_80240340_CDC9E0)(ScriptInstance *script, s32 isInitialCall) {
+    N(temp)* ptr = script->varTable[15];
+
+    ptr->unk_0C->unk_30 = 69;
+    ptr->unk_0C->unk_34 = 255;
+    ptr->unk_0C->unk_38 = 217;
+    ptr->unk_0C->unk_40 = 176;
+    ptr->unk_0C->unk_44 = 254;
+    ptr->unk_0C->unk_48 = 124;
+    return ApiStatus_DONE2;
+}
 
 #include "common/UnkFloatFunc.inc.c"
diff --git a/src/world/area_flo/flo_18/CDCBD0.c b/src/world/area_flo/flo_18/CDCBD0.c
index 2dd882c21a..d8cf1d4275 100644
--- a/src/world/area_flo/flo_18/CDCBD0.c
+++ b/src/world/area_flo/flo_18/CDCBD0.c
@@ -1,3 +1,3 @@
 #include "flo_18.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_18/CDCBD0", func_80240530_CDCBD0);
+#include "world/common/UnkFunc42.inc.c"
diff --git a/src/world/area_flo/flo_18/CDCC30.c b/src/world/area_flo/flo_18/CDCC30.c
index 80a6a43b14..cead567a7a 100644
--- a/src/world/area_flo/flo_18/CDCC30.c
+++ b/src/world/area_flo/flo_18/CDCC30.c
@@ -2,3 +2,6 @@
 
 #include "world/common/foliage.inc.c"
 
+Script N(80247024) = SCRIPT({
+
+});
diff --git a/src/world/area_flo/flo_18/flo_18.h b/src/world/area_flo/flo_18/flo_18.h
index ca4244d0a7..e508fc7f19 100644
--- a/src/world/area_flo/flo_18/flo_18.h
+++ b/src/world/area_flo/flo_18/flo_18.h
@@ -2,3 +2,18 @@
 #include "map.h"
 
 #define NAMESPACE flo_18
+
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFloatFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024030C_CDC9AC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240340_CDC9E0)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_8024669C);
+extern Script N(802436BC);
+extern Script N(80244058);
+extern Script N(802456D4);
+extern Script N(80247024);
+extern Script N(main);
+extern Script N(unkFloatFunc);
diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c
index c900d35a8f..687eacd187 100644
--- a/src/world/area_flo/flo_19/CE36F0.c
+++ b/src/world/area_flo/flo_19/CE36F0.c
@@ -1,13 +1,658 @@
 #include "flo_19.h"
+#include "message_ids.h"
+
+EntryList N(entryList) = {
+    {   0.0f,    0.0f, 100.0f,  90.0f },
+    { 460.0f,    0.0f,   0.0f, 270.0f },
+    {   0.0f, -500.0f,   0.0f,   0.0f },
+    {   0.0f,    0.0f,   0.0f,   0.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_19_tattle },
+};
+
+// *INDENT-OFF*
+Script N(802409C0) = {
+    SI_CMD(ScriptOpcode_CALL, GetEntryID, SI_VAR(0)),
+    SI_CMD(ScriptOpcode_MATCH, SI_VAR(0)),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 0),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 1),
+            SI_CMD(ScriptOpcode_CALL, SetMusicTrack, 0, 50, 0, 8),
+        SI_CMD(ScriptOpcode_END_CASE_MULTI),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 2),
+        SI_CMD(ScriptOpcode_CASE_MULTI_OR_EQ, 7),
+        SI_CMD(ScriptOpcode_END_CASE_MULTI),
+        SI_CMD(ScriptOpcode_CASE_EQ, 3),
+            SI_CMD(ScriptOpcode_IF_NE, SI_AREA_FLAG(44), 0),
+            SI_CMD(ScriptOpcode_ELSE),
+                SI_CMD(ScriptOpcode_CALL, FadeOutMusic, 1, 3000),
+                SI_CMD(ScriptOpcode_CALL, FadeInMusic, 0, 50, 0, 3000, 0, 127),
+            SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_END_CASE_MULTI),
+    SI_CMD(ScriptOpcode_END_MATCH),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+static s32 N(pad_ABC) = {
+    0x00000000,
+};
+
+Script N(80240AC0) = SCRIPT({
+    MakeItemEntity(ITEM_S_JUMP_CHG, -200, 160, -213, 17, SI_SAVE_FLAG(1391));
+});
+
+static s32 N(pad_AF4)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(updateTexturePan_80240B00) = SCRIPT({
+    group 0;
+    if (SI_VAR(5) == 1) {
+        if (SI_VAR(6) == 1) {
+            if (SI_VAR(7) == 1) {
+                if (SI_VAR(8) == 1) {
+                    N(UnkTexturePanFunc)();
+                    return;
+                }
+            }
+        }
+    }
+    N(UnkTexturePanFunc2)();
+});
+
+Script N(exitWalk_80240B9C) = EXIT_WALK_SCRIPT(60,  1, "flo_21",  0);
+
+Script N(80240BF8) = SCRIPT({
+    bind N(exitWalk_80240B9C) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_CLOUDY_CLIMB;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    SI_SAVE_FLAG(1985) = 1;
+    await N(80240AC0);
+    ParentColliderToModel(12, 86);
+    HidePlayerShadow(TRUE);
+    spawn N(80242FD0);
+    spawn N(80241780);
+    ModifyColliderFlags(3, 5, 0x00000007);
+    EnableTexPanning(17, 1);
+    EnableTexPanning(18, 1);
+    spawn {
+        SI_VAR(0) = 1;
+        SI_VAR(1) = -120;
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80240B00);
+    }
+    spawn {
+        SI_VAR(0) = 2;
+        SI_VAR(1) = -90;
+        SI_VAR(2) = 0;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 0;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_80240B00);
+    }
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) != 3) {
+        SI_AREA_FLAG(44) = 0;
+    }
+    match SI_VAR(0) {
+        == 0 {
+            spawn N(80240BF8);
+        }
+        == 1 {
+            ModifyColliderFlags(0, 1, 0x7FFFFE00);
+            SI_VAR(0) = N(80240BF8);
+            spawn EnterWalk;
+        }
+        == 2 {
+            spawn N(80242A2C);
+            spawn N(80240BF8);
+        }
+        == 3 {
+            spawn N(80241CC4);
+            spawn N(80240BF8);
+        }
+    }
+    await N(802409C0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_8024030C_CE39FC)();
+    }
+});
+
+static s32 N(pad_1044)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80241050) = SCRIPT({
+    group 239;
+    SI_VAR(15) = 0;
+0:
+    SI_VAR(0) = -215.4375;
+    SI_VAR(1) = 128.59375;
+    SI_VAR(2) = -200.0;
+    SI_VAR(1) += (float) SI_MAP_VAR(12);
+    TranslateGroup(28, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) = -79.859375;
+    N(func_80240340_CE3A30)(SI_VAR(15), SI_VAR(1), 5.0, 136.765625, 300, 0, 0);
+    SI_VAR(2) = -200.0;
+    SI_VAR(1) += (float) SI_MAP_VAR(13);
+    TranslateGroup(32, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) = -364.265625;
+    N(func_80240340_CE3A30)(SI_VAR(15), SI_VAR(1), 5.0, 106.765625, 300, 0, 0);
+    SI_VAR(2) = 10.0;
+    SI_VAR(1) += (float) SI_MAP_VAR(14);
+    TranslateGroup(36, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) = 295.734375;
+    N(func_80240340_CE3A30)(SI_VAR(15), SI_VAR(1), 65.0, 86.984375, 200, 0, 0);
+    SI_VAR(2) = -80.0;
+    SI_VAR(1) += (float) SI_MAP_VAR(15);
+    TranslateGroup(40, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    N(func_80240340_CE3A30)(SI_VAR(15), SI_VAR(2), 0.96875, 1.03125, 15, 0, 0);
+    N(func_80240340_CE3A30)(SI_VAR(15), SI_VAR(3), 1.03125, 0.96875, 15, 0, 0);
+    SI_VAR(0) = (float) SI_MAP_VAR(12);
+    SI_VAR(1) = (float) SI_MAP_VAR(12);
+    SI_VAR(0) *= -0.01953125;
+    SI_VAR(1) *= 0.0400390625;
+    SI_VAR(0) += (float) SI_VAR(2);
+    SI_VAR(1) += (float) SI_VAR(3);
+    ScaleGroup(28, SI_VAR(0), SI_VAR(1), 1);
+    SI_VAR(0) = (float) SI_MAP_VAR(13);
+    SI_VAR(1) = (float) SI_MAP_VAR(13);
+    SI_VAR(0) *= -0.01953125;
+    SI_VAR(1) *= 0.0400390625;
+    SI_VAR(0) += (float) SI_VAR(2);
+    SI_VAR(1) += (float) SI_VAR(3);
+    ScaleGroup(32, SI_VAR(0), SI_VAR(1), 1);
+    SI_VAR(0) = (float) SI_MAP_VAR(14);
+    SI_VAR(1) = (float) SI_MAP_VAR(14);
+    SI_VAR(0) *= -0.01953125;
+    SI_VAR(1) *= 0.0400390625;
+    SI_VAR(0) += (float) SI_VAR(2);
+    SI_VAR(1) += (float) SI_VAR(3);
+    ScaleGroup(36, SI_VAR(0), SI_VAR(1), 1);
+    SI_VAR(0) = (float) SI_MAP_VAR(15);
+    SI_VAR(1) = (float) SI_MAP_VAR(15);
+    SI_VAR(0) *= -0.01953125;
+    SI_VAR(1) *= 0.0400390625;
+    SI_VAR(0) += (float) SI_VAR(2);
+    SI_VAR(1) += (float) SI_VAR(3);
+    ScaleGroup(40, SI_VAR(0), SI_VAR(1), 1);
+    UpdateColliderTransform(8);
+    UpdateColliderTransform(9);
+    UpdateColliderTransform(7);
+    UpdateColliderTransform(10);
+    SI_VAR(15) += 1;
+    if (SI_VAR(15) >= 1200) {
+        SI_VAR(15) = 0;
+    }
+    SI_VAR(0) = (float) SI_VAR(10);
+    SI_VAR(1) = (float) SI_VAR(11);
+    SI_VAR(2) = (float) SI_VAR(12);
+    SI_VAR(3) = (float) SI_VAR(13);
+    SI_VAR(0) *= -0.046875;
+    SI_VAR(1) *= -0.09375;
+    SI_VAR(2) *= -0.09375;
+    SI_VAR(3) *= -0.09375;
+    SI_MAP_VAR(12) += (float) SI_VAR(0);
+    SI_MAP_VAR(13) += (float) SI_VAR(1);
+    SI_MAP_VAR(14) += (float) SI_VAR(2);
+    SI_MAP_VAR(15) += (float) SI_VAR(3);
+    SI_MAP_VAR(12) *= 0.84375;
+    SI_MAP_VAR(13) *= 0.84375;
+    SI_MAP_VAR(14) *= 0.84375;
+    SI_MAP_VAR(15) *= 0.84375;
+    SI_VAR(10) += (float) SI_MAP_VAR(12);
+    SI_VAR(11) += (float) SI_MAP_VAR(13);
+    SI_VAR(12) += (float) SI_MAP_VAR(14);
+    SI_VAR(13) += (float) SI_MAP_VAR(15);
+    sleep 1;
+    goto 0;
+});
+
+Script N(80241650) = SCRIPT({
+    spawn {
+        SI_MAP_VAR(12) += -1.5;
+        sleep 1;
+        SI_MAP_VAR(12) += -1.5;
+    }
+});
+
+Script N(8024169C) = SCRIPT({
+    spawn {
+        SI_MAP_VAR(13) += -1.5;
+        sleep 1;
+        SI_MAP_VAR(13) += -1.5;
+    }
+});
+
+Script N(802416E8) = SCRIPT({
+    spawn {
+        SI_MAP_VAR(14) += -1.5;
+        sleep 1;
+        SI_MAP_VAR(14) += -1.5;
+    }
+});
+
+Script N(80241734) = SCRIPT({
+    spawn {
+        SI_MAP_VAR(15) += -1.5;
+        sleep 1;
+        SI_MAP_VAR(15) += -1.5;
+    }
+});
+
+Script N(80241780) = SCRIPT({
+    ParentColliderToModel(8, 28);
+    ParentColliderToModel(9, 32);
+    ParentColliderToModel(7, 36);
+    ParentColliderToModel(10, 40);
+    SetModelFlags(28, 256, 1);
+    SetModelFlags(32, 256, 1);
+    SetModelFlags(36, 256, 1);
+    SetModelFlags(40, 256, 1);
+    spawn N(80241050);
+    bind N(80241650) to TRIGGER_FLOOR_TOUCH 8;
+    bind N(8024169C) to TRIGGER_FLOOR_TOUCH 9;
+    bind N(802416E8) to TRIGGER_FLOOR_TOUCH 7;
+    bind N(80241734) to TRIGGER_FLOOR_TOUCH 10;
+    spawn {
+        SI_VAR(15) = 0;
+    0:
+        N(func_80240340_CE3A30)(SI_VAR(15), SI_VAR(0), 0.96875, 1.03125, 15, 0, 0);
+        N(func_80240340_CE3A30)(SI_VAR(15), SI_VAR(1), 1.03125, 0.96875, 15, 0, 0);
+        ScaleModel(70, SI_VAR(1), SI_VAR(0), 1);
+        ScaleModel(60, SI_VAR(1), SI_VAR(0), 1);
+        ScaleModel(64, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(68, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(66, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(58, SI_VAR(1), SI_VAR(0), 1);
+        ScaleModel(62, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(72, SI_VAR(0), SI_VAR(1), 1);
+        SI_VAR(15) += 1;
+        if (SI_VAR(15) >= 30) {
+            SI_VAR(15) = 0;
+        }
+        sleep 1;
+        goto 0;
+    }
+});
+
+static s32 N(pad_1A68)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(80241A70) = SCRIPT({
+    SI_VAR(0) = 0;
+10:
+    N(func_80240784_CE3E74)();
+    SI_VAR(0) += 25;
+    sleep 1;
+    if (SI_VAR(0) < 255) {
+        goto 10;
+    }
+    SI_VAR(0) = 255;
+    N(func_80240784_CE3E74)();
+    sleep 1;
+});
+
+Script N(80241B10) = SCRIPT({
+    SI_VAR(0) = 255;
+10:
+    N(func_80240784_CE3E74)();
+    SI_VAR(0) -= 25;
+    sleep 1;
+    if (SI_VAR(0) > 0) {
+        goto 10;
+    }
+    SI_VAR(0) = 0;
+    N(func_80240784_CE3E74)();
+    sleep 1;
+});
+
+Script N(80241BB0) = SCRIPT({
+    TranslateGroup(79, 0, SI_VAR(0), 0);
+    TranslateGroup(92, 0, SI_VAR(0), 0);
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) *= -12.0;
+    RotateGroup(79, SI_VAR(1), 0, 1, 0);
+    RotateGroup(92, SI_VAR(1), 0, 1, 0);
+});
+
+Script N(80241C58) = SCRIPT({
+    TranslateGroup(84, 0, SI_VAR(0), 0);
+    SI_VAR(1) = (float) SI_VAR(0);
+    SI_VAR(1) *= -12.0;
+    RotateGroup(84, SI_VAR(1), 0, 1, 0);
+});
+
+Script N(80241CC4) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    SetPlayerActionState(10);
+    DisablePartnerAI(0);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE);
+    ModifyColliderFlags(0, 13, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SetCamType(0, 1, 0);
+    UseSettingsFrom(0, 0, 0, 0);
+    SetPanTarget(0, 0, 0, 0);
+    SetCamDistance(0, 350);
+    SetCamPitch(0, 17.0, 11.0);
+    SetCamPosA(0, 0, 0);
+    SetCamPosB(0, 0, 0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    EnableGroup(2, 0);
+    EnableGroup(13, 0);
+    EnableGroup(24, 0);
+    EnableGroup(41, 0);
+    EnableGroup(48, 0);
+    EnableGroup(57, 0);
+    EnableGroup(74, 0);
+    SI_VAR(9) = (int) 45.0;
+    SI_VAR(10) = (int) 28.0;
+    SI_VAR(11) = (int) 5.0;
+    SI_VAR(12) = (int) 60.0;
+    SI_VAR(13) = (int) 28.0;
+    SI_VAR(14) = (int) 10.0;
+    spawn {
+        sleep 5;
+        SetNpcAnimation(NPC_PARTNER, 0x106);
+        SetPlayerAnimation(ANIM_WALKING);
+        match SI_AREA_FLAG(16) {
+            == 0 {
+                InterpPlayerYaw(90, 0);
+                InterpNpcYaw(NPC_PARTNER, 90, 0);
+            }
+            == 1 {
+                InterpPlayerYaw(270, 0);
+                InterpNpcYaw(NPC_PARTNER, 270, 0);
+            }
+        }
+    }
+    TranslateModel(86, 1.3134765625, 3.0, -0.56640625);
+    UpdateColliderTransform(12);
+    spawn {
+        SI_AREA_FLAG(45) = 0;
+        SetPlayerAnimation(ANIM_WALKING);
+        sleep 200;
+        await N(80241A70);
+        SI_AREA_FLAG(45) = 1;
+        sleep 10;
+        EnableGroup(2, 1);
+        EnableGroup(13, 1);
+        EnableGroup(24, 1);
+        EnableGroup(41, 1);
+        EnableGroup(48, 1);
+        EnableGroup(57, 1);
+        EnableGroup(74, 1);
+        SetCamDistance(0, 450);
+        SetCamPitch(0, 17.0, -6.0);
+        SetCamPosA(0, 0, 0);
+        SetCamPosB(0, 0, 0);
+        SetCamSpeed(0, 90.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+        await N(80241B10);
+        sleep 20;
+        SI_AREA_FLAG(45) = 0;
+    }
+    SI_VAR(15) = 0;
+    loop 344 {
+        SI_VAR(15) += 1;
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), -210, 0, 344, 0, 0);
+        SI_VAR(1) = (float) SI_VAR(0);
+        SI_VAR(1) *= -3.0;
+        TranslateModel(86, 1.3134765625, SI_VAR(0), -0.56640625);
+        RotateModel(86, SI_VAR(1), 0, 1, 0);
+        UpdateColliderTransform(12);
+        SI_VAR(2) = (float) SI_VAR(0);
+        SI_VAR(2) *= -3.0;
+        SI_VAR(3) = (float) SI_VAR(0);
+        N(func_80240540_CE3C30)();
+        N(func_80240660_CE3D50)();
+    11:
+        sleep 1;
+        if (SI_AREA_FLAG(45) == 1) {
+            goto 11;
+        }
+    }
+    ModifyColliderFlags(1, 13, 0x7FFFFE00);
+    ModifyColliderFlags(1, 5, 0x7FFFFE00);
+    EnablePartnerAI();
+    ClearPartnerMoveHistory(-4);
+    SetPlayerJumpscale(1.0);
+    PlayerJump(100, 0, 60, 20);
+    SetPlayerActionState(10);
+    InterpPlayerYaw(90, 0);
+    sleep 5;
+    SI_AREA_FLAG(44) = 0;
+    StopSound(412);
+    await N(802409C0);
+    ResetCam(0, 1.0);
+    DisablePlayerInput(FALSE);
+});
+
+Script N(802423F8) = SCRIPT({
+    if (SI_AREA_FLAG(44) == 0) {
+        DisablePlayerInput(TRUE);
+        func_802D2B6C();
+        sleep 15;
+        DisablePartnerAI(0);
+        SI_AREA_FLAG(44) = 1;
+        ModifyColliderFlags(0, 13, 0x7FFFFE00);
+        ModifyColliderFlags(0, 5, 0x7FFFFE00);
+        SI_VAR(9) = (int) 45.0;
+        SI_VAR(10) = (int) 28.0;
+        SI_VAR(11) = (int) 5.0;
+        SI_VAR(12) = (int) 60.0;
+        SI_VAR(13) = (int) 28.0;
+        SI_VAR(14) = (int) 10.0;
+        PlayerMoveTo(SI_VAR(9), SI_VAR(11), 8);
+        SetNpcJumpscale(NPC_PARTNER, 0.0);
+        NpcJump0(NPC_PARTNER, SI_VAR(12), SI_VAR(13), SI_VAR(14), 5);
+        PlaySound(0x19D);
+        SetMusicTrack(0, SONG_MAGIC_BEANSTALK, 1, 8);
+        SetNpcAnimation(NPC_PARTNER, 0x106);
+        SetPlayerAnimation(ANIM_WALKING);
+        N(func_802404D0_CE3BC0)(SI_VAR(3), SI_VAR(4));
+        match SI_VAR(4) {
+            < 90 {
+                SI_AREA_FLAG(16) = 0;
+                InterpPlayerYaw(90, 0);
+                InterpNpcYaw(NPC_PARTNER, 90, 0);
+            }
+            >= 270 {
+                SI_AREA_FLAG(16) = 1;
+                InterpPlayerYaw(270, 0);
+                InterpNpcYaw(NPC_PARTNER, 270, 0);
+            }
+        }
+        TranslateModel(86, 1.3134765625, 3.0, -0.56640625);
+        UpdateColliderTransform(12);
+        SI_MAP_VAR(10) = 0;
+        spawn {
+            SI_AREA_FLAG(45) = 0;
+            sleep 120;
+            SI_AREA_FLAG(45) = 1;
+            sleep 20;
+            await N(80241A70);
+            sleep 10;
+            EnableGroup(2, 0);
+            EnableGroup(13, 0);
+            EnableGroup(24, 0);
+            EnableGroup(41, 0);
+            EnableGroup(48, 0);
+            EnableGroup(57, 0);
+            EnableGroup(74, 0);
+            SetCamType(0, 1, 0);
+            UseSettingsFrom(0, 0, 0, 0);
+            SetPanTarget(0, 0, 0, 0);
+            SetCamDistance(0, 350);
+            SetCamPitch(0, 17.0, 7.0);
+            SetCamSpeed(0, 90.0);
+            PanToTarget(0, 0, 1);
+            WaitForCam(0, 1.0);
+            SI_AREA_FLAG(45) = 0;
+            await N(80241B10);
+        }
+        spawn {
+            SI_VAR(15) = 0;
+            loop 344 {
+                SI_VAR(15) += 1;
+                N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), 0, -210, 344, 0, 0);
+                SI_VAR(1) = (float) SI_VAR(0);
+                SI_VAR(1) *= -3.0;
+                TranslateModel(86, 1.3134765625, SI_VAR(0), -0.56640625);
+                RotateModel(86, SI_VAR(1), 0, 1, 0);
+                UpdateColliderTransform(12);
+                SI_VAR(2) = (float) SI_VAR(0);
+                SI_VAR(2) *= -3.0;
+                SI_VAR(3) = (float) SI_VAR(0);
+                N(func_80240540_CE3C30)();
+                N(func_80240660_CE3D50)();
+                if (SI_VAR(15) == 300) {
+                    SI_MAP_VAR(10) = 1;
+                }
+            11:
+                sleep 1;
+                if (SI_AREA_FLAG(45) == 1) {
+                    goto 11;
+                }
+            }
+        }
+    10:
+        if (SI_MAP_VAR(10) == 0) {
+            sleep 1;
+            goto 10;
+        }
+        GotoMap("flo_00", 8);
+        sleep 100;
+    }
+});
+
+Script N(80242A2C) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerPhysics(TRUE);
+    SetPlayerActionState(10);
+    SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_GRAVITY)), FALSE);
+    EnableModel(86, 0);
+    EnableGroup(2, 0);
+    EnableGroup(13, 0);
+    EnableGroup(24, 0);
+    EnableGroup(41, 0);
+    EnableGroup(48, 0);
+    EnableGroup(57, 0);
+    EnableGroup(74, 0);
+    SetCamType(0, 1, 0);
+    UseSettingsFrom(0, 0, 0, 0);
+    SetPanTarget(0, 0, 0, 0);
+    SetCamDistance(0, 800);
+    SetCamPitch(0, -20.0, 8.5);
+    SetCamPosA(0, 0, 0);
+    SetCamPosB(0, 0, 0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    SI_VAR(15) = 100;
+    SI_MAP_VAR(11) = SI_VAR(15);
+    SI_AREA_FLAG(40) = 0;
+    loop 400 {
+        if (SI_AREA_FLAG(40) == 0) {
+            if (SI_MAP_VAR(11) > 400) {
+                EnableGroup(85, 0);
+                EnableGroup(92, 0);
+                EnableGroup(2, 1);
+                EnableGroup(13, 1);
+                EnableGroup(24, 1);
+                EnableGroup(41, 1);
+                EnableGroup(48, 1);
+                EnableGroup(57, 1);
+                EnableGroup(74, 1);
+                SetCamDistance(0, 1000);
+                SetCamPitch(0, 45.0, -3.0);
+                SetCamPosA(0, 0, 0);
+                SetCamPosB(0, 0, 0);
+                SetCamSpeed(0, 90.0);
+                PanToTarget(0, 0, 1);
+                SI_VAR(15) = 150;
+                spawn {
+                    sleep 5;
+                    EnableGroup(85, 1);
+                    EnableGroup(92, 1);
+                    EnableModel(86, 0);
+                    sleep 48;
+                    PlayEffect(0xA, 0, 22, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                    sleep 10;
+                    PlayEffect(0xA, 0, 22, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                }
+                SI_AREA_FLAG(40) = 1;
+            }
+        }
+        SI_VAR(15) += 1;
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), -350, 0, 400, 0, 0);
+        SI_MAP_VAR(11) = (float) SI_VAR(15);
+        SI_MAP_VAR(11) *= 1.6005859375;
+        SI_VAR(2) = (float) SI_VAR(0);
+        SI_VAR(2) *= 1.0;
+        SI_VAR(0) = (float) SI_VAR(2);
+        spawn N(80241BB0);
+        SI_VAR(2) = (float) SI_VAR(0);
+        SI_VAR(2) *= 1.0;
+        SI_VAR(0) = (float) SI_VAR(2);
+        spawn N(80241C58);
+        sleep 1;
+    }
+    sleep 15;
+    STORY_PROGRESS = STORY_CH6_GREW_MAGIC_BEANSTALK;
+    GotoMap("flo_00", 7);
+});
+
+Script N(80242FD0) = SCRIPT({
+    bind N(802423F8) to TRIGGER_FLOOR_TOUCH 12;
+});
 
 #include "world/common/UnkTexturePanFunc.inc.c"
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_8024030C_CE39FC);
+void func_80072950();
+
+ApiStatus N(func_8024030C_CE39FC)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
 
 // Identical to UnkFloatFunc except for the presence of the fabsf
-ApiStatus func_80240340_CE3A30(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus N(func_80240340_CE3A30)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 a1 = *args++;
     s32 var0 = get_variable(script, a1);
@@ -29,12 +674,49 @@ ApiStatus func_80240340_CE3A30(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_802404D0_CE3BC0);
+ApiStatus N(func_802404D0_CE3BC0)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = *args++;
+    s32 var2 = *args++;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240540_CE3C30);
+    set_variable(script, var1, gPlayerStatus.spriteFacingAngle);
+    set_variable(script, var2, gPlayerStatus.targetYaw);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240660_CE3D50);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_19/CE36F0", func_80240784_CE3E74);
+ApiStatus N(func_80240540_CE3C30)(ScriptInstance *script, s32 isInitialCall) {
+    f32 temp_f20 = get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(0.0f, 0.0f, script->varTable[9], script->varTable[11]);
+    f32 temp_f22 = clamp_angle(atan2(0.0f, 0.0f, script->varTable[9], script->varTable[11]) - temp_f20);
+
+    temp_f20 = sin_deg(temp_f22);
+    gPlayerStatus.position.x = (dist * temp_f20) + 0.0f;
+    gPlayerStatus.position.y = get_variable(NULL, script->varTable[10]) + get_variable(NULL, script->varTable[3]);
+    temp_f20 = cos_deg(temp_f22);
+    gPlayerStatus.position.z = 0.0f - (dist * temp_f20);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240660_CE3D50)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_by_index(0);
+    f32 temp_f20 = get_variable(NULL, script->varTable[2]);
+    f32 dist = dist2D(0.0f, 0.0f, script->varTable[12], script->varTable[14]);
+    f32 clamped = clamp_angle(atan2(0.0f, 0.0f, script->varTable[12], script->varTable[14]) - temp_f20);
+
+    temp_f20 = sin_deg(clamped);
+    npc->pos.x = (dist * temp_f20) + 0.0f;
+    npc->pos.y = get_variable(NULL, script->varTable[13]) + get_variable(NULL, script->varTable[3]);
+    temp_f20 = cos_deg(clamped);
+    npc->pos.z = 0.0f - (dist * temp_f20);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240784_CE3E74)(ScriptInstance *script, s32 isInitialCall) {
+    set_transition_stencil_zoom_1(1, script->varTable[0]);
+    return ApiStatus_DONE2;
+}
 
 #include "common/UnkFloatFunc.inc.c"
diff --git a/src/world/area_flo/flo_19/flo_19.h b/src/world/area_flo/flo_19/flo_19.h
index 78d5d4a3a0..2efb7a6c74 100644
--- a/src/world/area_flo/flo_19/flo_19.h
+++ b/src/world/area_flo/flo_19/flo_19.h
@@ -2,3 +2,19 @@
 #include "map.h"
 
 #define NAMESPACE flo_19
+
+ApiStatus N(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFloatFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024030C_CE39FC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240340_CE3A30)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802404D0_CE3BC0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240540_CE3C30)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240660_CE3D50)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240784_CE3E74)(ScriptInstance* script, s32 isInitialCall);
+
+extern Script N(80241780);
+extern Script N(80241CC4);
+extern Script N(80242A2C);
+extern Script N(80242FD0);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c
index 1a0f7c6655..367968b325 100644
--- a/src/world/area_flo/flo_21/CE6700.c
+++ b/src/world/area_flo/flo_21/CE6700.c
@@ -1,22 +1,117 @@
 #include "flo_21.h"
+#include "message_ids.h"
+#include "sprite/npc/huff_n_puff.h"
+#include "sprite/npc/tuff_puff.h"
+
+typedef struct {
+    char unk_00[0x4];
+    f32 unk_04;
+    f32 unk_08;
+    f32 unk_0C;
+    f32 unk_10;
+    char unk_14[0x4];
+    s32 unk_18;
+    s32 unk_1C;
+    s32 unk_20;
+    X32 unk_24;
+    s32 unk_28;
+    s32 unk_2C;
+    s32 unk_30;
+    u8 unk_34;
+    s32 unk_38;
+    char unk_3C[0xC];
+    EffectUnkStruct1* unk_48;
+    char unk_4C[0x24];
+    s32 unk_70;
+    s32 unk_74;
+} N(EffectStruct);
+
+struct N(temp) {
+    char unk_00[0xC];
+    N(EffectStruct)* unk_0C;
+} N(temp);
+
+typedef struct {
+    /* 0x00 */ f32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ f32 unk_14;
+    /* 0x18 */ f32 unk_18;
+    /* 0x1C */ f32 unk_1C;
+    /* 0x20 */ f32 unk_20;
+    /* 0x24 */ f32 unk_24;
+    /* 0x28 */ f32 unk_28;
+    /* 0x2C */ f32 unk_2C;
+    /* 0x30 */ f32 unk_30;
+    /* 0x34 */ f32 unk_34;
+    /* 0x38 */ s32 unk_38;
+    /* 0x3C */ s32 unk_3C;
+    /* 0x40 */ Shadow* unk_40;
+    /* 0x44 */ s16 unk_44;
+    /* 0x46 */ s16 unk_46;
+    /* 0x48 */ s16 unk_48;
+    /* 0x4A */ s16 unk_4A;
+    /* 0x4C */ s16 unk_4C;
+    /* 0x4E */ s16 unk_4E;
+    /* 0x50 */ struct N(temp)* unk_50;
+    /* 0x54 */ struct N(temp)* unk_54;
+} N(Unk_effect_struct); // size = 0x58
+
+enum {
+    NPC_HUFF_N_PUFF0,
+    NPC_HUFF_N_PUFF1,
+    NPC_HUFF_N_PUFF2,
+    NPC_TUFF_PUFF0,
+    NPC_TUFF_PUFF1,
+    NPC_TUFF_PUFF2,
+    NPC_TUFF_PUFF3,
+    NPC_TUFF_PUFF4,
+    NPC_TUFF_PUFF5,
+    NPC_TUFF_PUFF6,
+    NPC_TUFF_PUFF7,
+    NPC_TUFF_PUFF8,
+    NPC_TUFF_PUFF9,
+    NPC_TUFF_PUFF10,
+    NPC_TUFF_PUFF11,
+    NPC_TUFF_PUFF12,
+    NPC_TUFF_PUFF13,
+    NPC_TUFF_PUFF14,
+};
+
+EntryList N(entryList) = {
+    { -800.0f, -46.0f, 0.0f, 90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_21_tattle },
+};
+
+Script N(80240D40) = SCRIPT({
+    if (STORY_PROGRESS == STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+        FadeOutMusic(0, 500);
+    } else {
+        SetMusicTrack(0, SONG_CLOUDY_CLIMB, 0, 8);
+    }
+});
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240000_CE6700);
-/*
 ApiStatus N(func_80240000_CE6700)(ScriptInstance* script, s32 isInitialCall) {
-    arn_07_struct* ptr = script->varTable[0];
+    N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0];
 
     sfx_adjust_env_sound_pos(0xA2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08);
     return ((ptr->unk_44 < 2) == 0) * ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_8024004C_CE674C);
-/*
 ApiStatus N(func_8024004C_CE674C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct));
+        N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)heap_malloc(sizeof(N(Unk_effect_struct)));
         script->varTable[0] = ptr;
         set_variable(NULL, SI_MAP_VAR(1), ptr);
         ptr->unk_38 = get_variable(script, *args++);
@@ -39,27 +134,118 @@ ApiStatus N(func_8024004C_CE674C)(ScriptInstance* script, s32 isInitialCall) {
 
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_802401AC_CE68AC);
+ApiStatus N(func_802401AC_CE68AC)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0];
+
+    switch (ptr->unk_44) {
+        case 0:
+            ptr->unk_04 = update_lerp(5, ptr->unk_10, ptr->unk_1C, ptr->unk_46, ptr->unk_3C);
+            ptr->unk_00 = update_lerp(0, ptr->unk_0C, ptr->unk_18, ptr->unk_46, ptr->unk_3C);
+            ptr->unk_08 = update_lerp(0, ptr->unk_14, ptr->unk_20, ptr->unk_46, ptr->unk_3C);
+            ptr->unk_50->unk_0C->unk_08 = ptr->unk_00;
+            ptr->unk_50->unk_0C->unk_0C = ptr->unk_04;
+            ptr->unk_50->unk_0C->unk_10 = ptr->unk_08;
+            ptr->unk_46++;
+            if (ptr->unk_46 >= ptr->unk_3C) {
+                ptr->unk_44 = 1;
+                ptr->unk_46 = 0;
+            }
+            break;
+
+        case 1:
+            ptr->unk_46++;
+            if (ptr->unk_46 >= 60) {
+                ptr->unk_44 = 2;
+                ptr->unk_46 = 0;
+                ptr->unk_50->unk_0C->unk_70 = 1;
+                ptr->unk_50->unk_0C->unk_74 = 0;
+            }
+            break;
+
+        case 2:
+            ptr->unk_46++;
+            if (ptr->unk_46 >= 60) {
+                ptr->unk_54 = func_800726B0(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0);
+                *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38;
+                ptr->unk_54->unk_0C->unk_20 = 0;
+                ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20);
+                ptr->unk_44 = 3;
+                ptr->unk_46 = 0;
+                ptr->unk_2C = 0.0f;
+                ptr->unk_48 = 1;
+                ptr->unk_30 = 36.0f;
+            }
+            break;
+
+        case 3:
+            ptr->unk_30 = update_lerp(0, 36.0f, 19.0f, ptr->unk_46, 120);
+            ptr->unk_46++;
+            if (ptr->unk_46 >= 120) {
+                ptr->unk_4C = 0;
+                ptr->unk_4A = 1;
+                ptr->unk_48 = 2;
+                ptr->unk_4E = 1;
+                ptr->unk_44 = 4;
+                ptr->unk_46 = 0;
+                ptr->unk_34 = ptr->unk_2C;
+            }
+            break;
+
+        case 4:
+            break;
+    }
+
+    switch (ptr->unk_4A) {
+        case 1:
+            ptr->unk_2C = update_lerp(4, ptr->unk_34, 1440.0f, ptr->unk_4C, 120);
+            ptr->unk_04 = update_lerp(0xA, ptr->unk_1C, ptr->unk_24, ptr->unk_4C, 120);
+            ptr->unk_4C++;
+            if (ptr->unk_4C >= 120) {
+                ptr->unk_4C = 0x10E;
+                ptr->unk_4A = 2;
+                ptr->unk_4E = 2;
+            }
+            break;
+
+        case 2:
+            ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f));
+            ptr->unk_4C = clamp_angle(ptr->unk_4C + 8);
+            if (!(dist3D(playerStatus->position.x, playerStatus->position.y + 20.0f, playerStatus->position.z,
+                       ptr->unk_00, ptr->unk_04, ptr->unk_08) > 30.0f)) {
+                ptr->unk_4E = 3;
+            }
+            break;
+    }
+
+    switch (ptr->unk_48) {
+        case 1:
+            ptr->unk_2C = clamp_angle(ptr->unk_2C + ptr->unk_30);
+
+        case 2:
+            ptr->unk_54->unk_0C->unk_24.f = ptr->unk_2C;
+            ptr->unk_54->unk_0C->unk_04 = ptr->unk_18;
+            ptr->unk_54->unk_0C->unk_08 = ptr->unk_04;
+            ptr->unk_54->unk_0C->unk_0C = ptr->unk_20;
+            break;
+    }
+
+    return ApiStatus_BLOCK;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_802405BC_CE6CBC);
-/*
 ApiStatus N(func_802405BC_CE6CBC)(ScriptInstance* script, s32 isInitialCall) {
     s32 var = get_variable(script, *script->ptrReadPos);
-    arn_07_struct* ptr = script->varTable[0];
+    N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0];
 
     return (ptr->unk_4E == var) * ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_802405FC_CE6CFC);
-/*
 ApiStatus N(func_802405FC_CE6CFC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct));
+        N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)heap_malloc(sizeof(N(Unk_effect_struct)));
         script->varTable[0] = ptr;
         ptr->unk_38 = get_variable(script, *args++);
         ptr->unk_18 = get_float_variable(script, *args++);
@@ -75,17 +261,14 @@ ApiStatus N(func_802405FC_CE6CFC)(ScriptInstance* script, s32 isInitialCall) {
 
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240708_CE6E08);
-/*
 ApiStatus N(func_80240708_CE6E08)(ScriptInstance* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
-    arn_07_struct* ptr = script->varTable[0];
+    N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0];
 
     ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f));
     ptr->unk_4C = clamp_angle(ptr->unk_4C + 8);
-    if (dist2D(playerStatus->position.x, playerStatus->position.z, 
+    if (dist2D(playerStatus->position.x, playerStatus->position.z,
                ptr->unk_18, ptr->unk_20) <= 30.0f) {
         ptr->unk_4E = 3;
     }
@@ -95,10 +278,1315 @@ ApiStatus N(func_80240708_CE6E08)(ScriptInstance* script, s32 isInitialCall) {
 
     return ApiStatus_BLOCK;
 }
-*/
+
+Script N(80240DA0) = SCRIPT({
+    group 0;
+    if (SI_VAR(5) == 1) {
+        if (SI_VAR(6) == 1) {
+            if (SI_VAR(7) == 1) {
+                if (SI_VAR(8) == 1) {
+                    N(UnkTexturePanFunc)();
+                    return;
+                }
+            }
+        }
+    }
+    N(UnkTexturePanFunc2)();
+});
+
+Script N(80240E3C) = SCRIPT({
+    match STORY_PROGRESS {
+        == STORY_CH6_GREW_MAGIC_BEANSTALK {
+            SI_VAR(0) = 0;
+            if (SI_MAP_VAR(10) == 0) {
+                return;
+            }
+            STORY_PROGRESS = STORY_CH6_DEFEATED_HUFF_N_PUFF;
+        }
+        == STORY_CH6_DEFEATED_HUFF_N_PUFF {
+            SI_VAR(0) = 1;
+        }
+        else {
+            return;
+        }
+    }
+    if (SI_VAR(0) == 0) {
+        DisablePlayerInput(TRUE);
+        UseSettingsFrom(0, 650, 205, 0);
+        SetCamSpeed(0, 0.6005859375);
+        SetPanTarget(0, 650, 150, 0);
+        GetCamDistance(0, SI_VAR(1));
+        SI_VAR(1) -= 100;
+        SetCamDistance(0, SI_VAR(1));
+        if (-5.5 != 10000) {
+            GetCamPitch(0, SI_VAR(2), SI_VAR(3));
+            SetCamPitch(0, SI_VAR(2), -5.5);
+        }
+        PanToTarget(0, 0, 1);
+        N(func_8024004C_CE674C)(5, 180, 650, 170, 0, 650, 205, 0, 150, 120);
+        spawn {
+            N(func_802401AC_CE68AC)();
+        }
+        spawn {
+            sleep 1;
+            PlaySound(0x80000067);
+            N(func_80240000_CE6700)();
+            StopSound(0x80000067);
+            PlaySoundAt(0xB2, 0, 650, 205, 0);
+        }
+        spawn {
+            sleep 45;
+            SetPlayerAnimation(0x1002A);
+        }
+        spawn {
+            sleep 180;
+            sleep 115;
+            PlaySoundAt(0x137, 0, 650, 205, 0);
+        }
+        N(func_802405BC_CE6CBC)(1);
+        spawn {
+            sleep 80;
+            SetPlayerAnimation(ANIM_10002);
+        }
+        SI_VAR(1) += 100;
+        SetCamDistance(0, SI_VAR(1));
+        SetPanTarget(0, 650, 120, 0);
+        N(func_802405BC_CE6CBC)(2);
+        GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        UseSettingsFrom(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        SetCamSpeed(0, 1.0);
+        SetPanTarget(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        WaitForCam(0, 1.0);
+        PanToTarget(0, 0, 0);
+        DisablePlayerInput(FALSE);
+    } else {
+        N(func_802405FC_CE6CFC)(5, 650, 150, 0, 120);
+        spawn {
+            N(func_80240708_CE6E08)();
+        }
+        sleep 1;
+    }
+    N(func_802405BC_CE6CBC)(3);
+    PlaySoundAtPlayer(312, 0);
+    DisablePlayerInput(TRUE);
+    STORY_PROGRESS = STORY_CH6_STAR_SPIRIT_RESCUED;
+    GotoMapSpecial("kmr_23", 5, 14);
+    sleep 100;
+});
+
+Script N(exitWalk_802412F4) = EXIT_WALK_SCRIPT(60,  0, "flo_19",  1);
+
+Script N(80241350) = SCRIPT({
+    bind N(exitWalk_802412F4) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_CLOUDY_CLIMB;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80245AEC));
+    spawn N(80241B98);
+    HidePlayerShadow(TRUE);
+    spawn N(80241600);
+    ModifyColliderFlags(3, 5, 0x00000007);
+    ModifyColliderFlags(3, 7, 0x00000007);
+    GetEntryID(SI_VAR(0));
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    SI_VAR(0) = N(80241350);
+    spawn EnterWalk;
+    await N(80240D40);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240B00_CE7200)();
+    }
+    spawn N(80240E3C);
+});
+
+s32 N(D_802414FC_CE7BFC)[] = {
+    0,
+    SI_FIXED(1), SI_FIXED(1), SI_FIXED(1),
+    SI_FIXED(1), SI_FIXED(1), SI_FIXED(1),
+    SI_FIXED(1.1005859375), SI_FIXED(1.1005859375), SI_FIXED(1.1005859375),
+    SI_FIXED(1.1005859375), SI_FIXED(1.1005859375), SI_FIXED(1.1005859375),
+    SI_FIXED(1), SI_FIXED(1), SI_FIXED(1),
+    SI_FIXED(1), SI_FIXED(1), SI_FIXED(1),
+    SI_FIXED(0.900390625), SI_FIXED(0.900390625), SI_FIXED(0.900390625),
+    SI_FIXED(0.900390625), SI_FIXED(0.900390625), SI_FIXED(0.900390625),
+};
+
+Script N(80241560) = SCRIPT({
+    SI_MAP_VAR(0) += -1.5;
+});
+
+Script N(80241580) = SCRIPT({
+    SI_MAP_VAR(1) += -1.5;
+});
+
+Script N(802415A0) = SCRIPT({
+    SI_MAP_VAR(2) += -1.5;
+});
+
+Script N(802415C0) = SCRIPT({
+    SI_MAP_VAR(3) += -1.5;
+});
+
+Script N(802415E0) = SCRIPT({
+    SI_MAP_VAR(4) += -1.5;
+});
+
+Script N(80241600) = SCRIPT({
+    spawn {
+        SI_VAR(15) = 0;
+    0:
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(0), 0.96875, 1.03125, 15, 0, 0);
+        N(UnkFloatFunc)(SI_VAR(15), SI_VAR(1), 1.03125, 0.96875, 15, 0, 0);
+        ScaleModel(88, SI_VAR(1), SI_VAR(0), 1);
+        ScaleModel(90, SI_VAR(1), SI_VAR(0), 1);
+        ScaleModel(92, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(94, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(96, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(98, SI_VAR(1), SI_VAR(0), 1);
+        ScaleModel(100, SI_VAR(0), SI_VAR(1), 1);
+        ScaleModel(102, SI_VAR(0), SI_VAR(1), 1);
+        SI_VAR(15) += 1;
+        if (SI_VAR(15) >= 30) {
+            SI_VAR(15) = 0;
+        }
+        sleep 1;
+        goto 0;
+    }
+});
+
+static s32 N(pad_17BC) = {
+    0x00000000,
+};
+
+NpcSettings N(npcSettings_802417C0) = {
+    .height = 24,
+    .radius = 28,
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 16,
+};
+
+NpcSettings N(npcSettings_802417EC) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80241818) = {
+    .height = 26,
+    .radius = 24,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80241844) = {
+    .height = 20,
+    .radius = 20,
+    .level = 99,
+};
+
+NpcSettings N(npcSettings_80241870) = {
+    .height = 22,
+    .radius = 24,
+    .level = 99,
+};
+
+Vec3f N(vectorList_8024189C)[] = {
+     { 600.0, 104.0, 0.0 }, { 575.0, 204.0, 0.0 },
+     { 550.0, 104.0, 0.0 },
+};
+
+Script N(802418C0) = SCRIPT({
+0:
+    PlaySound(0x20B6);
+    ShakeCam(0, 0, 15, 1.0);
+    sleep 15;
+    goto 0;
+});
+
+Script N(80241920) = SCRIPT({
+    PlaySoundAtNpc(NPC_HUFF_N_PUFF0, 0x3C0, 0);
+    PlayEffect(0x25, 3, 650, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep 15;
+    SetNpcJumpscale(NPC_HUFF_N_PUFF1, 0.0);
+    NpcJump0(NPC_HUFF_N_PUFF1, 650, 50, 0, 5);
+    SetNpcPos(NPC_HUFF_N_PUFF0, 650, 50, 5);
+    SetNpcPos(NPC_HUFF_N_PUFF1, 650, 50, 0);
+    SetNpcPos(NPC_HUFF_N_PUFF2, 650, 50, 0);
+    SetNpcJumpscale(NPC_HUFF_N_PUFF0, 0.0);
+    SetNpcJumpscale(NPC_HUFF_N_PUFF1, 0.0);
+    SetNpcJumpscale(NPC_HUFF_N_PUFF2, 0.0);
+    spawn {
+        NpcJump0(NPC_HUFF_N_PUFF0, 650, 150, 5, 10);
+    }
+    spawn {
+        NpcJump0(NPC_HUFF_N_PUFF1, 650, 150, 0, 10);
+    }
+    spawn {
+        NpcJump0(NPC_HUFF_N_PUFF2, 650, 150, 0, 10);
+    }
+    spawn {
+        SetPlayerAnimation(ANIM_80017);
+        LoadPath(30, N(vectorList_8024189C), 3, 0);
+    0:
+        GetNextPathPos();
+        SetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3));
+        sleep 1;
+        if (SI_VAR(0) == 1) {
+            goto 0;
+        }
+    }
+    SetPlayerAnimation(ANIM_1002B);
+});
+
+Script N(80241B98) = SCRIPT({
+    if (STORY_PROGRESS >= STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+        return;
+    }
+    AwaitPlayerApproach(650, 0, 30);
+    DisablePlayerInput(TRUE);
+    SetMusicTrack(0, SONG_HUFF_N_PUFF_THEME, 0, 8);
+    SI_VAR(9) = spawn N(802418C0);
+    GetCurrentPartner(SI_VAR(0));
+    if (SI_VAR(0) != 0) {
+        func_802D2B6C();
+        sleep 20;
+    }
+    DisablePlayerPhysics(TRUE);
+    InterpPlayerYaw(90, 1);
+    sleep 5;
+    SetPlayerAnimation(ANIM_1002B);
+    SetNpcFlagBits(NPC_HUFF_N_PUFF1, ((NPC_FLAG_100)), TRUE);
+    GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4));
+    UseSettingsFrom(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+    SetPanTarget(0, SI_VAR(2), SI_VAR(3), SI_VAR(4));
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    MakeLerp(SI_VAR(2), 600, 20, 0);
+    SI_VAR(2) = SI_VAR(3);
+    SI_VAR(5) = SI_VAR(3);
+    SI_VAR(5) += 15;
+    loop {
+        UpdateLerp();
+        SI_VAR(3) += 3;
+        SetPlayerPos(SI_VAR(0), SI_VAR(3), SI_VAR(4));
+        if (SI_VAR(3) > SI_VAR(5)) {
+            SI_VAR(3) = SI_VAR(2);
+        }
+        sleep 1;
+        if (SI_VAR(1) == 0) {
+            break loop;
+        }
+        SetPanTarget(0, SI_VAR(0), SI_VAR(2), SI_VAR(4));
+    }
+    func_802D2C14(1);
+    SetPlayerPos(SI_VAR(0), SI_VAR(2), SI_VAR(4));
+    SetNpcFlagBits(NPC_HUFF_N_PUFF1, ((NPC_FLAG_100)), FALSE);
+    DisablePlayerPhysics(FALSE);
+    sleep 10;
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += 25;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 300.0);
+    SetCamPitch(0, 17.0, -9.0);
+    SetCamSpeed(0, 4.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    sleep 10;
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00CA), 630, 120, 0);
+    SetCamDistance(0, 600.0);
+    SetCamPitch(0, 30.0, -9.0);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    sleep 10;
+    ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00CB), 630, 120, 0);
+    SetCamDistance(0, 300.0);
+    SetCamPitch(0, 17.0, -9.0);
+    PanToTarget(0, 0, 1);
+    func_802D2C14(0);
+    sleep 10;
+    GetCurrentPartnerID(SI_VAR(0));
+    if (SI_VAR(0) != 8) {
+        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00CC), 630, 120, 0);
+    } else {
+        ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00CD), 630, 120, 0);
+    }
+    parallel {
+        sleep 15;
+        GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SI_VAR(0) += 25;
+        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetCamPitch(0, 17.0, -6.0);
+        SI_VAR(3) = 40;
+        loop 5 {
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 400.0);
+            SetCamSpeed(0, SI_VAR(3));
+            WaitForCam(0, 1.0);
+            SI_VAR(3) -= 10;
+            SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SetCamDistance(0, 600.0);
+            SetCamSpeed(0, SI_VAR(3));
+            WaitForCam(0, 1.0);
+            SI_VAR(3) += 7;
+        }
+    }
+    await N(80241920);
+    kill SI_VAR(9);
+    sleep 30;
+    SetNpcVar(0, 0, 1);
+    DisablePlayerInput(FALSE);
+    sleep 15;
+});
+
+Script N(80242290) = SCRIPT({
+    SI_VAR(0) = 0.9501953125;
+    SI_VAR(1) = 1.1005859375;
+0:
+    match SI_MAP_VAR(13) {
+        == 0 {
+            SI_VAR(3) = 10;
+            SI_VAR(2) = 2;
+        }
+        == 1 {
+            SI_VAR(3) = 5;
+            SI_VAR(2) = 1;
+        }
+        else {
+            return;
+        }
+    }
+    SI_VAR(4) = SI_VAR(3);
+    loop SI_VAR(4) {
+        SetNpcScale(NPC_HUFF_N_PUFF0, SI_VAR(0), SI_VAR(1), 1);
+        SetNpcScale(NPC_HUFF_N_PUFF1, SI_VAR(0), SI_VAR(1), 1);
+        SetNpcScale(NPC_HUFF_N_PUFF2, SI_VAR(0), SI_VAR(1), 1);
+        SI_VAR(0) += 0.015625;
+        SI_VAR(1) -= 0.0107421875;
+        sleep SI_VAR(2);
+    }
+    SI_VAR(4) = SI_VAR(3);
+    loop SI_VAR(4) {
+        SetNpcScale(NPC_HUFF_N_PUFF0, SI_VAR(0), SI_VAR(1), 1);
+        SetNpcScale(NPC_HUFF_N_PUFF1, SI_VAR(0), SI_VAR(1), 1);
+        SetNpcScale(NPC_HUFF_N_PUFF2, SI_VAR(0), SI_VAR(1), 1);
+        SI_VAR(0) -= 0.015625;
+        SI_VAR(1) += 0.0107421875;
+        sleep SI_VAR(2);
+    }
+    goto 0;
+});
+
+s32 N(intTable_8024249C)[] = {
+    0x0000027B, 0x000000A5, 0x000001C2, 0x00000078, 0x00000280, 0x000000AA, 0x00000208, 0x0000010E,
+    0x0000028A, 0x000000AF, 0x0000028A, 0x00000113, 0x00000294, 0x000000AA, 0x000002DA, 0x00000113,
+    0x00000299, 0x000000A5, 0x00000352, 0x00000078, 0x00000276, 0x00000096, 0x000001C2, 0x0000009B,
+    0x0000027D, 0x00000096, 0x00000258, 0x00000113, 0x0000028A, 0x00000096, 0x00000352, 0x0000009B,
+    0x00000297, 0x00000096, 0x000002EE, 0x0000010E, 0x0000029E, 0x00000096, 0x00000352, 0x000000C3,
+    0x0000027B, 0x00000087, 0x000001C2, 0x000000C3, 0x00000280, 0x00000082, 0x000001C2, 0x000000EB,
+    0x0000028A, 0x0000007D, 0x000001C2, 0x0000010E, 0x00000294, 0x00000082, 0x00000352, 0x0000010E,
+    0x00000299, 0x00000087, 0x00000352, 0x000000EB,
+};
+
+s32 N(intTable_8024258C)[] = {
+    0x0000000A, 0x0000000E, 0x00000007, 0x0000000E, 0x00000005, 0x00000006, 0x00000005, 0x0000000C,
+    0x00000006, 0x0000000C, 0x00000005, 0x00000005, 0x00000005, 0x0000000A, 0x00000005, 0x0000000A,
+    0x00000005, 0x00000004,
+};
+
+s32 N(intTable_802425D4)[] = {
+    0x00000008, 0x0000000A, 0x0000000A, 0x00000008,
+};
+
+s32 N(intTable_802425E4)[] = {
+    0x0000000A, 0x00000005, 0x00000007, 0x00000005, 0x0000000E, 0x00000006, 0x0000000E, 0x00000005,
+    0x00000006, 0x00000005, 0x0000000C, 0x00000005, 0x0000000C, 0x00000005, 0x00000005, 0x00000005,
+    0x0000000A, 0x00000004,
+};
+
+s32 N(intTable_8024262C)[] = {
+    0x0000000A, 0x00000006, 0x00000006, 0x0000000A,
+};
+
+Script N(8024263C) = SCRIPT({
+    SI_VAR(0) = (float) 10;
+    SI_VAR(1) = (float) 1;
+    parallel {
+        loop 8 {
+            SetNpcFlagBits(NPC_HUFF_N_PUFF0, ((0x00000002)), FALSE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF1, ((0x00000002)), FALSE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF2, ((0x00000002)), FALSE);
+            sleep SI_VAR(0);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF0, ((0x00000002)), TRUE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF1, ((0x00000002)), TRUE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF2, ((0x00000002)), TRUE);
+            sleep SI_VAR(1);
+            SI_VAR(0) -= (float) 0;
+            SI_VAR(1) += (float) 0;
+        }
+        loop {
+            SetNpcFlagBits(NPC_HUFF_N_PUFF0, ((0x00000002)), FALSE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF1, ((0x00000002)), FALSE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF2, ((0x00000002)), FALSE);
+            sleep SI_VAR(0);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF0, ((0x00000002)), TRUE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF1, ((0x00000002)), TRUE);
+            SetNpcFlagBits(NPC_HUFF_N_PUFF2, ((0x00000002)), TRUE);
+            sleep SI_VAR(1);
+        }
+    }
+    parallel {
+        loop {
+            MakeLerp(0, 255, 10, 4);
+            loop {
+                UpdateLerp();
+                func_802CFD30(NPC_HUFF_N_PUFF0, 9, SI_VAR(0), SI_VAR(0), SI_VAR(0), 0);
+                func_802CFD30(NPC_HUFF_N_PUFF1, 9, SI_VAR(0), SI_VAR(0), SI_VAR(0), 0);
+                func_802CFD30(NPC_HUFF_N_PUFF2, 9, SI_VAR(0), SI_VAR(0), SI_VAR(0), 0);
+                sleep 1;
+                if (SI_VAR(1) == 0) {
+                    break loop;
+                }
+            }
+        }
+    }
+    sleep 100;
+});
+
+// *INDENT-OFF*
+Script N(80242918) = {
+    SI_CMD(ScriptOpcode_SET_F, SI_MAP_VAR(11), SI_FIXED(1.0)),
+    SI_CMD(ScriptOpcode_SET_F, SI_MAP_VAR(12), SI_FIXED(1.0)),
+    SI_CMD(ScriptOpcode_PARALLEL_THREAD),
+        SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_8024258C)),
+        SI_CMD(ScriptOpcode_LOOP, 6),
+            SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 0, 8374, 0),
+            SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(6), SI_VAR(7), SI_VAR(8)),
+            SI_CMD(ScriptOpcode_CALL, MakeLerp, SI_VAR(6), SI_VAR(7), SI_VAR(8), 11),
+            SI_CMD(ScriptOpcode_LOOP, 0),
+                SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+                SI_CMD(ScriptOpcode_DIV_F, SI_VAR(0), 10),
+                SI_CMD(ScriptOpcode_SET_F, SI_MAP_VAR(11), SI_VAR(0)),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+                    SI_CMD(ScriptOpcode_BREAK_LOOP),
+                SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_802425D4)),
+            SI_CMD(ScriptOpcode_LOOP, 2),
+                SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, 0, 8374, 0),
+                SI_CMD(ScriptOpcode_BUFFER_READ_2, SI_VAR(6), SI_VAR(7)),
+                SI_CMD(ScriptOpcode_CALL, MakeLerp, SI_VAR(6), SI_VAR(7), 4, 11),
+                SI_CMD(ScriptOpcode_LOOP, 0),
+                    SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+                    SI_CMD(ScriptOpcode_DIV_F, SI_VAR(0), 10),
+                    SI_CMD(ScriptOpcode_SET_F, SI_MAP_VAR(11), SI_VAR(0)),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+                        SI_CMD(ScriptOpcode_BREAK_LOOP),
+                    SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_END_PARALLEL_THREAD),
+    SI_CMD(ScriptOpcode_PARALLEL_THREAD),
+        SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_802425E4)),
+        SI_CMD(ScriptOpcode_LOOP, 6),
+            SI_CMD(ScriptOpcode_BUFFER_READ_3, SI_VAR(6), SI_VAR(7), SI_VAR(8)),
+            SI_CMD(ScriptOpcode_CALL, MakeLerp, SI_VAR(6), SI_VAR(7), SI_VAR(8), 11),
+            SI_CMD(ScriptOpcode_LOOP, 0),
+                SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+                SI_CMD(ScriptOpcode_DIV_F, SI_VAR(0), 10),
+                SI_CMD(ScriptOpcode_SET_F, SI_MAP_VAR(12), SI_VAR(0)),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+                    SI_CMD(ScriptOpcode_BREAK_LOOP),
+                SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_8024262C)),
+            SI_CMD(ScriptOpcode_LOOP, 2),
+                SI_CMD(ScriptOpcode_BUFFER_READ_2, SI_VAR(6), SI_VAR(7)),
+                SI_CMD(ScriptOpcode_CALL, MakeLerp, SI_VAR(6), SI_VAR(7), 4, 11),
+                SI_CMD(ScriptOpcode_LOOP, 0),
+                    SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+                    SI_CMD(ScriptOpcode_DIV_F, SI_VAR(0), 10),
+                    SI_CMD(ScriptOpcode_SET_F, SI_MAP_VAR(12), SI_VAR(0)),
+                    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                    SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+                        SI_CMD(ScriptOpcode_BREAK_LOOP),
+                    SI_CMD(ScriptOpcode_END_IF),
+                SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_END_LOOP),
+        SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_END_PARALLEL_THREAD),
+    SI_CMD(ScriptOpcode_LOOP, 100),
+        SI_CMD(ScriptOpcode_CALL, SetNpcScale, 0, SI_MAP_VAR(11), SI_MAP_VAR(12), 1),
+        SI_CMD(ScriptOpcode_CALL, SetNpcScale, 1, SI_MAP_VAR(11), SI_MAP_VAR(12), 1),
+        SI_CMD(ScriptOpcode_CALL, SetNpcScale, 2, SI_MAP_VAR(11), SI_MAP_VAR(12), 1),
+        SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+// *INDENT-OFF*
+Script N(80242D34) = {
+    SI_CMD(ScriptOpcode_PARALLEL_THREAD),
+        SI_CMD(ScriptOpcode_SET, SI_VAR(1), 0),
+        SI_CMD(ScriptOpcode_LOOP, 0),
+            SI_CMD(ScriptOpcode_SET, SI_VAR(0), 3),
+            SI_CMD(ScriptOpcode_LOOP, 15),
+                SI_CMD(ScriptOpcode_CALL, SetNpcRotation, SI_VAR(0), 0, SI_VAR(1), 0),
+                SI_CMD(ScriptOpcode_ADD, SI_VAR(0), 1),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(1), 60),
+            SI_CMD(ScriptOpcode_IF_GT, SI_VAR(1), 360),
+                SI_CMD(ScriptOpcode_ADD, SI_VAR(1), -360),
+            SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+        SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_END_PARALLEL_THREAD),
+    SI_CMD(ScriptOpcode_USE_BUFFER, N(intTable_8024249C)),
+    SI_CMD(ScriptOpcode_SET, SI_VAR(8), 3),
+    SI_CMD(ScriptOpcode_LOOP, 14),
+        SI_CMD(ScriptOpcode_BUFFER_READ_4, SI_VAR(1), SI_VAR(2), SI_VAR(3), SI_VAR(4)),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_CALL, RandInt, 5, SI_VAR(5)),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, SI_VAR(5)),
+            SI_CMD(ScriptOpcode_CALL, SetNpcPos, SI_VAR(8), SI_VAR(1), SI_VAR(2), -30),
+            SI_CMD(ScriptOpcode_CALL, RandInt, 2, SI_VAR(5)),
+            SI_CMD(ScriptOpcode_ADD, SI_VAR(5), 8),
+            SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, SI_VAR(8), 981, 0),
+            SI_CMD(ScriptOpcode_CALL, NpcJump0, SI_VAR(8), SI_VAR(3), SI_VAR(4), -15, SI_VAR(5)),
+            SI_CMD(ScriptOpcode_CALL, SetNpcPos, SI_VAR(8), 0, -1000, 0),
+        SI_CMD(ScriptOpcode_END_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_ADD, SI_VAR(8), 1),
+    SI_CMD(ScriptOpcode_END_LOOP),
+    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 0, 0, -1000, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 1, 0, -1000, 0),
+    SI_CMD(ScriptOpcode_CALL, SetNpcPos, 2, 0, -1000, 0),
+    SI_CMD(ScriptOpcode_BUFFER_READ_4, SI_VAR(1), SI_VAR(2), SI_VAR(3), SI_VAR(4)),
+    SI_CMD(ScriptOpcode_SLEEP_FRAMES, 5),
+    SI_CMD(ScriptOpcode_CALL, SetNpcPos, SI_VAR(8), SI_VAR(1), SI_VAR(2), -30),
+    SI_CMD(ScriptOpcode_CALL, PlaySoundAtNpc, SI_VAR(8), 982, 0),
+    SI_CMD(ScriptOpcode_CALL, NpcJump0, SI_VAR(8), SI_VAR(3), SI_VAR(4), -15, 10),
+    SI_CMD(ScriptOpcode_CALL, SetNpcPos, SI_VAR(8), 0, -1000, 0),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+Script N(80243010) = SCRIPT({
+    SetNpcAnimation(NPC_HUFF_N_PUFF1, NPC_ANIM(huff_n_puff, Palette_00, Anim_4));
+    SetNpcAnimation(NPC_HUFF_N_PUFF0, NPC_ANIM(huff_n_puff, Palette_00, Anim_5));
+    SetNpcAnimation(NPC_HUFF_N_PUFF2, NPC_ANIM(huff_n_puff, Palette_00, Anim_6));
+    GetNpcPos(NPC_HUFF_N_PUFF0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SI_VAR(0) += -15;
+    SI_VAR(2) += 40;
+    SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    SetCamDistance(0, 350.0);
+    SetCamPitch(0, 17.0, -5.5);
+    SetCamSpeed(0, 90.0);
+    PanToTarget(0, 0, 1);
+    WaitForCam(0, 1.0);
+    SpeakToPlayer(NPC_HUFF_N_PUFF0, NPC_ANIM(huff_n_puff, Palette_00, Anim_30), NPC_ANIM(huff_n_puff, Palette_00, Anim_5), 256, -30, 30, MESSAGE_ID(0x11, 0x00CE));
+    FadeOutMusic(0, 1500);
+    SI_MAP_VAR(13) = 2;
+    GetNpcPos(NPC_HUFF_N_PUFF0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    spawn {
+        SI_VAR(3) = SI_VAR(0);
+        SI_VAR(4) = SI_VAR(0);
+        SI_VAR(3) += -35;
+        SI_VAR(4) += 35;
+        loop 3 {
+            PlayEffect(0x19, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+            sleep 12;
+            PlayEffect(0x19, 0, SI_VAR(3), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+            SI_VAR(3) += 7;
+            sleep 8;
+            PlayEffect(0x19, 0, SI_VAR(4), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+            SI_VAR(4) += -7;
+            sleep 14;
+        }
+        PlayEffect(0x19, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        ShakeCam(0, 0, 30, 1.5);
+    }
+    spawn {
+        sleep 30;
+        loop 10 {
+            PlayEffect(0x3A, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 40, 65, 12, 15, 0, 0, 0, 0, 0);
+            sleep 7;
+        }
+    }
+    spawn N(8024263C);
+    await N(80242918);
+    await N(80242D34);
+    sleep 10;
+});
+
+Script N(idle_80243428) = SCRIPT({
+0:
+    SetSelfVar(0, 0);
+    loop {
+        GetSelfVar(0, SI_VAR(0));
+        if (SI_VAR(0) != 0) {
+            break loop;
+        }
+        sleep 1;
+    }
+    SI_MAP_VAR(13) = 1;
+    StartBossBattle(14);
+    goto 0;
+});
+
+Script N(defeat_802434D8) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            SetEncounterStatusFlags(1, 1);
+            SetNpcYaw(NPC_PARTNER, 90);
+            GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(3));
+            GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+            SI_VAR(3) += -20;
+            SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(3));
+            await N(80243010);
+            sleep 50;
+            SI_MAP_VAR(10) = 1;
+            spawn N(80240E3C);
+        }
+    }
+});
+
+Script N(defeat_802435D4) = SCRIPT({
+
+});
+
+Script N(init_802435E4) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+        SetEnemyFlagBits(-1, 4194304, 1);
+        BindNpcIdle(NPC_SELF, N(idle_80243428));
+        BindNpcDefeat(NPC_SELF, N(defeat_802434D8));
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_2));
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(init_80243684) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+        SetEnemyFlagBits(-1, 4194304, 1);
+        BindNpcDefeat(NPC_SELF, N(defeat_802435D4));
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_1));
+        spawn N(80242290);
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(init_8024371C) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) {
+        SetEnemyFlagBits(-1, 4194304, 1);
+        BindNpcDefeat(NPC_SELF, N(defeat_802435D4));
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_19));
+    } else {
+        SetNpcPos(NPC_SELF, 0, -1000, 0);
+    }
+});
+
+Script N(init_802437A8) = SCRIPT({
+    SetNpcAnimation(NPC_SELF, NPC_ANIM(tuff_puff, Palette_00, Anim_B));
+    SetNpcJumpscale(NPC_SELF, 0);
+});
+
+NpcAnimID N(extraAnimationList_802437E0)[] = {
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_0),
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_2),
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_4),
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_5),
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_31),
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_19),
+    NPC_ANIM(huff_n_puff, Palette_00, Anim_2D),
+    ANIM_END,
+};
+
+StaticNpc N(npcGroup_80243804)[] = {
+    {
+        .id = NPC_HUFF_N_PUFF0,
+        .settings = &N(npcSettings_802417EC),
+        .pos = { 650.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000,
+        .init = &N(init_802435E4),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_802437E0),
+    },
+    {
+        .id = NPC_HUFF_N_PUFF1,
+        .settings = &N(npcSettings_802417EC),
+        .pos = { 650.0f, 100.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000,
+        .init = &N(init_80243684),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_802437E0),
+    },
+    {
+        .id = NPC_HUFF_N_PUFF2,
+        .settings = &N(npcSettings_802417EC),
+        .pos = { 650.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000,
+        .init = &N(init_8024371C),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+            NPC_ANIM(huff_n_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_802437E0),
+    },
+};
+
+NpcAnimID N(extraAnimationList_80243DD4)[] = {
+    NPC_ANIM(tuff_puff, Palette_00, Anim_B),
+    ANIM_END,
+};
+
+StaticNpc N(npcGroup_80243DDC)[] = {
+    {
+        .id = NPC_TUFF_PUFF0,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF1,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF2,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF3,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF4,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF5,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF6,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF7,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF8,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF9,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF10,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF11,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF12,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF13,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+    {
+        .id = NPC_TUFF_PUFF14,
+        .settings = &N(npcSettings_802417C0),
+        .pos = { 0.0f, -1000.0f, 0.0f },
+        .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+        .init = &N(init_802437A8),
+        .yaw = 270,
+        .dropFlags = 0x80,
+        .heartDrops = NO_DROPS,
+        .flowerDrops = NO_DROPS,
+        .animations = {
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+            NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        },
+        .extraAnimations = N(extraAnimationList_80243DD4),
+    },
+};
+
+NpcGroupList N(npcGroupList_80245AEC) = {
+    NPC_GROUP(N(npcGroup_80243804), BATTLE_ID(25, 0, 0, 8)),
+    NPC_GROUP(N(npcGroup_80243DDC), BATTLE_ID(24, 31, 0, 8)),
+    {},
+};
 
 #include "world/common/UnkTexturePanFunc.inc.c"
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240B00_CE7200);
+void func_80072950();
+
+ApiStatus N(func_80240B00_CE7200)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_21/flo_21.h b/src/world/area_flo/flo_21/flo_21.h
index ff020cd971..18b5fb20ae 100644
--- a/src/world/area_flo/flo_21/flo_21.h
+++ b/src/world/area_flo/flo_21/flo_21.h
@@ -2,3 +2,19 @@
 #include "map.h"
 
 #define NAMESPACE flo_21
+
+ApiStatus N(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFloatFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CE6700)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024004C_CE674C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802401AC_CE68AC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802405BC_CE6CBC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802405FC_CE6CFC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240708_CE6E08)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240B00_CE7200)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80245AEC);
+extern Script N(80241600);
+extern Script N(80241B98);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c
index 4cf33d9591..db68e93ad4 100644
--- a/src/world/area_flo/flo_22/CEC240.c
+++ b/src/world/area_flo/flo_22/CEC240.c
@@ -1,3 +1,381 @@
 #include "flo_22.h"
+#include "message_ids.h"
+#include "sprite/npc/bzzap.h"
+#include "sprite/npc/dayzee.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_22/CEC240", func_80240000_CEC240);
+enum {
+    NPC_BZZAP,
+    NPC_DAYZEE,
+};
+
+EntryList N(entryList) = {
+    { -230.0f, 0.0f, 0.0f, 90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_22_tattle },
+};
+
+Script N(802402E0) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(exitWalk_80240350) = EXIT_WALK_SCRIPT(60,  0, "flo_03",  1);
+
+Script N(802403AC) = SCRIPT({
+    bind N(exitWalk_80240350) to TRIGGER_FLOOR_ABOVE 0;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80240DE4));
+    spawn N(80241F6C);
+    spawn N(80241528);
+    GetEntryID(SI_VAR(0));
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    SI_VAR(0) = N(802403AC);
+    spawn EnterWalk;
+    spawn N(80240E24);
+    await N(802402E0);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CEC240)();
+    }
+});
+
+static s32 N(pad_518)[] = {
+    0x00000000, 0x00000000,
+};
+
+NpcSettings N(npcSettings_80240520) = {
+    .height = 24,
+    .radius = 24,
+    .level = 99,
+};
+
+Script N(idle_8024054C) = SCRIPT({
+    SI_MAP_VAR(10) = 0;
+    loop {
+        match SI_MAP_VAR(10) {
+            == 0 {}
+            == 1 {
+                SetPlayerAnimation(0x1002E);
+                SI_MAP_VAR(10) = 0;
+                StartBattle();
+            }
+        }
+        sleep 1;
+    }
+});
+
+Script N(defeat_802405E4) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            spawn {
+                sleep 25;
+                SetNpcPos(NPC_SELF, 0, -1000, 0);
+                SetNpcFlagBits(NPC_SELF, ((0x00000002)), FALSE);
+            }
+            DoNpcDefeat();
+        }
+        == 1 {
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+        }
+        == 2 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(bzzap, Palette_00, Anim_1));
+            SetNpcPos(NPC_SELF, 30, 60, 0);
+            sleep 10;
+            SetNpcJumpscale(NPC_SELF, 0);
+            NpcJump0(NPC_SELF, 30, 0, 0, 15);
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+        }
+    }
+});
+
+Script N(init_80240740) = SCRIPT({
+    BindNpcIdle(NPC_SELF, N(idle_8024054C));
+    BindNpcDefeat(NPC_SELF, N(defeat_802405E4));
+});
+
+Script N(idle_80240778) = SCRIPT({
+    SI_MAP_VAR(11) = 0;
+    loop {
+        match SI_MAP_VAR(11) {
+            == 0 {}
+            == 1 {
+                SetPlayerAnimation(0x1002E);
+                SI_MAP_VAR(11) = 0;
+                StartBattle();
+            }
+        }
+        sleep 1;
+    }
+});
+
+Script N(defeat_80240810) = SCRIPT({
+    GetBattleOutcome(SI_VAR(0));
+    match SI_VAR(0) {
+        == 0 {
+            spawn {
+                sleep 25;
+                SetNpcPos(NPC_SELF, 0, -1000, 0);
+                SetNpcFlagBits(NPC_SELF, ((0x00000002)), FALSE);
+            }
+            DoNpcDefeat();
+        }
+        == 1 {
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+        }
+        == 3 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(dayzee, Palette_00, Anim_1));
+            sleep 10;
+            SetNpcJumpscale(NPC_SELF, 2.0);
+            NpcJump0(NPC_SELF, 30, 0, 0, 15);
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+        }
+        == 2 {
+            SetNpcAnimation(NPC_SELF, NPC_ANIM(dayzee, Palette_00, Anim_1));
+            sleep 10;
+            SetNpcJumpscale(NPC_SELF, 2.0);
+            NpcJump0(NPC_SELF, 30, 0, 0, 15);
+            SetNpcPos(NPC_SELF, 0, -1000, 0);
+        }
+    }
+});
+
+Script N(init_802409CC) = SCRIPT({
+    BindNpcIdle(NPC_SELF, N(idle_80240778));
+    BindNpcDefeat(NPC_SELF, N(defeat_80240810));
+});
+
+StaticNpc N(npcGroup_80240A04) = {
+    .id = NPC_BZZAP,
+    .settings = &N(npcSettings_80240520),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_80240740),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_4),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+    },
+};
+
+StaticNpc N(npcGroup_80240BF4) = {
+    .id = NPC_DAYZEE,
+    .settings = &N(npcSettings_80240520),
+    .pos = { 0.0f, -1000.0f, 0.0f },
+    .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
+    .init = &N(init_802409CC),
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(4),
+    .maxCoinBonus = 3,
+    .animations = {
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_2),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_3),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_8),
+        NPC_ANIM(dayzee, Palette_00, Anim_6),
+        NPC_ANIM(dayzee, Palette_00, Anim_7),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+        NPC_ANIM(dayzee, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_80240DE4) = {
+    NPC_GROUP(N(npcGroup_80240A04), BATTLE_ID(24, 23, 0, 3)),
+    NPC_GROUP(N(npcGroup_80240BF4), BATTLE_ID(24, 15, 0, 2)),
+    {},
+};
+
+static s32 N(pad_E08)[] = {
+    0x00000000, 0x00000000,
+};
+
+s32 N(itemList_80240E10)[] = {
+    ITEM_RED_BERRY,
+    ITEM_BLUE_BERRY,
+    ITEM_YELLOW_BERRY,
+    ITEM_BUBBLE_BERRY,
+    ITEM_NONE,
+};
+
+Script N(80240E24) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    sleep 20;
+    ShowMessageAtScreenPos(MESSAGE_ID(0x11, 0x00DB), 300, 120);
+    sleep 10;
+    DisablePlayerInput(FALSE);
+});
+
+Script N(80240E84) = SCRIPT({
+    SetPlayerAnimation(0x6000E);
+    spawn {
+        GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4));
+        SI_VAR(6) = 35;
+        SI_VAR(5) = 5;
+        MakeItemEntity(SI_VAR(8), SI_VAR(2), SI_VAR(6), 0, 1, 0);
+        SI_VAR(7) = SI_VAR(0);
+        MakeLerp(SI_VAR(2), 35, 20, 5);
+        loop {
+            UpdateLerp();
+            SetItemPos(SI_VAR(7), SI_VAR(0), SI_VAR(6), 0);
+            SI_VAR(6) += SI_VAR(5);
+            SI_VAR(5) += -1;
+            sleep 1;
+            if (SI_VAR(1) == 0) {
+                break loop;
+            }
+        }
+        RemoveItemEntity(SI_VAR(7));
+    }
+    sleep 10;
+    PlaySoundAt(0x302, 0, 35, 0, 0);
+    sleep 5;
+    SetPlayerAnimation(ANIM_10002);
+    sleep 10;
+});
+
+Script N(80241028) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    DisablePlayerInput(FALSE);
+    func_802D663C();
+    func_802D6954();
+    DisablePlayerInput(TRUE);
+    SI_VAR(8) = SI_VAR(0);
+    match SI_VAR(8) {
+        <= -1 {}
+        <= 0 {
+            ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x015C), 160, 40);
+        }
+        == 158 {
+            await N(80240E84);
+            RemoveItemAt(SI_VAR(1));
+            if (SI_SAVE_FLAG(1395) == 0) {
+                ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00DD), 35, 35, 0);
+                SI_SAVE_FLAG(1395) = 1;
+                MakeItemEntity(ITEM_FLOWER_SAVER_B, -35, 0, 0, 0, SI_SAVE_FLAG(1392));
+                SI_VAR(7) = SI_VAR(0);
+                SetNpcFlagBits(NPC_BZZAP, ((0x00000002)), TRUE);
+                SetNpcFlagBits(NPC_BZZAP, ((NPC_FLAG_HAS_SHADOW)), FALSE);
+                SetNpcPos(NPC_BZZAP, 35, 0, 0);
+                SetNpcJumpscale(NPC_BZZAP, 1.0);
+                spawn {
+                    NpcJump0(NPC_BZZAP, -53, 0, 0, 25);
+                    NpcJump0(NPC_BZZAP, -73, 0, 0, 15);
+                    NpcJump0(NPC_BZZAP, -83, 0, 0, 8);
+                }
+                loop 53 {
+                    GetNpcPos(NPC_BZZAP, SI_VAR(1), SI_VAR(2), SI_VAR(3));
+                    SetItemPos(SI_VAR(7), SI_VAR(1), SI_VAR(2), SI_VAR(3));
+                    sleep 1;
+                }
+                SetNpcPos(NPC_BZZAP, 0, -1000, 0);
+                SetNpcFlagBits(NPC_BZZAP, ((0x00000002)), FALSE);
+                SetNpcFlagBits(NPC_BZZAP, ((NPC_FLAG_HAS_SHADOW)), TRUE);
+            } else {
+                ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00DE), 35, 35, 0);
+            }
+        }
+        else {
+            await N(80240E84);
+            RemoveItemAt(SI_VAR(1));
+            ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x00DC), 35, 35, 0);
+            RandInt(1, SI_VAR(1));
+            if (SI_VAR(1) == 0) {
+                SetNpcJumpscale(NPC_BZZAP, 0.0);
+                NpcFacePlayer(NPC_BZZAP, 0);
+                sleep 1;
+                SetNpcPos(NPC_BZZAP, 30, 0, 0);
+                SetNpcAnimation(NPC_BZZAP, NPC_ANIM(bzzap, Palette_00, Anim_1));
+                NpcJump0(NPC_BZZAP, 30, 60, 0, 20);
+                sleep 10;
+                SetNpcAnimation(NPC_BZZAP, NPC_ANIM(bzzap, Palette_00, Anim_4));
+                GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SI_VAR(1) += 20;
+                NpcJump0(NPC_BZZAP, SI_VAR(0), SI_VAR(1), SI_VAR(2), 5);
+                SI_MAP_VAR(10) = 1;
+            } else {
+                SetNpcPos(NPC_DAYZEE, 30, 0, 0);
+                SetNpcAnimation(NPC_DAYZEE, NPC_ANIM(dayzee, Palette_00, Anim_E));
+                GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+                SI_VAR(1) += 20;
+                SetNpcJumpscale(NPC_DAYZEE, 2.0);
+                NpcJump0(NPC_DAYZEE, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20);
+                SI_MAP_VAR(11) = 1;
+            }
+        }
+    }
+    DisablePlayerInput(FALSE);
+});
+
+// *INDENT-OFF*
+Script N(80241528) = {
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80241028), TRIGGER_WALL_PRESS_A, 9, N(itemList_80240E10), 0, 1),
+    SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1395), 1),
+        SI_CMD(ScriptOpcode_CALL, MakeItemEntity, 312, -83, 0, 0, 0, SI_SAVE_FLAG(1392)),
+    SI_CMD(ScriptOpcode_END_IF),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+// *INDENT-ON*
+
+static s32 N(pad_1594)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+void func_80072950();
+
+ApiStatus N(func_80240000_CEC240)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_22/CEC280.c b/src/world/area_flo/flo_22/CEC280.c
index 074e442528..9ccd2dafaa 100644
--- a/src/world/area_flo/flo_22/CEC280.c
+++ b/src/world/area_flo/flo_22/CEC280.c
@@ -1,3 +1,3 @@
 #include "flo_22.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_22/CEC280", func_80240040_CEC280);
+#include "world/common/UnkFunc36.inc.c"
diff --git a/src/world/area_flo/flo_22/CEC290.c b/src/world/area_flo/flo_22/CEC290.c
index d0d0cf6dfe..001bbc615f 100644
--- a/src/world/area_flo/flo_22/CEC290.c
+++ b/src/world/area_flo/flo_22/CEC290.c
@@ -2,3 +2,33 @@
 
 #include "world/common/foliage.inc.c"
 
+FoliageModelList N(tree1_Trunk) = {
+    .count = 3,
+    .models = { 21, 22, 23 }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .trunk = &N(tree1_Trunk),
+};
+
+Vec4f N(triggerCoord_80241F28) = { 93.0f, 0.0f, -89.0f, 0.0f };
+
+FoliageModelList N(tree2_Trunk) = {
+    .count = 3,
+    .models = { 25, 26, 27 }
+};
+
+ShakeTreeConfig N(tree2) = {
+    .trunk = &N(tree2_Trunk),
+};
+
+Vec4f N(triggerCoord_80241F5C) = { 150.0f, 0.0f, 135.0f, 0.0f };
+
+Script N(80241F6C) = SCRIPT({
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 14;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80241F28);
+    SI_VAR(0) = N(tree2);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 16;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80241F5C);
+});
diff --git a/src/world/area_flo/flo_22/flo_22.h b/src/world/area_flo/flo_22/flo_22.h
index ad7acc4ff5..39ed92fef8 100644
--- a/src/world/area_flo/flo_22/flo_22.h
+++ b/src/world/area_flo/flo_22/flo_22.h
@@ -2,3 +2,12 @@
 #include "map.h"
 
 #define NAMESPACE flo_22
+
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CEC240)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80240DE4);
+extern Script N(80240E24);
+extern Script N(80241528);
+extern Script N(80241F6C);
+extern Script N(main);
diff --git a/src/world/area_flo/flo_23/CEE260.c b/src/world/area_flo/flo_23/CEE260.c
index 3702803a08..c1d1f0b955 100644
--- a/src/world/area_flo/flo_23/CEE260.c
+++ b/src/world/area_flo/flo_23/CEE260.c
@@ -1,3 +1,8 @@
 #include "flo_23.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE260", func_80240000_CEE260);
+void func_80072950();
+
+ApiStatus N(func_80240000_CEE260)(ScriptInstance *script, s32 isInitialCall) {
+    func_80072950(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c
index 676548e7b1..52971ee0a1 100644
--- a/src/world/area_flo/flo_23/CEE2A0.c
+++ b/src/world/area_flo/flo_23/CEE2A0.c
@@ -1,57 +1,706 @@
 #include "flo_23.h"
+#include "message_ids.h"
+#include "sprite/npc/gate_flower.h"
+#include "sprite/npc/spiny.h"
+
+enum {
+    NPC_SPINY0,
+    NPC_SPINY1,
+    NPC_GATE_FLOWER,
+};
+
+static s32 N(D_802426E0)[91];
+static s32 N(D_80242850)[91];
+static s32 N(D_802429BC);
+
+EntryList N(entryList) = {
+    {  470.0f, 0.0f, 0.0f, 270.0f },
+    { -470.0f, 0.0f, 0.0f,  90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_23_tattle },
+};
+
+Script N(80240D30) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(80240DA0) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_8024104C) = EXIT_WALK_SCRIPT(60,  0, "flo_00",  2);
+
+Script N(exitWalk_802410A8) = EXIT_WALK_SCRIPT(60,  1, "flo_11",  0);
+
+Script N(80241104) = SCRIPT({
+    bind N(exitWalk_802410A8) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_8024104C) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80242568));
+    await N(makeEntities);
+    SI_VAR(0) = -290;
+    SI_VAR(1) = -190;
+    SI_VAR(2) = 480;
+    SI_VAR(3) = -90;
+    SI_VAR(4) = 0;
+    spawn N(80240DA0);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(80241104);
+    spawn EnterWalk;
+    await N(80240D30);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CEE260)();
+    }
+});
+
+static s32 N(pad_12D8)[] = {
+    0x00000000, 0x00000000,
+};
+
+NpcSettings N(npcSettings_802412E0) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
+
+s32 N(D_8024130C_CEF56C) = {
+    0x00000000,
+};
+
+s32 N(D_80241310_CEF570) = {
+    0x00000000,
+};
+
+Script N(80241314) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D663C();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_802402C0_CEE520)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(80241448) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_802402F8_CEE558), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80241314), 0x10, 0, N(D_802426E0), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_8024026C_CEE4CC), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+NpcAISettings N(npcAISettings_80241498) = {
+    .moveSpeed = 1.5f,
+    .moveTime = 30,
+    .waitTime = 50,
+    .alertRadius = 60.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 3,
+    .chaseSpeed = 6.0f,
+    .chaseRadius = 100.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 3,
+};
+
+Script N(npcAI_802414C8) = SCRIPT({
+    SetSelfVar(2, 3);
+    SetSelfVar(3, 18);
+    SetSelfVar(5, 3);
+    SetSelfVar(7, 4);
+    N(func_80240728_CEE988)(N(npcAISettings_80241498));
+});
+
+NpcSettings N(npcSettings_80241538) = {
+    .height = 21,
+    .radius = 22,
+    .ai = &N(npcAI_802414C8),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+Script N(interact_80241564) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    if (SI_SAVE_FLAG(1365) == 0) {
+        GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetCamDistance(0, 350);
+        SetCamPitch(0, 18.5, -7.5);
+        SetCamSpeed(0, 4.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_2), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0049));
+        SetPlayerAnimation(ANIM_THINKING);
+        N(func_80240C9C_CEEEFC)();
+        SI_VAR(0) = N(D_80242850);
+        SI_VAR(1) = 2;
+        await N(80241448);
+        match SI_VAR(0) {
+            <= 0 {
+                SetPlayerAnimation(ANIM_STAND_STILL);
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_2), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004A));
+            }
+            else {
+                SI_VAR(8) = SI_VAR(0);
+                N(func_80240C2C_CEEE8C)(SI_VAR(0));
+                MakeItemEntity(SI_VAR(8), 385, 20, -34, 1, 0);
+                SI_VAR(7) = SI_VAR(0);
+                PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0);
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_3));
+                sleep 20;
+                RemoveItemEntity(SI_VAR(7));
+                match SI_VAR(8) {
+                    == 158 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004D));
+                        PlaySoundAtNpc(NPC_SELF, 0x21C, 0);
+                        EndSpeech(-1, NPC_ANIM(gate_flower, Palette_00, Anim_9), NPC_ANIM(gate_flower, Palette_00, Anim_8), 0);
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_7));
+                        PlaySoundAtCollider(13, 457, 0);
+                        ModifyColliderFlags(0, 13, 0x7FFFFE00);
+                        MakeLerp(0, 100, 30, 1);
+                        loop {
+                            UpdateLerp();
+                            SI_VAR(8) = (float) SI_VAR(0);
+                            SI_VAR(9) = (float) SI_VAR(0);
+                            SI_VAR(8) *= 0.5;
+                            SI_VAR(9) *= 1.2001953125;
+                            RotateModel(59, SI_VAR(8), 0, -1, 0);
+                            RotateModel(60, SI_VAR(8), 0, -1, 0);
+                            RotateModel(61, SI_VAR(8), 0, -1, 0);
+                            RotateModel(55, SI_VAR(9), 0, 1, 0);
+                            RotateModel(56, SI_VAR(9), 0, 1, 0);
+                            RotateModel(57, SI_VAR(9), 0, 1, 0);
+                            sleep 1;
+                            if (SI_VAR(1) != 1) {
+                                break loop;
+                            }
+                        }
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_5));
+                        SI_SAVE_FLAG(1365) = 1;
+                    }
+                    == 159 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004C));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1));
+                    }
+                    == 160 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004C));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1));
+                    }
+                    else {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004B));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_6));
+                        PlaySoundAtNpc(NPC_SELF, 0x2096, 0);
+                        MakeItemEntity(SI_VAR(8), 375, 20, 0, 1, 0);
+                        SI_VAR(7) = SI_VAR(0);
+                        sleep 5;
+                        GetAngleToPlayer(-1, SI_VAR(0));
+                        if (SI_VAR(0) < 180) {
+                            MakeLerp(0, 100, 7, 0);
+                            loop {
+                                UpdateLerp();
+                                SI_VAR(2) = -0.5;
+                                SI_VAR(3) = -0.19921875;
+                                SI_VAR(4) = 0.900390625;
+                                SI_VAR(2) *= (float) SI_VAR(0);
+                                SI_VAR(3) *= (float) SI_VAR(0);
+                                SI_VAR(4) *= (float) SI_VAR(0);
+                                SI_VAR(2) += 380.0;
+                                SI_VAR(3) += 15.0;
+                                SI_VAR(4) += -30.0;
+                                N(func_80240B68_CEEDC8)(SI_VAR(7), SI_VAR(2), SI_VAR(3), SI_VAR(4));
+                                sleep 1;
+                                if (SI_VAR(1) != 1) {
+                                    break loop;
+                                }
+                            }
+                        } else {
+                            MakeLerp(0, 100, 7, 0);
+                            loop {
+                                UpdateLerp();
+                                SI_VAR(2) = 0.5;
+                                SI_VAR(3) = -0.19921875;
+                                SI_VAR(4) = 1.0;
+                                SI_VAR(2) *= (float) SI_VAR(0);
+                                SI_VAR(3) *= (float) SI_VAR(0);
+                                SI_VAR(4) *= (float) SI_VAR(0);
+                                SI_VAR(2) += 390.0;
+                                SI_VAR(3) += 15.0;
+                                SI_VAR(4) += -30.0;
+                                N(func_80240B68_CEEDC8)(SI_VAR(7), SI_VAR(2), SI_VAR(3), SI_VAR(4));
+                                sleep 1;
+                                if (SI_VAR(1) != 1) {
+                                    break loop;
+                                }
+                            }
+                        }
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1));
+                        RemoveItemEntity(SI_VAR(7));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1));
+                        EndSpeech(-1, NPC_ANIM(gate_flower, Palette_00, Anim_2), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0);
+                    }
+                }
+            }
+        }
+        spawn {
+            ResetCam(0, 6.0);
+        }
+        sleep 10;
+    } else {
+        if (STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_9), NPC_ANIM(gate_flower, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x004E));
+        } else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_9), NPC_ANIM(gate_flower, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x004F));
+        }
+    }
+    DisablePlayerInput(FALSE);
+    unbind;
+});
+
+Script N(init_80241E70) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80241564));
+    if (SI_SAVE_FLAG(1365) == 1) {
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_5));
+        ModifyColliderFlags(0, 13, 0x7FFFFE00);
+        RotateModel(59, 50, 0, -1, 0);
+        RotateModel(60, 50, 0, -1, 0);
+        RotateModel(61, 50, 0, -1, 0);
+        RotateModel(55, 120, 0, 1, 0);
+        RotateModel(56, 120, 0, 1, 0);
+        RotateModel(57, 120, 0, 1, 0);
+    }
+});
+
+StaticNpc N(npcGroup_80241F98) = {
+    .id = NPC_GATE_FLOWER,
+    .settings = &N(npcSettings_802412E0),
+    .pos = { 385.0f, 0.0f, -35.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
+    .init = &N(init_80241E70),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+        NPC_ANIM(gate_flower, Palette_00, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00DC),
+};
+
+StaticNpc N(npcGroup_80242188) = {
+    .id = NPC_SPINY0,
+    .settings = &N(npcSettings_80241538),
+    .pos = { 80.0f, 0.0f, 0.0f },
+    .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { 80, 0, 0, 30, 0, -32767, 0, 80, 0, 0, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+};
+
+StaticNpc N(npcGroup_80242378) = {
+    .id = NPC_SPINY1,
+    .settings = &N(npcSettings_80241538),
+    .pos = { -320.0f, 0.0f, 0.0f },
+    .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
+    .yaw = 270,
+    .dropFlags = 0x80,
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 1,
+    .movement = { -320, 0, 0, 30, 0, -32767, 0, -320, 0, 0, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_3),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_4),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_9),
+        NPC_ANIM(spiny, Palette_00, Anim_6),
+        NPC_ANIM(spiny, Palette_00, Anim_8),
+        NPC_ANIM(spiny, Palette_00, Anim_7),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+        NPC_ANIM(spiny, Palette_00, Anim_1),
+    },
+};
+
+NpcGroupList N(npcGroupList_80242568) = {
+    NPC_GROUP(N(npcGroup_80242188), BATTLE_ID(24, 12, 0, 3)),
+    NPC_GROUP(N(npcGroup_80242378), BATTLE_ID(24, 13, 0, 3)),
+    NPC_GROUP(N(npcGroup_80241F98), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+static s32 N(pad_2598)[] = {
+    0x00000000, 0x00000000,
+};
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802EA0C4, 100, 60, 5, 0, MAKE_ENTITY_END);
+    MakeEntity(0x802EA588, 100, 145, 0, 0, ITEM_SHOOTING_STAR, MAKE_ENTITY_END);
+    AssignBlockFlag(SI_SAVE_FLAG(1409));
+    MakeEntity(0x802EA588, 25, 60, 0, 0, ITEM_COIN, MAKE_ENTITY_END);
+    AssignBlockFlag(SI_SAVE_FLAG(1408));
+    MakeEntity(0x802EAA54, -50, 0, 0, 90, ITEM_LETTER07, MAKE_ENTITY_END);
+});
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_8024026C_CEE4CC);
-/*
 ApiStatus N(func_8024026C_CEE4CC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024130C_CEF56C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024130C_CEF56C)) {
+        N(D_8024130C_CEF56C) = FALSE;
+        set_variable(script, *args, N(D_80241310_CEF570));
         return ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_802402C0_CEE520);
-/*
 ApiStatus N(func_802402C0_CEE520)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241310_CEF570) = get_variable(script, *args);
+    N(D_8024130C_CEF56C) = TRUE;
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_802402F8_CEE558);
+ApiStatus N(func_802402F8_CEE558)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_802426E0)[i] = ptr[i];
+        }
+        N(D_802426E0)[i] = 0;
+    } else {
+        for (i = 0; i <= 90; i++) {
+            N(D_802426E0)[i] = i + 128;
+            N(D_802426E0)[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240410_CEE670);
+void N(func_80240410_CEE670)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
 #include "world/common/set_script_owner_npc_col_height.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240728_CEE988);
+ApiStatus N(func_80240728_CEE988)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    Bytecode* args = script->ptrReadPos;
+    EnemyTerritoryThing territory;
+    EnemyTerritoryThing* territoryPtr = &territory;
+    NpcAISettings* aiSettings = get_variable(script, *args);
+    s32 var;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240B68_CEEDC8);
+    territory.unk_00 = 0;
+    territory.shape = enemy->territory->wander.detectShape;
+    territory.pointX = enemy->territory->wander.detect.x;
+    territory.pointZ = enemy->territory->wander.detect.z;
+    territory.sizeX = enemy->territory->wander.detectSizeX;
+    territory.sizeZ = enemy->territory->wander.detectSizeZ;
+    territory.unk_18 = 100.0f;
+    territory.unk_1C = 0;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240C2C_CEEE8C);
+    if (isInitialCall) {
+        enemy->varTable[6] = npc->collisionHeight;
+        enemy->varTable[8] = 0;
+        enemy->unk_B5 = 0;
+        enemy->unk_B0 |= 8;
+    }
 
-INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_80240C9C_CEEEFC);
+    if (isInitialCall || (enemy->unk_B0 & 4)) {
+        script->functionTemp[0].s = 0;
+        npc->duration = 0;
+        enemy->unk_07 = 0;
+        npc->currentAnim = enemy->animList[0];
+        npc->flags &= ~0x800;
+        npc->collisionHeight = enemy->varTable[6];
+        enemy->varTable[9] = 0;
+        if (!enemy->territory->wander.isFlying) {
+            npc->flags = (npc->flags | 0x200) & ~8;
+        } else {
+            npc->flags = (npc->flags & ~0x200) | 8;
+        }
+        if (enemy->unk_B0 & 4) {
+            script->functionTemp[0].s = 99;
+            script->functionTemp[1].s = 0;
+            fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var);
+            enemy->unk_B0 &= ~4;
+        } else if (enemy->flags & 0x40000000) {
+            script->functionTemp[0].s = 12;
+            enemy->flags &= ~0x40000000;
+        }
+    }
+
+    if (enemy->varTable[9] > 0) {
+        enemy->varTable[9]--;
+        if (enemy->varTable[9] == 0) {
+            if ((npc->currentAnim + 0xFFAAFFD2) < 2) {
+                npc->currentAnim = 0x55000C;
+            }
+        } else {
+            return ApiStatus_BLOCK;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800495A0(script, aiSettings, territoryPtr);
+            npc->collisionHeight = enemy->varTable[6];
+
+        case 1:
+            func_800496B8(script, aiSettings, territoryPtr);
+            break;
+
+        case 2:
+            base_UnkNpcAIFunc1(script, aiSettings, territoryPtr);
+            if (enemy->varTable[7] == 6) {
+                if (rand_int(100) < 0x21) {
+                    if (enemy->varTable[8] != 0) {
+                        enemy->varTable[8] = 0;
+                        enemy->unk_B5 = 0;
+                        npc->currentAnim = 0x55002F;
+                    } else {
+                        enemy->varTable[8] = 1;
+                        enemy->unk_B5 = 1;
+                        npc->currentAnim = 0x55002E;
+                    }
+                    enemy->varTable[9] = 7;
+                    return ApiStatus_BLOCK;
+                }
+            }
+
+        case 3:
+            func_80049C04(script, aiSettings, territoryPtr);
+            break;
+
+        case 12:
+            N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr);
+
+        case 13:
+            N(func_80240410_CEE670)(script, aiSettings, territoryPtr);
+            break;
+
+        case 14:
+            N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr);
+            break;
+
+        case 15:
+            N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr);
+            break;
+
+        case 99:
+            func_8004A73C(script);
+            break;
+
+    }
+
+    if (enemy->varTable[7] == 6) {
+        if (enemy->varTable[8] != 0) {
+            enemy->unk_B5 = 1;
+        } else {
+            enemy->unk_B5 = 0;
+        }
+        if (enemy->varTable[8] != 0) {
+            switch (npc->currentAnim + 0xFFAAFFFC) {
+                case 0:
+                case 8:
+                case 10:
+                case 12:
+                case 14:
+                case 18:
+                case 20:
+                    npc->currentAnim++;
+                    break;
+            }
+        }
+    }
+
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus N(func_80240B68_CEEDC8)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 itemIdx = get_variable(script, *args++);
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    ItemEntity* item = get_item_entity(itemIdx);
+
+    item->position.x = var1;
+    item->position.y = var2;
+    item->position.z = var3;
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240C2C_CEEE8C)(ScriptInstance *script, s32 isInitialCall) {
+    s32 itemId = get_variable(script, *script->ptrReadPos);
+    StaticItem* item = &gItemTable[itemId];
+
+    if (itemId == ITEM_YUMMY_MEAL) {
+        script->varTable[9] = 2;
+    } else if (item->typeFlags & 0x80) {
+        script->varTable[9] = 1;
+    } else {
+        script->varTable[9] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80240C9C_CEEEFC)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
+
+    for (i = 0; i <= 90; i++) {
+        N(D_80242850)[i] = 128 + i;
+    }
+
+    N(D_802429BC) = 0;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_23/flo_23.h b/src/world/area_flo/flo_23/flo_23.h
index 0fdf8dc233..8e4db7095c 100644
--- a/src/world/area_flo/flo_23/flo_23.h
+++ b/src/world/area_flo/flo_23/flo_23.h
@@ -2,3 +2,18 @@
 #include "map.h"
 
 #define NAMESPACE flo_23
+
+ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CEE260)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024026C_CEE4CC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802402C0_CEE520)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_802402F8_CEE558)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240728_CEE988)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240B68_CEEDC8)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240C2C_CEEE8C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240C9C_CEEEFC)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CEE260)(ScriptInstance *script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80242568);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_flo/flo_24/CF0940.c b/src/world/area_flo/flo_24/CF0940.c
index 35c3a4cac3..8ee59ac7a3 100644
--- a/src/world/area_flo/flo_24/CF0940.c
+++ b/src/world/area_flo/flo_24/CF0940.c
@@ -1,3 +1,8 @@
 #include "flo_24.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_24/CF0940", func_80240000_CF0940);
+void func_80072950();
+
+ApiStatus N(func_80240000_CF0940)(ScriptInstance* script, s32 isInitialCall) {
+    func_80072950(1, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c
index 9798fce5a3..524408f0b2 100644
--- a/src/world/area_flo/flo_24/CF0980.c
+++ b/src/world/area_flo/flo_24/CF0980.c
@@ -1,4 +1,364 @@
 #include "flo_24.h"
+#include "message_ids.h"
+
+EntryList N(entryList) = {
+    { -455.0f, 0.0f, 0.0f,  90.0f },
+    {  455.0f, 0.0f, 0.0f, 270.0f },
+    {  455.0f, 0.0f, 0.0f, 270.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_24_tattle },
+};
+
+Script N(80240600) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+    } else {
+        SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+    }
+    if (STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) {
+        PlaySound(0x80000022);
+    }
+});
+
+Script N(80240690) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_8024093C) = EXIT_WALK_SCRIPT(60,  0, "flo_08",  1);
+
+Script N(exitWalk_80240998) = EXIT_WALK_SCRIPT(60,  1, "flo_10",  0);
+
+Script N(802409F4) = SCRIPT({
+    bind N(exitWalk_8024093C) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_80240998) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    await N(makeEntities);
+    func_802C971C(93);
+    func_802C971C(100);
+    spawn N(80241728);
+    spawn N(80241ABC);
+    ModifyColliderFlags(3, 29, 0x00000004);
+    ModifyColliderFlags(3, 27, 0x00000004);
+    ModifyColliderFlags(3, 28, 0x00000004);
+    ModifyColliderFlags(0, 29, 0x00080000);
+    ModifyColliderFlags(0, 27, 0x00080000);
+    ModifyColliderFlags(0, 28, 0x00080000);
+    ModifyColliderFlags(3, 23, 0x00000001);
+    SI_VAR(0) = -480;
+    SI_VAR(1) = -350;
+    SI_VAR(2) = -65;
+    SI_VAR(3) = -260;
+    SI_VAR(4) = 0;
+    spawn N(80240690);
+    SI_VAR(0) = 100;
+    SI_VAR(1) = -350;
+    SI_VAR(2) = 480;
+    SI_VAR(3) = -260;
+    SI_VAR(4) = 0;
+    spawn N(80240690);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) == 2) {
+        spawn N(8024183C);
+        spawn N(802409F4);
+    } else {
+        SI_VAR(0) = N(802409F4);
+        spawn EnterWalk;
+    }
+    await N(80240600);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CF0940)();
+    }
+});
+
+static s32 N(pad_D38)[] = {
+    0x00000000, 0x00000000,
+};
 
 #include "world/common/foliage.inc.c"
 
+FoliageModelList N(tree1_Leaves) = {
+    .count = 6,
+    .models = { 20, 18, 21, 22, 23, 19 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 17 }
+};
+
+FoliageDropList N(tree1_Drops) = {
+    .count = 2,
+    .drops = {
+        {
+            .itemID = ITEM_BUBBLE_BERRY,
+            .pos = { -38, 87, -156 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(31),
+        },
+        {
+            .itemID = ITEM_BUBBLE_BERRY,
+            .pos = { 39, 65, -208 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(32),
+        },
+    }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .drops = &N(tree1_Drops),
+};
+
+Vec4f N(triggerCoord_80241718) = { 1.0f, 0.0f, -192.0f, 0.0f };
+
+Script N(80241728) = SCRIPT({
+    SI_AREA_FLAG(31) = 0;
+    SI_AREA_FLAG(32) = 0;
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 13;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_80241718);
+});
+
+Script N(updateTexturePan_802417A0) = SCRIPT({
+    group 0;
+    if (SI_VAR(5) == 1) {
+        if (SI_VAR(6) == 1) {
+            if (SI_VAR(7) == 1) {
+                if (SI_VAR(8) == 1) {
+                    N(UnkTexturePanFunc)();
+                    return;
+                }
+            }
+        }
+    }
+    N(UnkTexturePanFunc2)();
+});
+
+const char N(flo_10_name_hack)[];
+
+// *INDENT-OFF*
+Script N(8024183C) = {
+    SI_CMD(ScriptOpcode_CALL, DisablePlayerInput, 1),
+    SI_CMD(ScriptOpcode_CALL, TranslateGroup, 100, 0, 45, 0),
+    SI_CMD(ScriptOpcode_CALL, UseSettingsFrom, 0, 170, 0, 160),
+    SI_CMD(ScriptOpcode_CALL, SetPanTarget, 0, 170, -90, 160),
+    SI_CMD(ScriptOpcode_CALL, SetCamDistance, 0, 800),
+    SI_CMD(ScriptOpcode_CALL, SetCamPitch, 0, SI_FIXED(18.5), SI_FIXED(-7.5)),
+    SI_CMD(ScriptOpcode_CALL, SetCamPosA, 0, SI_FIXED(-300.0), SI_FIXED(200.0)),
+    SI_CMD(ScriptOpcode_CALL, SetCamPosB, 0, SI_FIXED(300.0), SI_FIXED(-150.0)),
+    SI_CMD(ScriptOpcode_CALL, SetCamSpeed, 0, SI_FIXED(90.0)),
+    SI_CMD(ScriptOpcode_CALL, PanToTarget, 0, 0, 1),
+    SI_CMD(ScriptOpcode_CALL, PlaySound, 0x80000050),
+    SI_CMD(ScriptOpcode_SPAWN_THREAD),
+        SI_CMD(ScriptOpcode_CALL, MakeLerp, 80, 90, 10, 0),
+        SI_CMD(ScriptOpcode_LABEL, 0),
+        SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+        SI_CMD(ScriptOpcode_CALL, RotateModel, 101, SI_VAR(0), 1, 0, 0),
+        SI_CMD(ScriptOpcode_CALL, RotateModel, 103, SI_VAR(0), 1, 0, 0),
+        SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 1),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+            SI_CMD(ScriptOpcode_GOTO, 0),
+        SI_CMD(ScriptOpcode_END_IF),
+        SI_CMD(ScriptOpcode_SPAWN_THREAD),
+            SI_CMD(ScriptOpcode_CALL, MakeLerp, 45, 100, 150, 0),
+            SI_CMD(ScriptOpcode_LOOP, 0),
+                SI_CMD(ScriptOpcode_CALL, UpdateLerp),
+                SI_CMD(ScriptOpcode_CALL, TranslateGroup, 100, 0, SI_VAR(0), 0),
+                SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1),
+                SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 0),
+                    SI_CMD(ScriptOpcode_BREAK_LOOP),
+                SI_CMD(ScriptOpcode_END_IF),
+            SI_CMD(ScriptOpcode_END_LOOP),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 30),
+            SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(0), 49),
+            SI_CMD(ScriptOpcode_CALL, GotoMap, N(flo_10_name_hack), 2),
+            SI_CMD(ScriptOpcode_SLEEP_FRAMES, 100),
+            SI_CMD(ScriptOpcode_RETURN),
+            SI_CMD(ScriptOpcode_END)
+        };
+        // *INDENT-ON*
+
+Script N(80241ABC) = SCRIPT({
+    if (STORY_PROGRESS < STORY_CH6_FILLED_SPRING_WITH_WATER) {
+        EnableGroup(94, 0);
+        ModifyColliderFlags(0, 30, 0x7FFFFE00);
+    } else {
+        EnableGroup(65, 0);
+    }
+    GetEntryID(SI_VAR(0));
+    if (SI_VAR(0) != 2) {
+        EnableGroup(105, 0);
+    }
+    EnableTexPanning(89, 1);
+    EnableTexPanning(97, 1);
+    EnableTexPanning(90, 1);
+    EnableTexPanning(98, 1);
+    EnableTexPanning(91, 1);
+    EnableTexPanning(92, 1);
+    EnableTexPanning(101, 1);
+    EnableTexPanning(103, 1);
+    EnableTexPanning(99, 1);
+    spawn {
+        SI_VAR(0) = 1;
+        SI_VAR(1) = 140;
+        SI_VAR(2) = -80;
+        SI_VAR(3) = -70;
+        SI_VAR(4) = 100;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 1;
+        SI_VAR(8) = 1;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802417A0);
+    }
+    spawn {
+        SI_VAR(0) = 2;
+        SI_VAR(1) = -70;
+        SI_VAR(2) = 100;
+        SI_VAR(3) = 100;
+        SI_VAR(4) = -40;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 1;
+        SI_VAR(8) = 1;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802417A0);
+    }
+    spawn {
+        SI_VAR(0) = 3;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -800;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802417A0);
+    }
+    spawn {
+        SI_VAR(0) = 4;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -800;
+        SI_VAR(3) = -200;
+        SI_VAR(4) = 100;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 1;
+        SI_VAR(8) = 1;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802417A0);
+    }
+    spawn {
+        SI_VAR(0) = 5;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -2500;
+        SI_VAR(3) = 0;
+        SI_VAR(4) = 0;
+        SI_VAR(5) = 0;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 0;
+        SI_VAR(8) = 0;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802417A0);
+    }
+    spawn {
+        SI_VAR(0) = 6;
+        SI_VAR(1) = 0;
+        SI_VAR(2) = -2500;
+        SI_VAR(3) = -200;
+        SI_VAR(4) = 100;
+        SI_VAR(5) = 1;
+        SI_VAR(6) = 1;
+        SI_VAR(7) = 1;
+        SI_VAR(8) = 1;
+        SI_VAR(9) = 0;
+        SI_VAR(10) = 0;
+        SI_VAR(11) = 0;
+        SI_VAR(12) = 0;
+        spawn N(updateTexturePan_802417A0);
+    }
+});
+
+static s32 N(pad_21A4)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802EA564, -325, 60, -140, 0, ITEM_DIZZY_DIAL, MAKE_ENTITY_END);
+    AssignBlockFlag(SI_SAVE_FLAG(1393));
+    MakeEntity(0x802EA588, 325, 60, -140, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END);
+    AssignBlockFlag(SI_SAVE_FLAG(1394));
+    MakeEntity(0x802EAB04, 335, 0, -160, 0, ITEM_MAP, MAKE_ENTITY_END);
+    AssignPanelFlag(SI_SAVE_FLAG(1406));
+});
+
+const char N(flo_10_name_hack)[] = "flo_10";
diff --git a/src/world/area_flo/flo_24/flo_24.h b/src/world/area_flo/flo_24/flo_24.h
index ca656418e8..8fa6a0f07d 100644
--- a/src/world/area_flo/flo_24/flo_24.h
+++ b/src/world/area_flo/flo_24/flo_24.h
@@ -2,3 +2,14 @@
 #include "map.h"
 
 #define NAMESPACE flo_24
+
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkTexturePanFunc2)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CF0940)(ScriptInstance* script, s32 isInitialCall);
+
+extern Script N(80241728);
+extern Script N(8024183C);
+extern Script N(80241ABC);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_flo/flo_25/CF2BD0.c b/src/world/area_flo/flo_25/CF2BD0.c
index 771f6e12e1..5f2034a912 100644
--- a/src/world/area_flo/flo_25/CF2BD0.c
+++ b/src/world/area_flo/flo_25/CF2BD0.c
@@ -1,3 +1,8 @@
 #include "flo_25.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2BD0", func_80240000_CF2BD0);
+void func_80072950();
+
+ApiStatus N(func_80240000_CF2BD0)(ScriptInstance *script, s32 isInitialCall) {
+    func_80072950(0, 0, 0, 0, 0, 0);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c
index da92a8c11d..e3fab04f4e 100644
--- a/src/world/area_flo/flo_25/CF2C10.c
+++ b/src/world/area_flo/flo_25/CF2C10.c
@@ -1,7 +1,507 @@
 #include "flo_25.h"
+#include "message_ids.h"
+#include "sprite/npc/bzzap.h"
+#include "sprite/npc/gate_flower.h"
+#include "sprite/npc/tuff_puff.h"
+
+enum {
+    NPC_GATE_FLOWER,
+    NPC_TUFF_PUFF,
+    NPC_BZZAP,
+};
+
+static s32 N(D_80244A20)[91];
+static s32 N(D_80245110)[91];
+static s32 N(D_8024527C);
+
+EntryList N(entryList) = {
+    {  620.0f, 0.0f, 0.0f, 270.0f },
+    { -620.0f, 0.0f, 0.0f,  90.0f },
+};
+
+MapConfig N(config) = {
+    .main = &N(main),
+    .entryList = &N(entryList),
+    .entryCount = ENTRY_COUNT(N(entryList)),
+    .background = &gBackgroundImage,
+    .tattle = { MSG_flo_25_tattle },
+};
+
+Script N(80242330) = SCRIPT({
+    match STORY_PROGRESS {
+        < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8);
+        }
+        else {
+            SetMusicTrack(0, SONG_FLOWER_FIELDS_SUNNY, 0, 8);
+        }
+    }
+});
+
+Script N(802423A0) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(exitWalk_8024264C) = EXIT_WALK_SCRIPT(60,  0, "flo_00",  3);
+
+Script N(exitWalk_802426A8) = EXIT_WALK_SCRIPT(60,  1, "flo_07",  0);
+
+Script N(80242704) = SCRIPT({
+    bind N(exitWalk_802426A8) to TRIGGER_FLOOR_ABOVE 0;
+    bind N(exitWalk_8024264C) to TRIGGER_FLOOR_ABOVE 4;
+});
+
+Script N(main) = SCRIPT({
+    WORLD_LOCATION = LOCATION_FLOWER_FIELDS;
+    SetSpriteShading(-1);
+    SetCamLeadPlayer(0, 0);
+    SetCamPerspective(0, 3, 25, 16, 4096);
+    SetCamBGColor(0, 0, 0, 0);
+    SetCamEnabled(0, 1);
+    MakeNpcs(0, N(npcGroupList_80243C5C));
+    await N(makeEntities);
+    spawn N(80244D0C);
+    spawn N(802446BC);
+    SI_VAR(0) = -270;
+    SI_VAR(1) = -190;
+    SI_VAR(2) = 640;
+    SI_VAR(3) = -60;
+    SI_VAR(4) = 60;
+    spawn N(802423A0);
+    ModifyColliderFlags(0, 1, 0x7FFFFE00);
+    ModifyColliderFlags(0, 5, 0x7FFFFE00);
+    SI_VAR(0) = N(80242704);
+    spawn EnterWalk;
+    await N(80242330);
+    if (STORY_PROGRESS >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) {
+        N(func_80240000_CF2BD0)();
+    }
+});
+
+NpcSettings N(npcSettings_802428F0) = {
+    .height = 56,
+    .radius = 40,
+    .level = 99,
+};
+
+f32 N(D_8024291C_CF54EC)[] = {
+     4.5f, 3.5f, 2.6f, 2.0f,
+     1.5f, 20.0f,
+};
+
+NpcAISettings N(npcAISettings_80242934) = {
+    .moveSpeed = 1.0f,
+    .moveTime = 45,
+    .waitTime = 60,
+    .alertRadius = 100.0f,
+    .unk_14 = 3,
+    .chaseSpeed = 3.6f,
+    .unk_1C = { .s = 10 },
+    .unk_20 = 1,
+    .chaseRadius = 120.0f,
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80242964) = SCRIPT({
+    SetSelfVar(0, 1);
+    SetSelfVar(5, 0);
+    SetSelfVar(6, 0);
+    SetSelfVar(1, 600);
+    N(func_80241944_CF4514)(N(npcAISettings_80242934));
+});
+
+NpcSettings N(npcSettings_802429D4) = {
+    .height = 24,
+    .radius = 28,
+    .ai = &N(npcAI_80242964),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+NpcAISettings N(npcAISettings_80242A00) = {
+    .moveSpeed = 1.0f,
+    .moveTime = 30,
+    .waitTime = 5,
+    .alertRadius = 80.0f,
+    .unk_10 = { .f = 30.0f },
+    .unk_14 = 2,
+    .chaseSpeed = 4.5f,
+    .unk_1C = { .s = 6 },
+    .unk_20 = 1,
+    .chaseRadius = 90.0f,
+    .unk_28 = { .f = 30.0f },
+    .unk_2C = 1,
+};
+
+Script N(npcAI_80242A30) = SCRIPT({
+    SetSelfVar(0, 0);
+    SetSelfVar(5, -630);
+    SetSelfVar(6, 50);
+    SetSelfVar(1, 200);
+    N(func_8024134C_CF3F1C)(N(npcAISettings_80242A00));
+});
+
+NpcSettings N(npcSettings_80242AA0) = {
+    .height = 26,
+    .radius = 24,
+    .ai = &N(npcAI_80242A30),
+    .onHit = EnemyNpcHit,
+    .onDefeat = EnemyNpcDefeat,
+    .level = 19,
+};
+
+s32 N(D_80242ACC_CF569C) = {
+    0x00000000,
+};
+
+s32 N(D_80242AD0_CF56A0) = {
+    0x00000000,
+};
+
+Script N(80242AD4) = SCRIPT({
+    SI_VAR(9) = SI_VAR(1);
+    func_802D663C();
+    SI_VAR(10) = SI_VAR(0);
+    match SI_VAR(0) {
+        == 0 {}
+        == -1 {}
+        else {
+            RemoveItemAt(SI_VAR(1));
+            GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
+            MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
+            SetPlayerAnimation(0x60005);
+            sleep 30;
+            SetPlayerAnimation(ANIM_10002);
+            RemoveItemEntity(SI_VAR(0));
+        }
+    }
+    N(func_80241DAC_CF497C)(SI_VAR(10));
+    func_802D6954();
+    unbind;
+});
+
+Script N(80242C08) = {
+    SI_CMD(ScriptOpcode_CALL, N(func_80241DE4_CF49B4), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80242AD4), 0x10, 0, N(D_80244A20), 0, 1),
+    SI_CMD(ScriptOpcode_CALL, N(func_80241D58_CF4928), SI_VAR(0)),
+    SI_CMD(ScriptOpcode_RETURN),
+    SI_CMD(ScriptOpcode_END)
+};
+
+Script N(interact_80242C58) = SCRIPT({
+    DisablePlayerInput(TRUE);
+    if (SI_SAVE_FLAG(1363) == 0) {
+        GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2));
+        SetCamDistance(0, 350);
+        SetCamPitch(0, 18.5, -7.5);
+        SetCamSpeed(0, 4.0);
+        PanToTarget(0, 0, 1);
+        WaitForCam(0, 1.0);
+        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_2), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003B));
+        SetPlayerAnimation(ANIM_THINKING);
+        N(func_80241FB4_CF4B84)();
+        SI_VAR(0) = 0x80245110;
+        SI_VAR(1) = 0;
+        await N(80242C08);
+        match SI_VAR(0) {
+            <= 0 {
+                SetPlayerAnimation(ANIM_STAND_STILL);
+                SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_2), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003C));
+            }
+            else {
+                SI_VAR(8) = SI_VAR(0);
+                N(func_80241F44_CF4B14)(SI_VAR(0));
+                MakeItemEntity(SI_VAR(8), 505, 20, -24, 1, 0);
+                SI_VAR(7) = SI_VAR(0);
+                PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0);
+                SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_3));
+                sleep 20;
+                RemoveItemEntity(SI_VAR(7));
+                match SI_VAR(8) {
+                    == 159 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003F));
+                        PlaySoundAtNpc(NPC_SELF, 0x21C, 0);
+                        EndSpeech(-1, NPC_ANIM(gate_flower, Palette_01, Anim_9), NPC_ANIM(gate_flower, Palette_01, Anim_8), 0);
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_7));
+                        PlaySoundAtCollider(14, 457, 0);
+                        ModifyColliderFlags(0, 14, 0x7FFFFE00);
+                        MakeLerp(0, 100, 30, 1);
+                        loop {
+                            UpdateLerp();
+                            SI_VAR(8) = (float) SI_VAR(0);
+                            SI_VAR(9) = (float) SI_VAR(0);
+                            SI_VAR(8) *= 0.5;
+                            SI_VAR(9) *= 1.2001953125;
+                            RotateModel(86, SI_VAR(8), 0, -1, 0);
+                            RotateModel(87, SI_VAR(8), 0, -1, 0);
+                            RotateModel(88, SI_VAR(8), 0, -1, 0);
+                            RotateModel(82, SI_VAR(9), 0, 1, 0);
+                            RotateModel(83, SI_VAR(9), 0, 1, 0);
+                            RotateModel(84, SI_VAR(9), 0, 1, 0);
+                            sleep 1;
+                            if (SI_VAR(1) != 1) {
+                                break loop;
+                            }
+                        }
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_5));
+                        SI_SAVE_FLAG(1363) = 1;
+                    }
+                    == 160 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003E));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1));
+                    }
+                    == 158 {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003E));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1));
+                    }
+                    else {
+                        SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003D));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_6));
+                        PlaySoundAtNpc(NPC_SELF, 0x2096, 0);
+                        MakeItemEntity(SI_VAR(8), -125, 20, 0, 1, 0);
+                        SI_VAR(7) = SI_VAR(0);
+                        sleep 5;
+                        GetAngleToPlayer(-1, SI_VAR(0));
+                        if (SI_VAR(0) < 180) {
+                            MakeLerp(0, 100, 7, 0);
+                            loop {
+                                UpdateLerp();
+                                SI_VAR(2) = -0.5;
+                                SI_VAR(3) = -0.19921875;
+                                SI_VAR(4) = 0.900390625;
+                                SI_VAR(2) *= (float) SI_VAR(0);
+                                SI_VAR(3) *= (float) SI_VAR(0);
+                                SI_VAR(4) *= (float) SI_VAR(0);
+                                SI_VAR(2) += 500.0;
+                                SI_VAR(3) += 15.0;
+                                SI_VAR(4) += -20.0;
+                                N(func_80241E80_CF4A50)(SI_VAR(7), SI_VAR(2), SI_VAR(3), SI_VAR(4));
+                                sleep 1;
+                                if (SI_VAR(1) != 1) {
+                                    break loop;
+                                }
+                            }
+                        } else {
+                            MakeLerp(0, 100, 7, 0);
+                            loop {
+                                UpdateLerp();
+                                SI_VAR(2) = 0.5;
+                                SI_VAR(3) = -0.19921875;
+                                SI_VAR(4) = 0.900390625;
+                                SI_VAR(2) *= (float) SI_VAR(0);
+                                SI_VAR(3) *= (float) SI_VAR(0);
+                                SI_VAR(4) *= (float) SI_VAR(0);
+                                SI_VAR(2) += 510.0;
+                                SI_VAR(3) += 15.0;
+                                SI_VAR(4) += -20.0;
+                                N(func_80241E80_CF4A50)(SI_VAR(7), SI_VAR(2), SI_VAR(3), SI_VAR(4));
+                                sleep 1;
+                                if (SI_VAR(1) != 1) {
+                                    break loop;
+                                }
+                            }
+                        }
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1));
+                        RemoveItemEntity(SI_VAR(7));
+                        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1));
+                        EndSpeech(-1, NPC_ANIM(gate_flower, Palette_01, Anim_2), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0);
+                    }
+                }
+            }
+        }
+        spawn {
+            ResetCam(0, 6.0);
+        }
+        sleep 10;
+    } else {
+        if (STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_9), NPC_ANIM(gate_flower, Palette_01, Anim_8), 0, MESSAGE_ID(0x11, 0x0040));
+        } else {
+            SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_9), NPC_ANIM(gate_flower, Palette_01, Anim_8), 0, MESSAGE_ID(0x11, 0x0041));
+        }
+    }
+    DisablePlayerInput(FALSE);
+    unbind;
+});
+
+Script N(init_80243564) = SCRIPT({
+    BindNpcInteract(NPC_SELF, N(interact_80242C58));
+    if (SI_SAVE_FLAG(1363) == 1) {
+        SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_5));
+        ModifyColliderFlags(0, 14, 0x7FFFFE00);
+        RotateModel(86, 50, 0, -1, 0);
+        RotateModel(87, 50, 0, -1, 0);
+        RotateModel(88, 50, 0, -1, 0);
+        RotateModel(82, 120, 0, 1, 0);
+        RotateModel(83, 120, 0, 1, 0);
+        RotateModel(84, 120, 0, 1, 0);
+    }
+});
+
+StaticNpc N(npcGroup_8024368C) = {
+    .id = NPC_GATE_FLOWER,
+    .settings = &N(npcSettings_802428F0),
+    .pos = { 505.0f, 0.0f, -25.0f },
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
+    .init = &N(init_80243564),
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .heartDrops = NO_DROPS,
+    .flowerDrops = NO_DROPS,
+    .animations = {
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+        NPC_ANIM(gate_flower, Palette_01, Anim_1),
+    },
+    .tattle = MESSAGE_ID(0x1A, 0x00DA),
+};
+
+StaticNpc N(npcGroup_8024387C) = {
+    .id = NPC_TUFF_PUFF,
+    .settings = &N(npcSettings_802429D4),
+    .pos = { -200.0f, 45.0f, 0.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 10,
+    .itemDrops = {
+        { ITEM_THUNDER_RAGE, 10, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(2),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .maxCoinBonus = 2,
+    .movement = { -200, 45, 0, 30, 0, -32767, 0, -200, 45, 0, 200 },
+    .animations = {
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_0),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_6),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_5),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+        NPC_ANIM(tuff_puff, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+StaticNpc N(npcGroup_80243A6C) = {
+    .id = NPC_BZZAP,
+    .settings = &N(npcSettings_80242AA0),
+    .pos = { 150.0f, 55.0f, 0.0f },
+    .flags = NPC_FLAG_LOCK_ANIMS,
+    .yaw = 90,
+    .dropFlags = 0x80,
+    .itemDropChance = 15,
+    .itemDrops = {
+        { ITEM_MAPLE_SYRUP, 6, 0 },
+        { ITEM_HONEY_SYRUP, 4, 0 },
+    },
+    .heartDrops = STANDARD_HEART_DROPS(3),
+    .flowerDrops = STANDARD_FLOWER_DROPS(2),
+    .minCoinBonus = 1,
+    .maxCoinBonus = 4,
+    .movement = { 150, 50, 0, 30, 0, -32767, 0, 150, 50, 0, 200, 0, 0, 1 },
+    .animations = {
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_3),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_6),
+        NPC_ANIM(bzzap, Palette_00, Anim_4),
+        NPC_ANIM(bzzap, Palette_00, Anim_2),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+        NPC_ANIM(bzzap, Palette_00, Anim_1),
+    },
+    .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00},
+};
+
+NpcGroupList N(npcGroupList_80243C5C) = {
+    NPC_GROUP(N(npcGroup_8024387C), BATTLE_ID(24, 34, 0, 6)),
+    NPC_GROUP(N(npcGroup_80243A6C), BATTLE_ID(24, 26, 0, 2)),
+    NPC_GROUP(N(npcGroup_8024368C), BATTLE_ID(0, 0, 0, 0)),
+    {},
+};
+
+static s32 N(pad_3C8C) = {
+    0x00000000,
+};
+
+Script N(makeEntities) = SCRIPT({
+    MakeEntity(0x802EAB04, -390, 0, 0, 0, ITEM_MAP, MAKE_ENTITY_END);
+    AssignPanelFlag(SI_SAVE_FLAG(1407));
+});
+
+static s32 N(pad_3CD8)[] = {
+    0x00000000, 0x00000000,
+};
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240040_CF2C10);
-/*
 void N(func_80240040_CF2C10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
@@ -25,9 +525,150 @@ void N(func_80240040_CF2C10)(ScriptInstance* script, NpcAISettings* aiSettings,
     enemy->varTable[4] = npc->pos.y * 100.0;
     script->functionTemp[0].s = 1;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802401F0_CF2DC0);
+#ifdef NON_MATCHING
+// second func_800DCB7C call
+void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 temp_f24;
+    f32 posX, posY, posZ, posW;
+    s32 var;
+    f32 temp_f0;
+    f32 phi_f4;
+    s32 phi_v0;
+    s32 phi_s4 = 0;
+
+    f32 a = enemy->varTable[7];
+    f32 temp_f2  = a / 100.0;
+    f32 b = enemy->varTable[3];
+    f32 temp_f26 = b / 100.0;
+    f32 c = enemy->varTable[4];
+    f32 temp_f20 = c / 100.0;
+    f32 d = enemy->varTable[1];
+    f32 temp_f22 = d / 100.0;
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    temp_f24 = temp_f26 + temp_f2;
+
+    if ((enemy->varTable[0] & 0x11) == 1) {
+        if (npc->flags & 8) {
+            if (temp_f22 < (temp_f24 - npc->pos.y)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            if (temp_f22 < (temp_f26 - posW)) {
+                enemy->varTable[0] |= 0x10;
+            }
+        }
+    }
+
+    if ((enemy->varTable[0] & 0x11) == 0x11) {
+        f64 test;
+        if (npc->flags & 8) {
+            phi_f4 = temp_f24;
+            test = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            npc->pos.y = test;
+        } else {
+            posX = npc->pos.x;
+            posY = temp_f20;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+            phi_f4 = posY;
+            phi_f4 += temp_f26;
+            d = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+            test = d;
+            npc->pos.y = test;
+            //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+        }
+        //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09);
+
+        if (fabsf(phi_f4 - npc->pos.y) < 1.0) {
+            npc->pos.y = phi_f4;
+            enemy->varTable[0] &= ~0x10;
+        }
+    } else if (enemy->varTable[1] > 0) {
+        temp_f0 = sin_deg(enemy->varTable[2]);
+        if (npc->flags & 8) {
+            phi_v0 = FALSE;
+        } else {
+            posX = npc->pos.x;
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
+            posW = 1000.0f;
+            phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
+        }
+        if (phi_v0) {
+            npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22);
+        } else {
+            npc->pos.y = temp_f24 + (temp_f0 * temp_f22);
+        }
+        enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10);
+    }
+
+    if (enemy->varTable[9] <= 0) {
+        if (aiSettings->unk_14 >= 0) {
+            if (script->functionTemp[1].s <= 0) {
+                script->functionTemp[1].s = aiSettings->unk_14;
+                if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
+                    func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
+                    fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
+                    npc->moveToPos.y = npc->pos.y;
+                    func_800494C0(npc, 0x2F4, 0x200000);
+                    if (enemy->npcSettings->unk_2A & 1) {
+                        script->functionTemp[0].s = 10;
+                    } else {
+                        script->functionTemp[0].s = 12;
+                    }
+                    return;
+                }
+            }
+            script->functionTemp[1].s--;
+        }
+    } else {
+        enemy->varTable[9]--;
+    }
+
+    if (is_point_within_region(enemy->territory->wander.wanderShape,
+            enemy->territory->wander.point.x, enemy->territory->wander.point.z,
+            npc->pos.x, npc->pos.z,
+            enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) {
+        posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z);
+        if (npc->moveSpeed < posW) {
+            npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z);
+            phi_s4 = 1;
+        }
+    }
+
+    if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        } else {
+            return;
+        }
+    }
+
+    enemy->varTable[4] = npc->pos.y * 100.0;
+    if (aiSettings->moveTime > 0) {
+        if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+            script->functionTemp[0].s = 2;
+            script->functionTemp[1].s = (rand_int(1000) % 3) + 2;
+            if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) {
+                script->functionTemp[0].s = 0;
+            }
+        }
+    }
+}
+#else
+INCLUDE_ASM(void, "world/area_flo/flo_25/CF2C10", flo_25_func_802401F0_CF2DC0, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory);
+#endif
 
 #include "world/common/UnkNpcAIFunc1.inc.c"
 
@@ -35,18 +676,15 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802401F0_CF2DC0);
 
 #include "world/common/UnkNpcAIFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240C94_CF3864);
-/*
 void N(func_80240C94_CF3864)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_8024291C_CF54EC)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
 }
-*/
 
 #include "world/common/UnkNpcAIFunc14.inc.c"
 
@@ -56,8 +694,6 @@ void N(func_80240C94_CF3864)(ScriptInstance* script, NpcAISettings* aiSettings,
 
 #include "world/common/UnkFunc5.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_8024134C_CF3F1C);
-/*
 ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Bytecode* args = script->ptrReadPos;
@@ -72,11 +708,11 @@ ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80241228_CF3DF8)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
     }
 
     npc->unk_AB = -2;
@@ -97,7 +733,7 @@ ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802408D8_CF34A8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -111,22 +747,62 @@ ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall) {
             N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80240E98_CF3A68)(script, aiSettings, territoryPtr);
+            N(UnkFunc6)(script, aiSettings, territoryPtr);
             break;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241668_CF4238);
+void N(func_80241668_CF4238)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    s32 flag;
+    f32 temp_f6;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802418E8_CF44B8);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0].s = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
+
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((func_800DCB7C(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0].s = 12;
+}
+
+#include "world/common/UnkFunc45.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241944_CF4514);
-/*
 ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) {
     Enemy* enemy = script->owner1.enemy;
     Bytecode* args = script->ptrReadPos;
@@ -141,11 +817,12 @@ ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
-        N(func_80241228_CF3DF8)(npc, enemy, script, aiSettings);
+        N(UnkFunc5)(npc, enemy, script, aiSettings);
+        script->functionTemp[0].s = 0;
     }
 
     npc->unk_AB = -2;
@@ -166,7 +843,7 @@ ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) {
         case 2:
             N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr);
         case 3:
-            N(func_802408D8_CF34A8)(script, aiSettings, territoryPtr);
+            N(UnkFunc4)(script, aiSettings, territoryPtr);
             break;
         case 10:
             N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr);
@@ -175,61 +852,101 @@ ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) {
             break;
         case 12:
             N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr);
-            break;
         case 13:
             N(func_80241668_CF4238)(script, aiSettings, territoryPtr);
             break;
-        case 14:
-            N(func_802418E8_CF44B8)(script, aiSettings, territoryPtr);
+        case 20:
+            N(UnkFunc45)(script, aiSettings, territoryPtr);
             break;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241D58_CF4928);
-/*
 ApiStatus N(func_80241D58_CF4928)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80242ACC_CF569C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80242ACC_CF569C)) {
+        N(D_80242ACC_CF569C) = FALSE;
+        set_variable(script, *args, N(D_80242AD0_CF56A0));
         return ApiStatus_DONE2;
     }
 
     return ApiStatus_BLOCK;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241DAC_CF497C);
-/*
 ApiStatus N(func_80241DAC_CF497C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80242AD0_CF56A0) = get_variable(script, *args);
+    N(D_80242ACC_CF569C) = TRUE;
     return ApiStatus_DONE2;
 }
-*/
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241DE4_CF49B4);
+ApiStatus N(func_80241DE4_CF49B4)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241E80_CF4A50);
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i <= 90; i++) {
+            N(D_80244A20)[i] = i + 128;
+            N(D_80244A20)[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241F44_CF4B14);
+ApiStatus N(func_80241E80_CF4A50)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 itemIdx = get_variable(script, *args++);
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    ItemEntity* item = get_item_entity(itemIdx);
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241FB4_CF4B84);
+    item->position.x = var1;
+    item->position.y = var2;
+    item->position.z = var3;
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241F44_CF4B14)(ScriptInstance *script, s32 isInitialCall) {
+    s32 itemId = get_variable(script, *script->ptrReadPos);
+    StaticItem* item = &gItemTable[itemId];
+
+    if (itemId == ITEM_YUMMY_MEAL) {
+        script->varTable[9] = 2;
+    } else if (item->typeFlags & 0x80) {
+        script->varTable[9] = 1;
+    } else {
+        script->varTable[9] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(func_80241FB4_CF4B84)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
+
+    for (i = 0; i <= 90; i++) {
+        N(D_80245110)[i] = 128 + i;
+    }
+
+    N(D_8024527C) = 0;
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_25/CF4BC0.c b/src/world/area_flo/flo_25/CF4BC0.c
index 0cdf293bbc..d879fc2448 100644
--- a/src/world/area_flo/flo_25/CF4BC0.c
+++ b/src/world/area_flo/flo_25/CF4BC0.c
@@ -2,3 +2,170 @@
 
 #include "world/common/foliage.inc.c"
 
+FoliageModelList N(tree1_Leaves) = {
+    .count = 3,
+    .models = { 22, 23, 24 }
+};
+
+FoliageModelList N(tree1_Trunk) = {
+    .count = 1,
+    .models = { 21 }
+};
+
+FoliageDropList N(tree1_Drops) = {
+    .count = 2,
+    .drops = {
+        {
+            .itemID = ITEM_YELLOW_BERRY,
+            .pos = { -432, 84, -44 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(33),
+        },
+        {
+            .itemID = ITEM_YELLOW_BERRY,
+            .pos = { -346, 72, -114 },
+            .spawnMode = 0xC,
+            .spawnFlag = SI_AREA_FLAG(34),
+        },
+    }
+};
+
+ShakeTreeConfig N(tree1) = {
+    .leaves = &N(tree1_Leaves),
+    .trunk = &N(tree1_Trunk),
+    .drops = &N(tree1_Drops),
+};
+
+Vec4f N(triggerCoord_802446AC) = { -388.0f, 0.0f, -92.0f, 0.0f };
+
+Script N(802446BC) = SCRIPT({
+    SI_AREA_FLAG(33) = 0;
+    SI_AREA_FLAG(34) = 0;
+    SI_VAR(0) = N(tree1);
+    bind N(shakeTree) to TRIGGER_WALL_HAMMER 12;
+    bind N(shakeTree) to TRIGGER_POINT_BOMB N(triggerCoord_802446AC);
+});
+
+static s32 N(pad_4734)[] = {
+    0x00000000, 0x00000000, 0x00000000,
+};
+
+Script N(80244740) = SCRIPT({
+    group 11;
+    SI_VAR(10) = SI_VAR(0);
+    SI_VAR(11) = SI_VAR(1);
+    SI_VAR(12) = SI_VAR(2);
+    SI_VAR(13) = SI_VAR(3);
+    SI_VAR(14) = SI_VAR(4);
+    SI_VAR(12) -= SI_VAR(0);
+    SI_VAR(13) -= SI_VAR(1);
+    SI_VAR(0) = (float) SI_VAR(12);
+    SI_VAR(0) /= 100.0;
+    SI_VAR(15) = 100.0;
+    SI_VAR(15) /= (float) SI_VAR(0);
+    SI_VAR(15) += 11;
+    SI_VAR(5) = 200;
+    SI_VAR(5) /= SI_VAR(15);
+    SI_VAR(5) += 1;
+    loop SI_VAR(5) {
+        RandInt(SI_VAR(12), SI_VAR(0));
+        RandInt(SI_VAR(13), SI_VAR(1));
+        RandInt(199, SI_VAR(2));
+        SI_VAR(3) = 210;
+        SI_VAR(3) -= SI_VAR(2);
+        SI_VAR(0) += SI_VAR(10);
+        SI_VAR(1) += SI_VAR(11);
+        SI_VAR(2) += SI_VAR(14);
+        PlayEffect(0xD, SI_VAR(0), SI_VAR(2), SI_VAR(1), SI_VAR(3), 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    sleep SI_VAR(15);
+0:
+    RandInt(SI_VAR(12), SI_VAR(0));
+    RandInt(SI_VAR(13), SI_VAR(1));
+    SI_VAR(0) += SI_VAR(10);
+    SI_VAR(1) += SI_VAR(11);
+    PlayEffect(0xD, SI_VAR(0), SI_VAR(14), SI_VAR(1), 200, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    sleep SI_VAR(15);
+    goto 0;
+});
+
+Script N(802449EC) = SCRIPT({
+    SI_VAR(9) = SI_VAR(6);
+    SI_VAR(8) = SI_VAR(5);
+    SI_VAR(7) = SI_VAR(4);
+    SI_VAR(6) = SI_VAR(3);
+    SI_VAR(5) = SI_VAR(2);
+    SI_VAR(4) = SI_VAR(1);
+    SI_VAR(3) = SI_VAR(0);
+    EnableModel(SI_VAR(6), 0);
+0:
+    GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
+    N(UnkFunc43)();
+    if (SI_VAR(0) == 0) {
+        sleep 1;
+        goto 0;
+    }
+    spawn {
+        sleep 5;
+        EnableModel(SI_VAR(6), 1);
+    }
+    if (SI_VAR(10) != 0) {
+        spawn {
+            sleep 5;
+            SI_VAR(0) = SI_VAR(3);
+            SI_VAR(1) = SI_VAR(4);
+            SI_VAR(2) = SI_VAR(5);
+            SI_VAR(1) += 10;
+            SI_VAR(2) += 8;
+            PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 15, 0, 0, 0, 0, 0, 0, 0, 0);
+            sleep 15;
+            SI_VAR(1) -= 10;
+            MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 14, 0);
+        }
+    }
+    spawn {
+        sleep 10;
+        PlaySoundAt(0xF8, 0, SI_VAR(3), SI_VAR(4), SI_VAR(5));
+    }
+    MakeLerp(0, 180, 20, 2);
+1:
+    UpdateLerp();
+    RotateModel(SI_VAR(8), SI_VAR(0), 1, 0, 0);
+    RotateModel(SI_VAR(9), SI_VAR(0), 1, 0, 0);
+    if (SI_VAR(1) == 1) {
+        sleep 1;
+        goto 1;
+    }
+    EnableModel(SI_VAR(7), 0);
+});
+
+Script N(80244D0C) = SCRIPT({
+    GetModelCenter(57);
+    SI_VAR(3) = 57;
+    SI_VAR(4) = 58;
+    SI_VAR(5) = 59;
+    SI_VAR(6) = 60;
+    SI_VAR(10) = 0;
+    spawn N(802449EC);
+    GetModelCenter(63);
+    SI_VAR(3) = 63;
+    SI_VAR(4) = 64;
+    SI_VAR(5) = 65;
+    SI_VAR(6) = 66;
+    SI_VAR(10) = 0;
+    spawn N(802449EC);
+    GetModelCenter(69);
+    SI_VAR(3) = 69;
+    SI_VAR(4) = 70;
+    SI_VAR(5) = 71;
+    SI_VAR(6) = 72;
+    SI_VAR(10) = 174;
+    spawn N(802449EC);
+    GetModelCenter(75);
+    SI_VAR(3) = 75;
+    SI_VAR(4) = 76;
+    SI_VAR(5) = 77;
+    SI_VAR(6) = 78;
+    SI_VAR(10) = 0;
+    spawn N(802449EC);
+});
diff --git a/src/world/area_flo/flo_25/CF4E00.c b/src/world/area_flo/flo_25/CF4E00.c
index 2600e9c7e6..611eff792e 100644
--- a/src/world/area_flo/flo_25/CF4E00.c
+++ b/src/world/area_flo/flo_25/CF4E00.c
@@ -1,3 +1,3 @@
 #include "flo_25.h"
 
-INCLUDE_ASM(s32, "world/area_flo/flo_25/CF4E00", func_80242230_CF4E00);
+#include "world/common/UnkFunc43.inc.c"
diff --git a/src/world/area_flo/flo_25/flo_25.h b/src/world/area_flo/flo_25/flo_25.h
index 2259aebdd7..1bc0af2287 100644
--- a/src/world/area_flo/flo_25/flo_25.h
+++ b/src/world/area_flo/flo_25/flo_25.h
@@ -2,3 +2,22 @@
 #include "map.h"
 
 #define NAMESPACE flo_25
+
+ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(TransformFoliage)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc43)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80240000_CF2BD0)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241D58_CF4928)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241DAC_CF497C)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241DE4_CF49B4)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241E80_CF4A50)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241F44_CF4B14)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(func_80241FB4_CF4B84)(ScriptInstance* script, s32 isInitialCall);
+
+extern NpcGroupList N(npcGroupList_80243C5C);
+extern Script N(802446BC);
+extern Script N(80244D0C);
+extern Script N(main);
+extern Script N(makeEntities);
diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c
index cbda2ed0fc..58e59c4d85 100644
--- a/src/world/area_gv/gv_01/E1E460.c
+++ b/src/world/area_gv/gv_01/E1E460.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240034_E1E494);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_hos/hos_00/A0C4E0.c b/src/world/area_hos/hos_00/A0C4E0.c
index 8868296687..4e7485b189 100644
--- a/src/world/area_hos/hos_00/A0C4E0.c
+++ b/src/world/area_hos/hos_00/A0C4E0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_802407F0_A0C4E0);
 /*
 ApiStatus N(func_802407F0_A0C4E0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80242970_A0E660) == NULL) {
+        N(D_80242970_A0E660) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80242970_A0E660)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80242970_A0E660)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80242970_A0E660));
+        N(D_80242970_A0E660) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_hos/hos_01/A10880.c b/src/world/area_hos/hos_01/A10880.c
index c879094186..30d85c0227 100644
--- a/src/world/area_hos/hos_01/A10880.c
+++ b/src/world/area_hos/hos_01/A10880.c
@@ -8,4 +8,4 @@ INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_8024031C_A10B9C);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240534_A10DB4);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240768_A10FE8);
+#include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c
index eca5180865..d7cd8791c8 100644
--- a/src/world/area_hos/hos_01/A11650.c
+++ b/src/world/area_hos/hos_01/A11650.c
@@ -2,4 +2,6 @@
 
 #include "world/common/UnsetCamera0MoveFlag1.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C);
+#define NAMESPACE hos_01_dup
+#include "world/common/GetFloorCollider.inc.c"
+#define NAMESPACE hos_01
diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c
index 5a586859c0..f73a5cf60d 100644
--- a/src/world/area_hos/hos_02/A17210.c
+++ b/src/world/area_hos/hos_02/A17210.c
@@ -41,7 +41,7 @@ void N(func_80241C44_A17E64)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80244490_A1A6B0)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -72,7 +72,7 @@ ApiStatus N(func_802422FC_A1851C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -122,7 +122,53 @@ ApiStatus N(func_802422FC_A1851C)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242618_A18838);
+/*
+void N(func_80242618_A18838)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    s32 flag;
+    f32 temp_f6;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242898_A18AB8);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0].s = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
+
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((func_800DCB7C(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0].s = 12;
+}
+*/
+
+#include "world/common/UnkFunc45.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802428F4_A18B14);
diff --git a/src/world/area_hos/hos_03/A1B100.c b/src/world/area_hos/hos_03/A1B100.c
index 3fc46d38c9..027ee2ef19 100644
--- a/src/world/area_hos/hos_03/A1B100.c
+++ b/src/world/area_hos/hos_03/A1B100.c
@@ -1,3 +1,3 @@
 #include "hos_03.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B100", func_80240000_A1B100);
+#include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index 3958f1e255..bcbbdd3949 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -43,7 +43,7 @@ void N(func_80241904_A1CA04)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_802457F4_A208F4)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -74,7 +74,7 @@ ApiStatus N(func_80241FBC_A1D0BC)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -125,42 +125,38 @@ ApiStatus N(func_80241FBC_A1D0BC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242368_A1D468);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802423BC_A1D4BC);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C_A1D59C);
+#include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4);
 /*
 ApiStatus N(func_802424A4_A1D5A4)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_8024801C_A2311C) == NULL) {
+        N(D_8024801C_A2311C) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_8024801C_A2311C)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_8024801C_A2311C)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_8024801C_A2311C));
+        N(D_8024801C_A2311C) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -171,32 +167,208 @@ ApiStatus N(func_802424A4_A1D5A4)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0);
+/*
+ApiStatus N(func_802425E0_A1D6E0)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242804_A1D904);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242870_A1D970);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242A1C_A1DB1C);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242B90_A1DC90);
+/*
+ApiStatus N(func_80242B90_A1DC90)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242C14_A1DD14);
+/*
+ApiStatus N(func_80242C14_A1DD14)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242E2C_A1DF2C);
+/*
+ApiStatus N(func_80242E2C_A1DF2C)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242EE0_A1DFE0);
+/*
+ApiStatus N(func_80242EE0_A1DFE0)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F14_A1E014);
+/*
+ApiStatus N(func_80242F14_A1E014)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F94_A1E094);
+/*
+ApiStatus N(func_80242F94_A1E094)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FAC_A1E0AC);
+/*
+ApiStatus N(func_80242FAC_A1E0AC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8);
+/*
+ApiStatus N(func_80242FC8_A1E0C8)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -211,5 +383,22 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C);
+/*
+void N(func_8024349C_A1E59C)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243508_A1E608);
+/*
+ApiStatus N(func_80243508_A1E608)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c
index b7a6573cf2..807eeb1e6b 100644
--- a/src/world/area_hos/hos_05/A2A240.c
+++ b/src/world/area_hos/hos_05/A2A240.c
@@ -1,8 +1,8 @@
 #include "hos_05.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240000_A2A240);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240124_A2A364);
+#include "world/common/UnkFunc26.inc.c"
 
 #include "world/common/UnkTexturePanFunc.inc.c"
 
diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c
index bc4dd75b22..69ff6229a0 100644
--- a/src/world/area_hos/hos_05/A2EF00.c
+++ b/src/world/area_hos/hos_05/A2EF00.c
@@ -4,11 +4,11 @@ extern u8 D_8024DCCF_A37F0F;
 extern u8 D_8024DCD3_A37F13;
 extern u8 D_802D9D73;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", pause_tabs_draw_badges_A2EF00);
-
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244DE4_A2F024);
-
 #define NAMESPACE dup_hos_05
+#include "world/common/UnkFunc27.inc.c"
+
+#include "world/common/UnkFunc26.inc.c"
+
 #include "world/common/UnkTexturePanFunc.inc.c"
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c
index c11c79abb6..bef51d8eb4 100644
--- a/src/world/area_hos/hos_06/A397F0.c
+++ b/src/world/area_hos/hos_06/A397F0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0);
 /*
 ApiStatus N(func_80240310_A397F0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80242C08_A3C0E8) == NULL) {
+        N(D_80242C08_A3C0E8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80242C08_A3C0E8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80242C08_A3C0E8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80242C08_A3C0E8));
+        N(D_80242C08_A3C0E8) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -39,18 +35,14 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34);
 /*
 ApiStatus N(func_80240654_A39B34)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80242C6C_A3C14C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80242C6C_A3C14C)) {
+        N(D_80242C6C_A3C14C) = FALSE;
+        set_variable(script, *args, N(D_80242C70_A3C150));
         return ApiStatus_DONE2;
     }
 
@@ -63,21 +55,56 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88);
 ApiStatus N(func_802406A8_A39B88)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80242C70_A3C150) = get_variable(script, *args);
+    N(D_80242C6C_A3C14C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0);
+/*
+ApiStatus N(func_802406E0_A39BC0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802409F8_A39ED8);
+/*
+ApiStatus N(func_802409F8_A39ED8)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A3C_A39F1C);
+/*
+ApiStatus N(func_80240A3C_A39F1C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A68_A39F48);
 
diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c
index 1bd5314182..310770fdda 100644
--- a/src/world/area_hos/hos_06/A3A230.c
+++ b/src/world/area_hos/hos_06/A3A230.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C);
 /*
 ApiStatus N(func_80240F7C_A3A45C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802445D0_A3DAB0) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802445D0_A3DAB0)) {
+        N(D_802445D0_A3DAB0) = FALSE;
+        set_variable(script, *args, N(D_802445D4_A3DAB4));
         return ApiStatus_DONE2;
     }
 
@@ -32,34 +28,50 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0);
 ApiStatus N(func_80240FD0_A3A4B0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802445D4_A3DAB4) = get_variable(script, *args);
+    N(D_802445D0_A3DAB0) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008_A3A4E8);
+/*
+ApiStatus N(func_80241008_A3A4E8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802410A4_A3A584);
 /*
 ApiStatus N(func_802410A4_A3A584)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_8024476C_A3DC4C) == NULL) {
+        N(D_8024476C_A3DC4C) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_8024476C_A3DC4C)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_8024476C_A3DC4C)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_8024476C_A3DC4C));
+        N(D_8024476C_A3DC4C) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c
index ddf36a5768..7b8b2f7bfe 100644
--- a/src/world/area_hos/hos_06/A3B4B0.c
+++ b/src/world/area_hos/hos_06/A3B4B0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0);
 /*
 ApiStatus N(func_80241FD0_A3B4B0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80245E80_A3F360) == NULL) {
+        N(D_80245E80_A3F360) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80245E80_A3F360)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80245E80_A3F360)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80245E80_A3F360));
+        N(D_80245E80_A3F360) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c
index 4e853b6757..df623bbb0d 100644
--- a/src/world/area_isk/isk_04/97B670.c
+++ b/src/world/area_isk/isk_04/97B670.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802400BC_97B6EC);
+/*
+void N(func_802400BC_97B6EC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c
index b7071586b7..dad8798e93 100644
--- a/src/world/area_isk/isk_08/984E30.c
+++ b/src/world/area_isk/isk_08/984E30.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_8024007C_984EAC);
+/*
+void N(func_8024007C_984EAC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c
index b2f568f4db..91d39a7bab 100644
--- a/src/world/area_isk/isk_09/9864E0.c
+++ b/src/world/area_isk/isk_09/9864E0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0);
 /*
 ApiStatus N(func_80240000_9864E0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802406F0_986BD0) == NULL) {
+        N(D_802406F0_986BD0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802406F0_986BD0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802406F0_986BD0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802406F0_986BD0));
+        N(D_802406F0_986BD0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c
index 415ed05fd5..441bef07c7 100644
--- a/src/world/area_isk/isk_10/988B60.c
+++ b/src/world/area_isk/isk_10/988B60.c
@@ -14,28 +14,6 @@ ApiStatus N(func_8024003C_988B9C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802400D4_988C34);
-
-INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240120_988C80);
-/*
-ApiStatus N(func_80240120_988C80)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802401CC_988D2C);
 
 INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024041C_988F7C);
@@ -50,16 +28,7 @@ ApiStatus N(func_8024041C_988F7C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240510_989070);
-/*
-ApiStatus N(func_80240510_989070)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240600_989160)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240600_989160)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80241158_989CB8)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240600_989160)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240600_989160)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241158_989CB8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240600_989160)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241158_989CB8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
diff --git a/src/world/area_isk/isk_16/9959F0.c b/src/world/area_isk/isk_16/9959F0.c
index e15dad4bad..7b6ca70ad8 100644
--- a/src/world/area_isk/isk_16/9959F0.c
+++ b/src/world/area_isk/isk_16/9959F0.c
@@ -1,5 +1,5 @@
 #include "isk_16.h"
 
-INCLUDE_ASM(s32, "world/area_isk/isk_16/9959F0", func_80240800_9959F0);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_isk/isk_16/9959F0", func_80240924_995B14);
+#include "world/common/UnkFunc26.inc.c"
diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c
index 165941484e..adc0e5aaf6 100644
--- a/src/world/area_isk/isk_18/997F70.c
+++ b/src/world/area_isk/isk_18/997F70.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_8024007C_997FEC);
+/*
+void N(func_8024007C_997FEC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_iwa/iwa_00/90CC40.c b/src/world/area_iwa/iwa_00/90CC40.c
index 113137c909..ec0d072494 100644
--- a/src/world/area_iwa/iwa_00/90CC40.c
+++ b/src/world/area_iwa/iwa_00/90CC40.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_80240000_90CC40);
 /*
 ApiStatus N(func_80240000_90CC40)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240FF8_90DC38) == NULL) {
+        N(D_80240FF8_90DC38) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240FF8_90DC38)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240FF8_90DC38)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240FF8_90DC38));
+        N(D_80240FF8_90DC38) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_iwa/iwa_02/915D70.c b/src/world/area_iwa/iwa_02/915D70.c
index 0a3800fe7a..0cd0847a94 100644
--- a/src/world/area_iwa/iwa_02/915D70.c
+++ b/src/world/area_iwa/iwa_02/915D70.c
@@ -100,23 +100,19 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00);
 INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240FE0_916D50);
 /*
 ApiStatus N(func_80240FE0_916D50)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241DA8_917B18) == NULL) {
+        N(D_80241DA8_917B18) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241DA8_917B18)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241DA8_917B18)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241DA8_917B18));
+        N(D_80241DA8_917B18) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c
index 75b34a3239..3879215450 100644
--- a/src/world/area_iwa/iwa_03/918BB0.c
+++ b/src/world/area_iwa/iwa_03/918BB0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0);
 /*
 ApiStatus N(func_80240000_918BB0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241530_91A0E0) == NULL) {
+        N(D_80241530_91A0E0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241530_91A0E0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241530_91A0E0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241530_91A0E0));
+        N(D_80241530_91A0E0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_iwa/iwa_10/91E5B0.c b/src/world/area_iwa/iwa_10/91E5B0.c
index dc527199d5..c6db43b8c3 100644
--- a/src/world/area_iwa/iwa_10/91E5B0.c
+++ b/src/world/area_iwa/iwa_10/91E5B0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_80240040_91E5B0);
 /*
 ApiStatus N(func_80240040_91E5B0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241DD0_920340) == NULL) {
+        N(D_80241DD0_920340) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241DD0_920340)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241DD0_920340)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241DD0_920340));
+        N(D_80241DD0_920340) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c
index 68a51781a0..693096cb95 100644
--- a/src/world/area_iwa/iwa_10/91E6D0.c
+++ b/src/world/area_iwa/iwa_10/91E6D0.c
@@ -16,28 +16,6 @@ ApiStatus N(func_8024032C_91E89C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802403C4_91E934);
-
-INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240410_91E980);
-/*
-ApiStatus N(func_80240410_91E980)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802404BC_91EA2C);
 
 INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024070C_91EC7C);
@@ -52,16 +30,7 @@ ApiStatus N(func_8024070C_91EC7C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240800_91ED70);
-/*
-ApiStatus N(func_80240800_91ED70)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -75,15 +44,15 @@ ApiStatus N(func_802408F0_91EE60)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -106,7 +75,7 @@ ApiStatus N(func_802408F0_91EE60)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80245AB8_924028)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -115,7 +84,7 @@ ApiStatus N(func_802408F0_91EE60)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -123,7 +92,7 @@ ApiStatus N(func_802408F0_91EE60)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80245AB8_924028)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -141,7 +110,7 @@ ApiStatus N(func_802408F0_91EE60)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80245AB8_924028)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -201,4 +170,4 @@ ApiStatus N(func_802408F0_91EE60)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FF8_91F568);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c
index 410f370333..b094546aaa 100644
--- a/src/world/area_iwa/iwa_10/91F5A0.c
+++ b/src/world/area_iwa/iwa_10/91F5A0.c
@@ -1,6 +1,6 @@
 #include "iwa_10.h"
 
-INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241030_91F5A0);
+#include "world/common/UnkFunc41.inc.c"
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -10,18 +10,14 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0_91F950);
 /*
 ApiStatus N(func_802413E0_91F950)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024626C_9247DC) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024626C_9247DC)) {
+        N(D_8024626C_9247DC) = FALSE;
+        set_variable(script, *args, N(D_80246270_9247E0));
         return ApiStatus_DONE2;
     }
 
@@ -34,10 +30,30 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434_91F9A4);
 ApiStatus N(func_80241434_91F9A4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80246270_9247E0) = get_variable(script, *args);
+    N(D_8024626C_9247DC) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_8024146C_91F9DC);
+/*
+ApiStatus N(func_8024146C_91F9DC)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_iwa/iwa_10/91FA80.c b/src/world/area_iwa/iwa_10/91FA80.c
index 46f90790f2..4374d706ef 100644
--- a/src/world/area_iwa/iwa_10/91FA80.c
+++ b/src/world/area_iwa/iwa_10/91FA80.c
@@ -1,3 +1,21 @@
 #include "iwa_10.h"
 
 INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91FA80", func_80241510_91FA80);
+/*
+ApiStatus N(func_80241510_91FA80)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c
index a3682a0de1..8f26cea993 100644
--- a/src/world/area_jan/jan_00/B20540.c
+++ b/src/world/area_jan/jan_00/B20540.c
@@ -11,23 +11,19 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240340_B20880);
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802403F4_B20934);
 /*
 ApiStatus N(func_802403F4_B20934)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802423C8_B22908) == NULL) {
+        N(D_802423C8_B22908) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802423C8_B22908)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802423C8_B22908)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802423C8_B22908));
+        N(D_802423C8_B22908) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -43,18 +39,14 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240738_B20C78);
 /*
 ApiStatus N(func_80240738_B20C78)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024242C_B2296C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024242C_B2296C)) {
+        N(D_8024242C_B2296C) = FALSE;
+        set_variable(script, *args, N(D_80242430_B22970));
         return ApiStatus_DONE2;
     }
 
@@ -67,21 +59,56 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C_B20CCC);
 ApiStatus N(func_8024078C_B20CCC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80242430_B22970) = get_variable(script, *args);
+    N(D_8024242C_B2296C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802407C4_B20D04);
+/*
+ApiStatus N(func_802407C4_B20D04)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240ADC_B2101C);
+/*
+ApiStatus N(func_80240ADC_B2101C)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B20_B21060);
+/*
+ApiStatus N(func_80240B20_B21060)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B4C_B2108C);
 
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index bdbf09458a..8feab98874 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -96,7 +96,7 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -116,7 +116,7 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -174,18 +174,14 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C);
 /*
 ApiStatus N(func_802414EC_B2D95C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80243048_B2F4B8) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80243048_B2F4B8)) {
+        N(D_80243048_B2F4B8) = FALSE;
+        set_variable(script, *args, N(D_8024304C_B2F4BC));
         return ApiStatus_DONE2;
     }
 
@@ -198,34 +194,50 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0);
 ApiStatus N(func_80241540_B2D9B0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_8024304C_B2F4BC) = get_variable(script, *args);
+    N(D_80243048_B2F4B8) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8);
+/*
+ApiStatus N(func_80241578_B2D9E8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84);
 /*
 ApiStatus N(func_80241614_B2DA84)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802431E4_B2F654) == NULL) {
+        N(D_802431E4_B2F654) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802431E4_B2F654)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802431E4_B2F654)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802431E4_B2F654));
+        N(D_802431E4_B2F654) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -236,32 +248,208 @@ ApiStatus N(func_80241614_B2DA84)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0);
+/*
+ApiStatus N(func_80241750_B2DBC0)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241974_B2DDE4);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419E0_B2DE50);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241B8C_B2DFFC);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241D00_B2E170);
+/*
+ApiStatus N(func_80241D00_B2E170)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241D84_B2E1F4);
+/*
+ApiStatus N(func_80241D84_B2E1F4)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241F9C_B2E40C);
+/*
+ApiStatus N(func_80241F9C_B2E40C)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242050_B2E4C0);
+/*
+ApiStatus N(func_80242050_B2E4C0)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242084_B2E4F4);
+/*
+ApiStatus N(func_80242084_B2E4F4)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242104_B2E574);
+/*
+ApiStatus N(func_80242104_B2E574)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024211C_B2E58C);
+/*
+ApiStatus N(func_8024211C_B2E58C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8);
+/*
+ApiStatus N(func_80242138_B2E5A8)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -276,7 +464,24 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C);
+/*
+void N(func_8024260C_B2EA7C)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242678_B2EAE8);
+/*
+ApiStatus N(func_80242678_B2EAE8)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802426A8_B2EB18);
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 254ca74092..032af9548d 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -6,7 +6,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240034_B34C04);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -114,7 +114,7 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -134,7 +134,7 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -188,21 +188,21 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241670_B36240);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802416C4_B36294);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374);
+#include "world/common/UnkFunc36.inc.c"
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -212,18 +212,14 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8);
 /*
 ApiStatus N(func_802419D8_B365A8)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80247444_B3C014) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80247444_B3C014)) {
+        N(D_80247444_B3C014) = FALSE;
+        set_variable(script, *args, N(D_80247448_B3C018));
         return ApiStatus_DONE2;
     }
 
@@ -236,36 +232,72 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC);
 ApiStatus N(func_80241A2C_B365FC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80247448_B3C018) = get_variable(script, *args);
+    N(D_80247444_B3C014) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A64_B36634);
+/*
+ApiStatus N(func_80241A64_B36634)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0);
+/*
+ApiStatus N(func_80241B00_B366D0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C);
 /*
 ApiStatus N(func_80241B9C_B3676C)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80247764_B3C334) == NULL) {
+        N(D_80247764_B3C334) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80247764_B3C334)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80247764_B3C334)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80247764_B3C334));
+        N(D_80247764_B3C334) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -276,32 +308,208 @@ ApiStatus N(func_80241B9C_B3676C)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8);
+/*
+ApiStatus N(func_80241CD8_B368A8)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241EFC_B36ACC);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F68_B36B38);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242114_B36CE4);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242288_B36E58);
+/*
+ApiStatus N(func_80242288_B36E58)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024230C_B36EDC);
+/*
+ApiStatus N(func_8024230C_B36EDC)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242524_B370F4);
+/*
+ApiStatus N(func_80242524_B370F4)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802425D8_B371A8);
+/*
+ApiStatus N(func_802425D8_B371A8)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024260C_B371DC);
+/*
+ApiStatus N(func_8024260C_B371DC)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024268C_B3725C);
+/*
+ApiStatus N(func_8024268C_B3725C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426A4_B37274);
+/*
+ApiStatus N(func_802426A4_B37274)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290);
+/*
+ApiStatus N(func_802426C0_B37290)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -316,15 +524,47 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764);
+/*
+void N(func_80242B94_B37764)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C00_B377D0);
+/*
+ApiStatus N(func_80242C00_B377D0)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EAC_B37A7C);
+/*
+ApiStatus N(func_80242EAC_B37A7C)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EF0_B37AC0);
+/*
+ApiStatus N(func_80242EF0_B37AC0)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242F1C_B37AEC);
diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c
index c26d882827..ddc5423185 100644
--- a/src/world/area_jan/jan_04/B44AC0.c
+++ b/src/world/area_jan/jan_04/B44AC0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0);
 /*
 ApiStatus N(func_80240350_B44AC0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241800_B45F70) == NULL) {
+        N(D_80241800_B45F70) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241800_B45F70)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241800_B45F70)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241800_B45F70));
+        N(D_80241800_B45F70) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_jan/jan_04/B44D80.c b/src/world/area_jan/jan_04/B44D80.c
index db04f0ba63..9e42b232fc 100644
--- a/src/world/area_jan/jan_04/B44D80.c
+++ b/src/world/area_jan/jan_04/B44D80.c
@@ -1,3 +1,3 @@
 #include "jan_04.h"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_04/B44D80", func_80240610_B44D80);
+#include "world/common/UnkFunc41.inc.c"
diff --git a/src/world/area_jan/jan_04/B45150.c b/src/world/area_jan/jan_04/B45150.c
index 73ce453542..a0bcf5f4db 100644
--- a/src/world/area_jan/jan_04/B45150.c
+++ b/src/world/area_jan/jan_04/B45150.c
@@ -1,3 +1,21 @@
 #include "jan_04.h"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_04/B45150", func_802409E0_B45150);
+/*
+ApiStatus N(func_802409E0_B45150)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c
index 6296b01cab..f371133284 100644
--- a/src/world/area_jan/jan_05/B4B260.c
+++ b/src/world/area_jan/jan_05/B4B260.c
@@ -36,7 +36,7 @@ s32 N(func_80241AD4_B4C544)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -89,7 +89,7 @@ ApiStatus N(func_80241EE8_B4C958)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -177,7 +177,7 @@ ApiStatus N(func_8024219C_B4CC0C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_jan/jan_06/B52B40.c b/src/world/area_jan/jan_06/B52B40.c
index 52b8cd4ac6..297bbe0739 100644
--- a/src/world/area_jan/jan_06/B52B40.c
+++ b/src/world/area_jan/jan_06/B52B40.c
@@ -1,3 +1,14 @@
 #include "jan_06.h"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_06/B52B40", func_80240310_B52B40);
+/*
+ApiStatus N(func_80240310_B52B40)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    script->functionTemp[0].s = get_variable(script, *args++);
+    script->functionTemp[1].s = get_variable(script, *args++);
+    script->functionTemp[2].s = get_variable(script, *args++);
+    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0].s, script->functionTemp[1].s, script->functionTemp[2].s);
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c
index f7c9b36fdd..304a4dfe11 100644
--- a/src/world/area_jan/jan_06/B52F70.c
+++ b/src/world/area_jan/jan_06/B52F70.c
@@ -36,7 +36,7 @@ s32 N(func_80241A24_B54254)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -89,7 +89,7 @@ ApiStatus N(func_80241E38_B54668)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -177,7 +177,7 @@ ApiStatus N(func_802420EC_B5491C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c
index 70676e6a6b..d56113bc23 100644
--- a/src/world/area_jan/jan_07/B59870.c
+++ b/src/world/area_jan/jan_07/B59870.c
@@ -18,7 +18,7 @@ s32 N(func_8024041C_B59C8C)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -71,7 +71,7 @@ ApiStatus N(func_80240830_B5A0A0)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -159,7 +159,7 @@ ApiStatus N(func_80240AE4_B5A354)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c
index 97fd099846..9184a6ce51 100644
--- a/src/world/area_jan/jan_08/B5E910.c
+++ b/src/world/area_jan/jan_08/B5E910.c
@@ -14,28 +14,6 @@ ApiStatus N(func_8024069C_B5E94C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240734_B5E9E4);
-
-INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240780_B5EA30);
-/*
-ApiStatus N(func_80240780_B5EA30)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024082C_B5EADC);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240A7C_B5ED2C);
@@ -50,16 +28,7 @@ ApiStatus N(func_80240A7C_B5ED2C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240B70_B5EE20);
-/*
-ApiStatus N(func_80240B70_B5EE20)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240C60_B5EF10)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240C60_B5EF10)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80243E58_B62108)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240C60_B5EF10)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240C60_B5EF10)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243E58_B62108)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240C60_B5EF10)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243E58_B62108)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -199,4 +168,4 @@ ApiStatus N(func_80240C60_B5EF10)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241368_B5F618);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c
index 20f3523583..0c20e4a27e 100644
--- a/src/world/area_jan/jan_08/B5F650.c
+++ b/src/world/area_jan/jan_08/B5F650.c
@@ -20,7 +20,7 @@ s32 N(func_80241870_B5FB20)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -73,7 +73,7 @@ ApiStatus N(func_80241C84_B5FF34)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -161,7 +161,7 @@ ApiStatus N(func_80241F38_B601E8)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c
index a6370be087..0fe9795b1a 100644
--- a/src/world/area_jan/jan_09/B65AB0.c
+++ b/src/world/area_jan/jan_09/B65AB0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240034_B65AE4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c
index bc9a66546e..2b7c5688b1 100644
--- a/src/world/area_jan/jan_09/B663F0.c
+++ b/src/world/area_jan/jan_09/B663F0.c
@@ -18,7 +18,7 @@ s32 N(func_80240D5C_B6680C)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -71,7 +71,7 @@ ApiStatus N(func_80241170_B66C20)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -159,7 +159,7 @@ ApiStatus N(func_80241424_B66ED4)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c
index ac945975c9..f9bf9f70dd 100644
--- a/src/world/area_jan/jan_11/B70860.c
+++ b/src/world/area_jan/jan_11/B70860.c
@@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860);
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C_B709EC);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_jan/jan_11/B71010.c b/src/world/area_jan/jan_11/B71010.c
index 3106ddcb96..29262f2224 100644
--- a/src/world/area_jan/jan_11/B71010.c
+++ b/src/world/area_jan/jan_11/B71010.c
@@ -1,5 +1,5 @@
 #include "jan_11.h"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_11/B71010", func_802407B0_B71010);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_11/B71010", func_802407DC_B7103C);
diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c
index 44d3e3966b..90b8b2771c 100644
--- a/src/world/area_jan/jan_12/B73570.c
+++ b/src/world/area_jan/jan_12/B73570.c
@@ -18,7 +18,7 @@ s32 N(func_802408DC_B7398C)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -71,7 +71,7 @@ ApiStatus N(func_80240CF0_B73DA0)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -159,7 +159,7 @@ ApiStatus N(func_80240FA4_B74054)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_jan/jan_16/B80000.c b/src/world/area_jan/jan_16/B80000.c
index 00863b1164..0139622488 100644
--- a/src/world/area_jan/jan_16/B80000.c
+++ b/src/world/area_jan/jan_16/B80000.c
@@ -1,5 +1,5 @@
 #include "jan_16.h"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_16/B80000", func_80240000_B80000);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_16/B80000", func_80240124_B80124);
+#include "world/common/UnkFunc26.inc.c"
diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c
index 45a2d82020..13e1e03551 100644
--- a/src/world/area_jan/jan_22/B84180.c
+++ b/src/world/area_jan/jan_22/B84180.c
@@ -94,7 +94,7 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +114,7 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -167,23 +167,19 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240E90_B85010);
 /*
 ApiStatus N(func_80240E90_B85010)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802425BC_B8673C) == NULL) {
+        N(D_802425BC_B8673C) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802425BC_B8673C)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802425BC_B8673C)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802425BC_B8673C));
+        N(D_802425BC_B8673C) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c
index 941e0e6403..0d3d3dbf32 100644
--- a/src/world/area_kkj/kkj_00/ABB340.c
+++ b/src/world/area_kkj/kkj_00/ABB340.c
@@ -94,7 +94,7 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +114,7 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c
index ce5379fa4e..bde56d0178 100644
--- a/src/world/area_kkj/kkj_01/AC5170.c
+++ b/src/world/area_kkj/kkj_01/AC5170.c
@@ -94,7 +94,7 @@ ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +114,7 @@ ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c
index 781d16a9da..4664912840 100644
--- a/src/world/area_kkj/kkj_17/AF1C60.c
+++ b/src/world/area_kkj/kkj_17/AF1C60.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60);
 /*
 ApiStatus N(func_80240000_AF1C60)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802408C0_AF2520) == NULL) {
+        N(D_802408C0_AF2520) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802408C0_AF2520)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802408C0_AF2520)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802408C0_AF2520));
+        N(D_802408C0_AF2520) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c
index 99a71cbc4e..a30bd3a56c 100644
--- a/src/world/area_kkj/kkj_18/AF2FE0.c
+++ b/src/world/area_kkj/kkj_18/AF2FE0.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024056C_AF320C);
 /*
 ApiStatus N(func_8024056C_AF320C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80241F10_AF4BB0) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80241F10_AF4BB0)) {
+        N(D_80241F10_AF4BB0) = FALSE;
+        set_variable(script, *args, N(D_80241F14_AF4BB4));
         return ApiStatus_DONE2;
     }
 
@@ -32,15 +28,55 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_802405C0_AF3260);
 ApiStatus N(func_802405C0_AF3260)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241F14_AF4BB4) = get_variable(script, *args);
+    N(D_80241F10_AF4BB0) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_802405F8_AF3298);
+/*
+ApiStatus N(func_802405F8_AF3298)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240694_AF3334);
+/*
+ApiStatus N(func_80240694_AF3334)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240730_AF33D0);
 
diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c
index e876f87abb..dae623552b 100644
--- a/src/world/area_kkj/kkj_19/AF7C00.c
+++ b/src/world/area_kkj/kkj_19/AF7C00.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C);
 /*
 ApiStatus N(func_802404DC_AF7E2C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80241B10_AF9460) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80241B10_AF9460)) {
+        N(D_80241B10_AF9460) = FALSE;
+        set_variable(script, *args, N(D_80241B14_AF9464));
         return ApiStatus_DONE2;
     }
 
@@ -32,15 +28,55 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240530_AF7E80);
 ApiStatus N(func_80240530_AF7E80)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241B14_AF9464) = get_variable(script, *args);
+    N(D_80241B10_AF9460) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240568_AF7EB8);
+/*
+ApiStatus N(func_80240568_AF7EB8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240604_AF7F54);
+/*
+ApiStatus N(func_80240604_AF7F54)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406A0_AF7FF0);
 
@@ -50,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B4C_AF849C);
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B8C_AF84DC);
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240BE4_AF8534);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240C10_AF8560);
 
diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c
index 8d884b2265..58053335e6 100644
--- a/src/world/area_kkj/kkj_20/AFDB40.c
+++ b/src/world/area_kkj/kkj_20/AFDB40.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40);
 /*
 ApiStatus N(func_80240000_AFDB40)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240880_AFE3C0) == NULL) {
+        N(D_80240880_AFE3C0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240880_AFE3C0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240880_AFE3C0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240880_AFE3C0));
+        N(D_80240880_AFE3C0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index 04b34342c3..3aee75ef12 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -4,20 +4,20 @@
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240480_AFDFC0);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802404D4_AFE014);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405B4_AFE0F4);
+#include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405BC_AFE0FC);
diff --git a/src/world/area_kkj/kkj_25/B06A80.c b/src/world/area_kkj/kkj_25/B06A80.c
index f02fac9632..df08324e0f 100644
--- a/src/world/area_kkj/kkj_25/B06A80.c
+++ b/src/world/area_kkj/kkj_25/B06A80.c
@@ -1,6 +1,6 @@
 #include "kkj_25.h"
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_80240080_B06A80);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802400AC_B06AAC);
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index 0f28affc50..9f125aac3d 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -6,7 +6,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240034_8B00A4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -21,23 +21,19 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240370_8B03E0);
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400);
 /*
 ApiStatus N(func_80240390_8B0400)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802455D0_8B5640) == NULL) {
+        N(D_802455D0_8B5640) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802455D0_8B5640)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802455D0_8B5640)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802455D0_8B5640));
+        N(D_802455D0_8B5640) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -48,32 +44,208 @@ ApiStatus N(func_80240390_8B0400)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C);
+/*
+ApiStatus N(func_802404CC_8B053C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802406F0_8B0760);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024075C_8B07CC);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240908_8B0978);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240A7C_8B0AEC);
+/*
+ApiStatus N(func_80240A7C_8B0AEC)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240B00_8B0B70);
+/*
+ApiStatus N(func_80240B00_8B0B70)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240D18_8B0D88);
+/*
+ApiStatus N(func_80240D18_8B0D88)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240DCC_8B0E3C);
+/*
+ApiStatus N(func_80240DCC_8B0E3C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E00_8B0E70);
+/*
+ApiStatus N(func_80240E00_8B0E70)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E80_8B0EF0);
+/*
+ApiStatus N(func_80240E80_8B0EF0)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E98_8B0F08);
+/*
+ApiStatus N(func_80240E98_8B0F08)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24);
+/*
+ApiStatus N(func_80240EB4_8B0F24)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -88,8 +260,25 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8);
+/*
+void N(func_80241388_8B13F8)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802413F4_8B1464);
+/*
+ApiStatus N(func_802413F4_8B1464)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241424_8B1494);
 
@@ -111,7 +300,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241A10_8B1A80);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241C18_8B1C88);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241E90_8B1F00);
+#include "world/common/UnkFunc41.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084);
 
@@ -123,18 +312,14 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC);
 /*
 ApiStatus N(func_8024226C_8B22DC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80247E30_8B7EA0) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80247E30_8B7EA0)) {
+        N(D_80247E30_8B7EA0) = FALSE;
+        set_variable(script, *args, N(D_80247E34_8B7EA4));
         return ApiStatus_DONE2;
     }
 
@@ -147,13 +332,33 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330);
 ApiStatus N(func_802422C0_8B2330)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80247E34_8B7EA4) = get_variable(script, *args);
+    N(D_80247E30_8B7EA0) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368);
+/*
+ApiStatus N(func_802422F8_8B2368)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404);
 
@@ -162,8 +367,23 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404);
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426A0_8B2710);
+/*
+ApiStatus N(func_802426A0_8B2710)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426E4_8B2754);
+/*
+ApiStatus N(func_802426E4_8B2754)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242710_8B2780);
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index a25a021e37..234e6759e0 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -4,18 +4,18 @@
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243230_8B32A0);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284_8B32F4);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364_8B33D4);
+#include "world/common/UnkFunc36.inc.c"
diff --git a/src/world/area_kmr/kmr_02/8B36B0.c b/src/world/area_kmr/kmr_02/8B36B0.c
index 3032631199..65758a69bb 100644
--- a/src/world/area_kmr/kmr_02/8B36B0.c
+++ b/src/world/area_kmr/kmr_02/8B36B0.c
@@ -4,4 +4,4 @@
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_8024366C_8B36DC);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_802436FC_8B376C);
+#include "world/common/UnkFunc42.inc.c"
diff --git a/src/world/area_kmr/kmr_02/8B3A10.c b/src/world/area_kmr/kmr_02/8B3A10.c
index 09bcdde105..984176beb3 100644
--- a/src/world/area_kmr/kmr_02/8B3A10.c
+++ b/src/world/area_kmr/kmr_02/8B3A10.c
@@ -1,3 +1,21 @@
 #include "kmr_02.h"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B3A10", func_802439A0_8B3A10);
+/*
+ApiStatus N(func_802439A0_8B3A10)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c
index 856b74359b..6ff6263718 100644
--- a/src/world/area_kmr/kmr_03/8C7F90.c
+++ b/src/world/area_kmr/kmr_03/8C7F90.c
@@ -2,50 +2,7 @@
 #include "message_ids.h"
 #include "../../partners.h"
 
-ApiStatus N(func_80240000_8C7F90)(ScriptInstance* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    PlayerData* playerData = &gPlayerData;
-    NpcID npcID = get_variable(script, *args++);
-    PartnerID partnerID = get_variable(script, *args++);
-    Npc* npc = get_npc_safe(npcID);
-
-    if (isInitialCall) {
-        if (gPlayerData.currentPartner == PARTNER_NONE) {
-            script->functionTemp[0].s = 2;
-        } else {
-            script->functionTemp[0].s = 0;
-        }
-    }
-
-    switch (script->functionTemp[0].s) {
-        case 0:
-            func_800EB168(0);
-            script->functionTemp[1].s = 30;
-            script->functionTemp[0].s = 1;
-            break;
-        case 1:
-            script->functionTemp[1].s--;
-            if (script->functionTemp[1].s == -1) {
-                script->functionTemp[0].s = 2;
-            }
-            break;
-        case 2:
-            playerData->currentPartner = partnerID;
-            playerData->partners[partnerID].enabled = TRUE;
-            clear_partner_move_history(npc);
-            func_800EB2A4(playerData->currentPartner);
-            script->functionTemp[0].s = 3;
-            break;
-        case 3:
-            set_npc_yaw(get_npc_safe(NPC_PARTNER), npc->yaw);
-            npc->flags &= ~4;
-            disable_npc_shadow(npc);
-            npc->pos.y = -1000.0f;
-            return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
+#include "world/common/UnkFunc41.inc.c"
 
 #include "world/common/CheckPartnerFlags1000.inc.c"
 
diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c
index 6a6f64cb0b..83c3b66a63 100644
--- a/src/world/area_kmr/kmr_03/8C8140.c
+++ b/src/world/area_kmr/kmr_03/8C8140.c
@@ -128,7 +128,7 @@ Script N(npcAI_80240B50) = SCRIPT({
             SetPlayerAnimation(ANIM_80007);
             sleep 30;
             SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A8));
-            N(func_80240000_8C7F90)(0, 5);
+            N(UnkFunc41)(0, 5);
             STORY_PROGRESS = STORY_CH0_GOOMPA_JOINED_PARTY;
             UseSettingsFrom(0, -220, 20, -72);
             GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2));
@@ -280,4 +280,4 @@ Script N(makeEntities) = SCRIPT({
     MakeEntity(0x802EAB04, 300, 0, 150, 0, ITEM_PULSE_STONE, MAKE_ENTITY_END);
     AssignPanelFlag(SI_SAVE_FLAG(88));
     MakeEntity(0x802EA7E0, 130, 60, 0, 0, MAKE_ENTITY_END);
-});
+});
\ No newline at end of file
diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c
index b65266763a..15978326e7 100644
--- a/src/world/area_kmr/kmr_03/8C83A0.c
+++ b/src/world/area_kmr/kmr_03/8C83A0.c
@@ -4,7 +4,7 @@
 
 FoliageModelList N(treeModelList_Bush1_Bush) = {
     .count = 1,
-    .models = { 0x40 },
+    .models = { 64 },
 };
 
 FoliageVectorList N(treeEffectVectors_Bush1) = {
@@ -21,19 +21,19 @@ SearchBushConfig N(bush1) = {
 
 FoliageModelList N(treeModelList_Tree1_Leaves) = {
     .count = 1,
-    .models = { 0x3E },
+    .models = { 62 },
 };
 
 FoliageModelList N(treeModelList_Tree1_Trunk) = {
     .count = 1,
-    .models = { 0x3D },
+    .models = { 61 },
 };
 
 FoliageVectorList N(treeEffectVectors_Tree1) = {
     .count = 2,
     .vectors = {
-        { 0xFFFFFFB0, 0x00000082, 0x00000012 },
-        { 0x0000001C, 0x00000082, 0x00000027 },
+        { -80, 130, 18 },
+        {  28, 130, 39 },
     },
 };
 
@@ -58,7 +58,7 @@ ShakeTreeConfig N(tree1) = {
     .leaves = &N(treeModelList_Tree1_Leaves),
     .trunk = &N(treeModelList_Tree1_Trunk),
     .vectors = &N(treeEffectVectors_Tree1),
-    .callback = N(tree1_Callback),
+    .callback = &N(tree1_Callback),
 };
 
 Vec4f N(tree1Point) = { -42.0f, 0.0f, -13.0f, 0.0f };
diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h
index ff64062f77..27fdc6ca79 100644
--- a/src/world/area_kmr/kmr_03/kmr_03.h
+++ b/src/world/area_kmr/kmr_03/kmr_03.h
@@ -4,11 +4,8 @@
 
 #define NAMESPACE kmr_03
 
-ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall);
-ApiStatus func_802D2520(ScriptInstance* script, s32 isInitialCall);
-
 ApiStatus N(UnkPositionFunc)(ScriptInstance* script, s32 isInitialCall);
-ApiStatus N(func_80240000_8C7F90)(ScriptInstance* script, s32 isInitialCall);
+ApiStatus N(UnkFunc41)(ScriptInstance* script, s32 isInitialCall);
 ApiStatus N(func_802401B0_8C8140)(ScriptInstance* script, s32 isInitialCall);
 
 NpcGroupList N(npcGroupList_80241450);
@@ -16,4 +13,4 @@ Script N(802422B8);
 Script N(80242340);
 Script N(802406C0);
 Script N(main);
-Script N(makeEntities);
+Script N(makeEntities);
\ No newline at end of file
diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c
index 9102ee97cb..aeaafb7c87 100644
--- a/src/world/area_kmr/kmr_04/8CA900.c
+++ b/src/world/area_kmr/kmr_04/8CA900.c
@@ -2,7 +2,7 @@
 
 #include "world/common/CheckPartnerFlags1000.inc.c"
 
-ApiStatus func_8024002C_8CA92C(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus N(func_8024002C_8CA92C)(ScriptInstance* script, s32 isInitialCall) {
     script->varTable[0] = get_player_data()->curHP;
 
     return ApiStatus_DONE2;
diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c
index 8b4a016cd8..0413ba3b9d 100644
--- a/src/world/area_kmr/kmr_04/8CA960.c
+++ b/src/world/area_kmr/kmr_04/8CA960.c
@@ -9,23 +9,19 @@
 INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8);
 /*
 ApiStatus N(func_802402C8_8CABC8)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802429F4_8CD2F4) == NULL) {
+        N(D_802429F4_8CD2F4) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802429F4_8CD2F4)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802429F4_8CD2F4)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802429F4_8CD2F4));
+        N(D_802429F4_8CD2F4) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -35,13 +31,13 @@ ApiStatus N(func_802402C8_8CABC8)(ScriptInstance* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802403E0_8CACE0);
 
-ApiStatus func_80240434_8CAD34(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus N(func_80240434_8CAD34)(ScriptInstance* script, s32 isInitialCall) {
     gPlayerData.hammerLevel = 0;
 
     return ApiStatus_DONE2;
 }
 
-ApiStatus func_80240444_8CAD44(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus N(func_80240444_8CAD44)(ScriptInstance* script, s32 isInitialCall) {
     exec_entity_updatecmd(get_entity_by_index(script->varTable[0]));
 
     return ApiStatus_DONE2;
diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c
index a1173c5b7b..5214b68555 100644
--- a/src/world/area_kmr/kmr_05/8CE070.c
+++ b/src/world/area_kmr/kmr_05/8CE070.c
@@ -41,7 +41,7 @@ void N(func_80240C54_8CECC4)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80241B2C_8CFB9C)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c
index aa6b77dcef..8454cac2f8 100644
--- a/src/world/area_kmr/kmr_06/8D1510.c
+++ b/src/world/area_kmr/kmr_06/8D1510.c
@@ -41,7 +41,7 @@ void N(func_80240C54_8D2164)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_802420BC_8D35CC)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c
index c03c6d50ad..13c24050be 100644
--- a/src/world/area_kmr/kmr_09/8D5E00.c
+++ b/src/world/area_kmr/kmr_09/8D5E00.c
@@ -41,7 +41,7 @@ void N(func_80240C54_8D6A54)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_8024186C_8D766C)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -72,7 +72,7 @@ ApiStatus N(func_8024130C_8D710C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c
index ad148b900e..58ebe3c2f3 100644
--- a/src/world/area_kmr/kmr_10/8D84D0.c
+++ b/src/world/area_kmr/kmr_10/8D84D0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0);
 /*
 ApiStatus N(func_80240000_8D84D0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240C20_8D90F0) == NULL) {
+        N(D_80240C20_8D90F0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240C20_8D90F0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240C20_8D90F0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240C20_8D90F0));
+        N(D_80240C20_8D90F0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h
index d66cdc0190..b675cbfdf7 100644
--- a/src/world/area_kmr/kmr_12/kmr_12.h
+++ b/src/world/area_kmr/kmr_12/kmr_12.h
@@ -9,11 +9,9 @@
 #define GetGoomba N(GetGoomba)
 ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall);
 
-extern MapConfig N(config);
-
-extern Script N(main);
-extern Script N(PlayMusic);
-extern Script N(MakeEntities);
-extern Script N(ReadWestSign);
-
+extern  MapConfig N(config);
+extern  Script N(main);
+extern  Script N(PlayMusic);
+extern  Script N(MakeEntities);
+extern  Script N(ReadWestSign);
 extern NpcGroupList N(npcGroupList);
diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c
index aeacc4c7ed..bce00d4c8a 100644
--- a/src/world/area_kmr/kmr_20/8EBE50.c
+++ b/src/world/area_kmr/kmr_20/8EBE50.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064_8EBE84);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index 69399becad..23eee9b259 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -4,24 +4,24 @@
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241460_8ED280);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802414B4_8ED2D4);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241594_8ED3B4);
+#include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_8024159C_8ED3BC);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802415C4_8ED3E4);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802415EC_8ED40C);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c
index b1eec279c5..5f42c9718d 100644
--- a/src/world/area_kmr/kmr_20/8ED440.c
+++ b/src/world/area_kmr/kmr_20/8ED440.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241620_8ED440);
 /*
 ApiStatus N(func_80241620_8ED440)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_8024A908_8F6728) == NULL) {
+        N(D_8024A908_8F6728) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_8024A908_8F6728)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_8024A908_8F6728)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_8024A908_8F6728));
+        N(D_8024A908_8F6728) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c
index 48e20ceac3..64d2f93580 100644
--- a/src/world/area_kmr/kmr_20/8ED5A0.c
+++ b/src/world/area_kmr/kmr_20/8ED5A0.c
@@ -8,7 +8,9 @@
 #include "world/common/GetCurrentFloor.inc.c"
 #define NAMESPACE kmr_20
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4);
+#define NAMESPACE dup_kmr_20
+#include "world/common/UnkFunc25.inc.c"
+#define NAMESPACE kmr_20
 
 #define NAMESPACE dup_kmr_20
 #include "world/common/GetEntryPos.inc.c"
diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c
index a4ece5111d..3a7efcf821 100644
--- a/src/world/area_kmr/kmr_20/8EDB70.c
+++ b/src/world/area_kmr/kmr_20/8EDB70.c
@@ -8,7 +8,9 @@
 #include "world/common/GetCurrentFloor.inc.c"
 #define NAMESPACE kmr_20
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4);
+#define NAMESPACE dup2_kmr_20
+#include "world/common/UnkFunc25.inc.c"
+#define NAMESPACE kmr_20
 
 #define NAMESPACE dup2_kmr_20
 #include "world/common/GetEntryPos.inc.c"
diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c
index 5f31b08baa..3805ae439d 100644
--- a/src/world/area_kpa/kpa_01/A470C0.c
+++ b/src/world/area_kpa/kpa_01/A470C0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802401DC_A4713C);
+/*
+void N(func_802401DC_A4713C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c
index f866adcda6..b01bdbc2fd 100644
--- a/src/world/area_kpa/kpa_03/A48720.c
+++ b/src/world/area_kpa/kpa_03/A48720.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802401DC_A4879C);
+/*
+void N(func_802401DC_A4879C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c
index 399b80a303..ad77762145 100644
--- a/src/world/area_kpa/kpa_102/A93A50.c
+++ b/src/world/area_kpa/kpa_102/A93A50.c
@@ -23,6 +23,28 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944);
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802415D8_A94D18);
+/*
+void N(func_802415D8_A94D18)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c
index 7c71470768..7a1785c42a 100644
--- a/src/world/area_kpa/kpa_11/A52BD0.c
+++ b/src/world/area_kpa/kpa_11/A52BD0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A52BD0", func_8024038C_A52C4C);
+/*
+void N(func_8024038C_A52C4C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c
index 98bc4bdea0..2ddc503aad 100644
--- a/src/world/area_kpa/kpa_113/A9CC70.c
+++ b/src/world/area_kpa/kpa_113/A9CC70.c
@@ -7,6 +7,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_8024022C_A9CE5C);
+/*
+void N(func_8024022C_A9CE5C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_12/A54CA0.c b/src/world/area_kpa/kpa_12/A54CA0.c
index 63ffc722de..30a6560147 100644
--- a/src/world/area_kpa/kpa_12/A54CA0.c
+++ b/src/world/area_kpa/kpa_12/A54CA0.c
@@ -1,6 +1,11 @@
 #include "kpa_12.h"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54CA0", func_80240350_A54CA0);
+ApiStatus N(func_80240350_A54CA0)(ScriptInstance *script, s32 isInitialCall) {
+    CollisionStatus* collisionStatus = &gCollisionStatus;
+
+    set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54CA0", func_8024037C_A54CCC);
 
diff --git a/src/world/area_kpa/kpa_13/A56270.c b/src/world/area_kpa/kpa_13/A56270.c
index 461909a5b3..c63b97b232 100644
--- a/src/world/area_kpa/kpa_13/A56270.c
+++ b/src/world/area_kpa/kpa_13/A56270.c
@@ -1,6 +1,11 @@
 #include "kpa_13.h"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_13/A56270", func_80240350_A56270);
+ApiStatus N(func_80240350_A56270)(ScriptInstance *script, s32 isInitialCall) {
+    CollisionStatus* collisionStatus = &gCollisionStatus;
+
+    set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_13/A56270", func_8024037C_A5629C);
 
diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c
index 8427c92e7c..5129f4b900 100644
--- a/src/world/area_kpa/kpa_14/A57830.c
+++ b/src/world/area_kpa/kpa_14/A57830.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830);
 /*
 ApiStatus N(func_80240380_A57830)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241900_A58DB0) == NULL) {
+        N(D_80241900_A58DB0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241900_A58DB0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241900_A58DB0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241900_A58DB0));
+        N(D_80241900_A58DB0) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -35,7 +31,12 @@ ApiStatus N(func_80240380_A57830)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/GetEntityPosition.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240710_A57BC0);
+ApiStatus N(func_80240710_A57BC0)(ScriptInstance *script, s32 isInitialCall) {
+    CollisionStatus* collisionStatus = &gCollisionStatus;
+
+    set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow);
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_8024073C_A57BEC);
 
diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c
index 8bfbcf6861..18bc1f4f68 100644
--- a/src/world/area_kpa/kpa_15/A596A0.c
+++ b/src/world/area_kpa/kpa_15/A596A0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0);
 /*
 ApiStatus N(func_80240310_A596A0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240AA0_A59E30) == NULL) {
+        N(D_80240AA0_A59E30) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240AA0_A59E30)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240AA0_A59E30)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240AA0_A59E30));
+        N(D_80240AA0_A59E30) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kpa/kpa_16/A5A340.c b/src/world/area_kpa/kpa_16/A5A340.c
index d72ee85f91..272528fca1 100644
--- a/src/world/area_kpa/kpa_16/A5A340.c
+++ b/src/world/area_kpa/kpa_16/A5A340.c
@@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_16/A5A340", func_80240310_A5A340);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_16/A5A340", func_8024034C_A5A37C);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_16/A5A340", func_80240370_A5A3A0);
+#include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c
index 6db901d4db..d8d6c9388a 100644
--- a/src/world/area_kpa/kpa_50/A609D0.c
+++ b/src/world/area_kpa/kpa_50/A609D0.c
@@ -23,6 +23,28 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4);
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802412C8_A61C98);
+/*
+void N(func_802412C8_A61C98)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c
index 3a14adb746..66a858162b 100644
--- a/src/world/area_kpa/kpa_51/A640E0.c
+++ b/src/world/area_kpa/kpa_51/A640E0.c
@@ -39,6 +39,28 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494);
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802414C8_A65558);
+/*
+void N(func_802414C8_A65558)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c
index 0f770e9fe3..9819d196c4 100644
--- a/src/world/area_kpa/kpa_61/A6E6F0.c
+++ b/src/world/area_kpa/kpa_61/A6E6F0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024038C_A6E76C);
+/*
+void N(func_8024038C_A6E76C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c
index b69a1699ec..e84f46609a 100644
--- a/src/world/area_kpa/kpa_70/A74B80.c
+++ b/src/world/area_kpa/kpa_70/A74B80.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74B80", func_8024038C_A74BFC);
+/*
+void N(func_8024038C_A74BFC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c
index bdaa5341ee..831b2f9526 100644
--- a/src/world/area_kpa/kpa_81/A78510.c
+++ b/src/world/area_kpa/kpa_81/A78510.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C);
 /*
 ApiStatus N(func_8024027C_A7873C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80240D98_A79258) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80240D98_A79258)) {
+        N(D_80240D98_A79258) = FALSE;
+        set_variable(script, *args, N(D_80240D9C_A7925C));
         return ApiStatus_DONE2;
     }
 
@@ -32,12 +28,52 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790);
 ApiStatus N(func_802402D0_A78790)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80240D9C_A7925C) = get_variable(script, *args);
+    N(D_80240D98_A79258) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8);
+/*
+ApiStatus N(func_80240308_A787C8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802403A4_A78864);
+/*
+ApiStatus N(func_802403A4_A78864)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c
index 0947536c4e..92dda3197c 100644
--- a/src/world/area_kpa/kpa_82/A7A550.c
+++ b/src/world/area_kpa/kpa_82/A7A550.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C);
 /*
 ApiStatus N(func_8024027C_A7A77C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80240C20_A7B120) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80240C20_A7B120)) {
+        N(D_80240C20_A7B120) = FALSE;
+        set_variable(script, *args, N(D_80240C24_A7B124));
         return ApiStatus_DONE2;
     }
 
@@ -32,12 +28,52 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802402D0_A7A7D0);
 ApiStatus N(func_802402D0_A7A7D0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80240C24_A7B124) = get_variable(script, *args);
+    N(D_80240C20_A7B120) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_80240308_A7A808);
+/*
+ApiStatus N(func_80240308_A7A808)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802403A4_A7A8A4);
+/*
+ApiStatus N(func_802403A4_A7A8A4)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index 4ae8bb55e4..bee580e035 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -94,7 +94,7 @@ ApiStatus N(func_80240B94_A875E4)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +114,7 @@ ApiStatus N(func_80240B94_A875E4)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -167,6 +167,28 @@ ApiStatus N(func_80240B94_A875E4)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240F0C_A8795C);
+/*
+void N(func_80240F0C_A8795C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -178,18 +200,18 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74);
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416E8_A88138);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024173C_A8818C);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024181C_A8826C);
+#include "world/common/UnkFunc36.inc.c"
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index d87a9e7a41..b87435d86e 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -94,7 +94,7 @@ ApiStatus N(func_80240C74_A8D6F4)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +114,7 @@ ApiStatus N(func_80240C74_A8D6F4)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -167,6 +167,28 @@ ApiStatus N(func_80240C74_A8D6F4)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240FEC_A8DA6C);
+/*
+void N(func_80240FEC_A8DA6C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -178,18 +200,18 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84);
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802417C8_A8E248);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024181C_A8E29C);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418FC_A8E37C);
+#include "world/common/UnkFunc36.inc.c"
diff --git a/src/world/area_kzn/kzn_02/C5AA50.c b/src/world/area_kzn/kzn_02/C5AA50.c
index 3f0600a32a..312f2cbc01 100644
--- a/src/world/area_kzn/kzn_02/C5AA50.c
+++ b/src/world/area_kzn/kzn_02/C5AA50.c
@@ -2,7 +2,7 @@
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AA50", func_80240310_C5AA50);
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AA50", func_80240384_C5AAC4);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AA50", func_802403B0_C5AAF0);
 
diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c
index 5b0bedd2c5..3d99124e1d 100644
--- a/src/world/area_kzn/kzn_02/C5AC20.c
+++ b/src/world/area_kzn/kzn_02/C5AC20.c
@@ -41,7 +41,7 @@ void N(func_80241134_C5B874)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80244900_C5F040)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -72,7 +72,7 @@ ApiStatus N(func_802417EC_C5BF2C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -122,8 +122,54 @@ ApiStatus N(func_802417EC_C5BF2C)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241B08_C5C248);
+/*
+void N(func_80241B08_C5C248)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    s32 flag;
+    f32 temp_f6;
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241D88_C5C4C8);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0].s = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
+
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((func_800DCB7C(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0].s = 12;
+}
+*/
+
+#include "world/common/UnkFunc45.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241DE4_C5C524);
 /*
@@ -141,7 +187,7 @@ ApiStatus N(func_80241DE4_C5C524)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -180,7 +226,7 @@ ApiStatus N(func_80241DE4_C5C524)(ScriptInstance* script, s32 isInitialCall) {
             N(func_80241B08_C5C248)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80241D88_C5C4C8)(script, aiSettings, territoryPtr);
+            N(UnkFunc45)(script, aiSettings, territoryPtr);
             break;
     }
 
@@ -191,23 +237,19 @@ ApiStatus N(func_80241DE4_C5C524)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C);
 /*
 ApiStatus N(func_80241FCC_C5C70C)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80244A10_C5F150) == NULL) {
+        N(D_80244A10_C5F150) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80244A10_C5F150)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80244A10_C5F150)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80244A10_C5F150));
+        N(D_80244A10_C5F150) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -223,18 +265,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242310_C5CA50);
 /*
 ApiStatus N(func_80242310_C5CA50)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80244A74_C5F1B4) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80244A74_C5F1B4)) {
+        N(D_80244A74_C5F1B4) = FALSE;
+        set_variable(script, *args, N(D_80244A78_C5F1B8));
         return ApiStatus_DONE2;
     }
 
@@ -247,18 +285,53 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242364_C5CAA4);
 ApiStatus N(func_80242364_C5CAA4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80244A78_C5F1B8) = get_variable(script, *args);
+    N(D_80244A74_C5F1B4) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_8024239C_C5CADC);
+/*
+ApiStatus N(func_8024239C_C5CADC)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426B4_C5CDF4);
+/*
+ApiStatus N(func_802426B4_C5CDF4)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426F8_C5CE38);
+/*
+ApiStatus N(func_802426F8_C5CE38)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c
index 882f8c77ea..da8ddd4146 100644
--- a/src/world/area_kzn/kzn_03/C61020.c
+++ b/src/world/area_kzn/kzn_03/C61020.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024038C_C6109C);
+/*
+void N(func_8024038C_C6109C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -26,7 +48,7 @@ s32 N(func_80240E00_C61B10)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -79,7 +101,7 @@ ApiStatus N(func_80241214_C61F24)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -170,23 +192,19 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024234C_C6305C);
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024259C_C632AC);
 /*
 ApiStatus N(func_8024259C_C632AC)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802441A0_C64EB0) == NULL) {
+        N(D_802441A0_C64EB0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802441A0_C64EB0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802441A0_C64EB0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802441A0_C64EB0));
+        N(D_802441A0_C64EB0) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -202,18 +220,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802428E0_C635F0);
 /*
 ApiStatus N(func_802428E0_C635F0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80244204_C64F14) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80244204_C64F14)) {
+        N(D_80244204_C64F14) = FALSE;
+        set_variable(script, *args, N(D_80244208_C64F18));
         return ApiStatus_DONE2;
     }
 
@@ -226,18 +240,53 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242934_C63644);
 ApiStatus N(func_80242934_C63644)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80244208_C64F18) = get_variable(script, *args);
+    N(D_80244204_C64F14) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024296C_C6367C);
+/*
+ApiStatus N(func_8024296C_C6367C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242C84_C63994);
+/*
+ApiStatus N(func_80242C84_C63994)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242CC8_C639D8);
+/*
+ApiStatus N(func_80242CC8_C639D8)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c
index c963b033c0..17a28e89bb 100644
--- a/src/world/area_kzn/kzn_04/C68440.c
+++ b/src/world/area_kzn/kzn_04/C68440.c
@@ -14,28 +14,6 @@ ApiStatus N(func_8024034C_C6847C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802403E4_C68514);
-
-INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240430_C68560);
-/*
-ApiStatus N(func_80240430_C68560)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802404DC_C6860C);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024072C_C6885C);
@@ -50,16 +28,7 @@ ApiStatus N(func_8024072C_C6885C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240820_C68950);
-/*
-ApiStatus N(func_80240820_C68950)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240910_C68A40)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240910_C68A40)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80241C98_C69DC8)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240910_C68A40)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240910_C68A40)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241C98_C69DC8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240910_C68A40)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241C98_C69DC8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -199,4 +168,4 @@ ApiStatus N(func_80240910_C68A40)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80241018_C69148);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c
index a1c5adfdf0..1de61920c7 100644
--- a/src/world/area_kzn/kzn_07/C6EA50.c
+++ b/src/world/area_kzn/kzn_07/C6EA50.c
@@ -45,7 +45,7 @@ void N(func_80241474_C6F7A4)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80242B90_C70EC0)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -76,7 +76,7 @@ ApiStatus N(func_80241B2C_C6FE5C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -126,7 +126,53 @@ ApiStatus N(func_80241B2C_C6FE5C)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241E48_C70178);
+/*
+void N(func_80241E48_C70178)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    s32 flag;
+    f32 temp_f6;
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802420C8_C703F8);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0].s = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
+
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((func_800DCB7C(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0].s = 12;
+}
+*/
+
+#include "world/common/UnkFunc45.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80242124_C70454);
diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c
index 34e4c3bb1c..857fcb19cc 100644
--- a/src/world/area_kzn/kzn_08/C71C10.c
+++ b/src/world/area_kzn/kzn_08/C71C10.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10);
 /*
 ApiStatus N(func_80240790_C71C10)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80244BB0_C76030) == NULL) {
+        N(D_80244BB0_C76030) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80244BB0_C76030)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80244BB0_C76030)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80244BB0_C76030));
+        N(D_80244BB0_C76030) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c
index ba1ca55d6a..21db5929e8 100644
--- a/src/world/area_kzn/kzn_08/C71ED0.c
+++ b/src/world/area_kzn/kzn_08/C71ED0.c
@@ -41,7 +41,7 @@ void N(func_802416A4_C72B24)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80244DA0_C76220)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -72,7 +72,7 @@ ApiStatus N(func_80241D5C_C731DC)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -122,8 +122,54 @@ ApiStatus N(func_80241D5C_C731DC)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242078_C734F8);
+/*
+void N(func_80242078_C734F8)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    s32 flag;
+    f32 temp_f6;
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802422F8_C73778);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0].s = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
+
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((func_800DCB7C(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0].s = 12;
+}
+*/
+
+#include "world/common/UnkFunc45.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4);
 /*
@@ -141,7 +187,7 @@ ApiStatus N(func_80242354_C737D4)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -180,7 +226,7 @@ ApiStatus N(func_80242354_C737D4)(ScriptInstance* script, s32 isInitialCall) {
             N(func_80242078_C734F8)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_802422F8_C73778)(script, aiSettings, territoryPtr);
+            N(UnkFunc45)(script, aiSettings, territoryPtr);
             break;
     }
 
@@ -202,7 +248,7 @@ s32 N(func_80242744_C73BC4)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -255,7 +301,7 @@ ApiStatus N(func_80242B58_C73FD8)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c
index a218741291..d1f514d574 100644
--- a/src/world/area_kzn/kzn_09/C76CE0.c
+++ b/src/world/area_kzn/kzn_09/C76CE0.c
@@ -14,28 +14,6 @@ ApiStatus N(func_8024003C_C76D1C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802400D4_C76DB4);
-
-INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240120_C76E00);
-/*
-ApiStatus N(func_80240120_C76E00)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802401CC_C76EAC);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024041C_C770FC);
@@ -50,16 +28,7 @@ ApiStatus N(func_8024041C_C770FC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240510_C771F0);
-/*
-ApiStatus N(func_80240510_C771F0)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240600_C772E0)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240600_C772E0)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80243D58_C7AA38)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240600_C772E0)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240600_C772E0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243D58_C7AA38)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240600_C772E0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243D58_C7AA38)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -199,4 +168,4 @@ ApiStatus N(func_80240600_C772E0)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240D08_C779E8);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c
index b61d38fef2..1e0ebe4a03 100644
--- a/src/world/area_kzn/kzn_09/C77D00.c
+++ b/src/world/area_kzn/kzn_09/C77D00.c
@@ -14,7 +14,7 @@ s32 N(func_80241228_C77F08)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_8024163C_C7831C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -158,6 +158,28 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454);
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242A40_C79720);
+/*
+void N(func_80242A40_C79720)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -170,23 +192,19 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242D58_C79A38);
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC_C79F8C);
 /*
 ApiStatus N(func_802432AC_C79F8C)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80245250_C7BF30) == NULL) {
+        N(D_80245250_C7BF30) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80245250_C7BF30)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80245250_C7BF30)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80245250_C7BF30));
+        N(D_80245250_C7BF30) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -202,18 +220,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802435F0_C7A2D0);
 /*
 ApiStatus N(func_802435F0_C7A2D0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802452B4_C7BF94) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802452B4_C7BF94)) {
+        N(D_802452B4_C7BF94) = FALSE;
+        set_variable(script, *args, N(D_802452B8_C7BF98));
         return ApiStatus_DONE2;
     }
 
@@ -226,18 +240,53 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243644_C7A324);
 ApiStatus N(func_80243644_C7A324)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802452B8_C7BF98) = get_variable(script, *args);
+    N(D_802452B4_C7BF94) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024367C_C7A35C);
+/*
+ApiStatus N(func_8024367C_C7A35C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243994_C7A674);
+/*
+ApiStatus N(func_80243994_C7A674)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802439D8_C7A6B8);
+/*
+ApiStatus N(func_802439D8_C7A6B8)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kzn/kzn_10/C7E4B0.c b/src/world/area_kzn/kzn_10/C7E4B0.c
index c6379c15ea..939d9613db 100644
--- a/src/world/area_kzn/kzn_10/C7E4B0.c
+++ b/src/world/area_kzn/kzn_10/C7E4B0.c
@@ -15,3 +15,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802404EC_C7E66C);
 INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802405A4_C7E724);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240638_C7E7B8);
+/*
+ApiStatus N(func_80240638_C7E7B8)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    script->functionTemp[0].s = get_variable(script, *args++);
+    script->functionTemp[1].s = get_variable(script, *args++);
+    script->functionTemp[2].s = get_variable(script, *args++);
+    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0].s, script->functionTemp[1].s, script->functionTemp[2].s);
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kzn/kzn_11/C804B0.c b/src/world/area_kzn/kzn_11/C804B0.c
index 27280b34ca..3622955144 100644
--- a/src/world/area_kzn/kzn_11/C804B0.c
+++ b/src/world/area_kzn/kzn_11/C804B0.c
@@ -2,6 +2,6 @@
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C804B0", func_80240310_C804B0);
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C804B0", func_80240408_C805A8);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C804B0", func_80240434_C805D4);
diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c
index 71a572bbd2..fe19349f7f 100644
--- a/src/world/area_kzn/kzn_11/C80600.c
+++ b/src/world/area_kzn/kzn_11/C80600.c
@@ -41,7 +41,7 @@ void N(func_802410B4_C81254)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_802436D0_C83870)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -72,7 +72,7 @@ ApiStatus N(func_8024176C_C8190C)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -122,8 +122,54 @@ ApiStatus N(func_8024176C_C8190C)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/UnkNpcAIFunc13.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241A88_C81C28);
+/*
+void N(func_80241A88_C81C28)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    f32 x, y, z, w;
+    s32 var;
+    s32 flag;
+    f32 temp_f6;
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D08_C81EA8);
+    if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 30;
+        script->functionTemp[0].s = 20;
+        enemy->varTable[9] = 30;
+        return;
+    }
+
+    npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+    flag = 0;
+    if (!(npc->flags & 8)) {
+        x = npc->pos.x;
+        y = npc->pos.y + npc->collisionHeight;
+        z = npc->pos.z;
+        w = npc->collisionHeight + 3.0;
+        if ((func_800DCB7C(npc->unk_80, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) {
+            flag = 1;
+        }
+    }
+
+    if (flag) {
+        npc->pos.y = y + 1.0;
+    } else {
+        temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0);
+        if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) {
+            temp_f6 = -temp_f6;
+            npc->pos.y += temp_f6 * 0.06;
+        }
+    }
+    if (npc->duration > 0) {
+        npc->duration--;
+        return;
+    }
+    script->functionTemp[0].s = 12;
+}
+*/
+
+#include "world/common/UnkFunc45.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D64_C81F04);
 /*
@@ -141,7 +187,7 @@ ApiStatus N(func_80241D64_C81F04)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -180,7 +226,7 @@ ApiStatus N(func_80241D64_C81F04)(ScriptInstance* script, s32 isInitialCall) {
             N(func_80241A88_C81C28)(script, aiSettings, territoryPtr);
             break;
         case 14:
-            N(func_80241D08_C81EA8)(script, aiSettings, territoryPtr);
+            N(UnkFunc45)(script, aiSettings, territoryPtr);
             break;
     }
 
diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c
index 2fcf4a07e2..ad83129d2b 100644
--- a/src/world/area_kzn/kzn_17/C85DC0.c
+++ b/src/world/area_kzn/kzn_17/C85DC0.c
@@ -14,7 +14,7 @@ s32 N(func_80240518_C85FC8)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_8024092C_C863DC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
@@ -158,6 +158,28 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514);
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241D30_C877E0);
+/*
+void N(func_80241D30_C877E0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -170,23 +192,19 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242048_C87AF8);
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024259C_C8804C);
 /*
 ApiStatus N(func_8024259C_C8804C)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80244074_C89B24) == NULL) {
+        N(D_80244074_C89B24) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80244074_C89B24)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80244074_C89B24)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80244074_C89B24));
+        N(D_80244074_C89B24) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -202,18 +220,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802428E0_C88390);
 /*
 ApiStatus N(func_802428E0_C88390)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802440D8_C89B88) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802440D8_C89B88)) {
+        N(D_802440D8_C89B88) = FALSE;
+        set_variable(script, *args, N(D_802440DC_C89B8C));
         return ApiStatus_DONE2;
     }
 
@@ -226,18 +240,53 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242934_C883E4);
 ApiStatus N(func_80242934_C883E4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802440DC_C89B8C) = get_variable(script, *args);
+    N(D_802440D8_C89B88) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024296C_C8841C);
+/*
+ApiStatus N(func_8024296C_C8841C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242C84_C88734);
+/*
+ApiStatus N(func_80242C84_C88734)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242CC8_C88778);
+/*
+ApiStatus N(func_80242CC8_C88778)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kzn/kzn_17/C887B0.c b/src/world/area_kzn/kzn_17/C887B0.c
index 5e23742c60..822fed21cb 100644
--- a/src/world/area_kzn/kzn_17/C887B0.c
+++ b/src/world/area_kzn/kzn_17/C887B0.c
@@ -15,3 +15,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242EBC_C8896C);
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242F74_C88A24);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80243004_C88AB4);
+/*
+ApiStatus N(func_80243004_C88AB4)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    script->functionTemp[0].s = get_variable(script, *args++);
+    script->functionTemp[1].s = get_variable(script, *args++);
+    script->functionTemp[2].s = get_variable(script, *args++);
+    sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0].s, script->functionTemp[1].s, script->functionTemp[2].s);
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_kzn/kzn_18/C8C3F0.c b/src/world/area_kzn/kzn_18/C8C3F0.c
index 25089002b1..e352bcdd12 100644
--- a/src/world/area_kzn/kzn_18/C8C3F0.c
+++ b/src/world/area_kzn/kzn_18/C8C3F0.c
@@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C3F0", func_80240350_C8C3F0);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C3F0", func_8024036C_C8C40C);
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_18/C8C3F0", func_80240388_C8C428);
+#include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c
index 543d372c42..68ebf55c13 100644
--- a/src/world/area_kzn/kzn_19/C8DBB0.c
+++ b/src/world/area_kzn/kzn_19/C8DBB0.c
@@ -120,23 +120,19 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024140C_C8EFBC);
 INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468_C8F018);
 /*
 ApiStatus N(func_80241468_C8F018)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80243D74_C91924) == NULL) {
+        N(D_80243D74_C91924) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80243D74_C91924)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80243D74_C91924)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80243D74_C91924));
+        N(D_80243D74_C91924) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -152,18 +148,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802417AC_C8F35C);
 /*
 ApiStatus N(func_802417AC_C8F35C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80243DD8_C91988) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80243DD8_C91988)) {
+        N(D_80243DD8_C91988) = FALSE;
+        set_variable(script, *args, N(D_80243DDC_C9198C));
         return ApiStatus_DONE2;
     }
 
@@ -176,20 +168,55 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241800_C8F3B0);
 ApiStatus N(func_80241800_C8F3B0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80243DDC_C9198C) = get_variable(script, *args);
+    N(D_80243DD8_C91988) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241838_C8F3E8);
+/*
+ApiStatus N(func_80241838_C8F3E8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B50_C8F700);
+/*
+ApiStatus N(func_80241B50_C8F700)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B94_C8F744);
+/*
+ApiStatus N(func_80241B94_C8F744)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241BC0_C8F770);
diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c
index 36bbc1fc95..8e1fe33b27 100644
--- a/src/world/area_kzn/kzn_20/C96240.c
+++ b/src/world/area_kzn/kzn_20/C96240.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240310_C96240);
 /*
 ApiStatus N(func_80240310_C96240)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241780_C976B0) == NULL) {
+        N(D_80241780_C976B0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241780_C976B0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241780_C976B0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241780_C976B0));
+        N(D_80241780_C976B0) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -35,18 +31,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240654_C96584);
 /*
 ApiStatus N(func_80240654_C96584)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802417E4_C97714) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802417E4_C97714)) {
+        N(D_802417E4_C97714) = FALSE;
+        set_variable(script, *args, N(D_802417E8_C97718));
         return ApiStatus_DONE2;
     }
 
@@ -59,22 +51,57 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406A8_C965D8);
 ApiStatus N(func_802406A8_C965D8)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802417E8_C97718) = get_variable(script, *args);
+    N(D_802417E4_C97714) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406E0_C96610);
+/*
+ApiStatus N(func_802406E0_C96610)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802409F8_C96928);
+/*
+ApiStatus N(func_802409F8_C96928)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240A3C_C9696C);
+/*
+ApiStatus N(func_80240A3C_C9696C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240A68_C96998);
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240A8C_C969BC);
+#include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_kzn/kzn_22/C9A200.c b/src/world/area_kzn/kzn_22/C9A200.c
index d57be923f6..dead7aacd2 100644
--- a/src/world/area_kzn/kzn_22/C9A200.c
+++ b/src/world/area_kzn/kzn_22/C9A200.c
@@ -4,4 +4,4 @@
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_22/C9A200", func_8024030C_C9A50C);
+#include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_kzn/kzn_22/C9A540.c b/src/world/area_kzn/kzn_22/C9A540.c
index 1f7bd7c051..4afeaaec4a 100644
--- a/src/world/area_kzn/kzn_22/C9A540.c
+++ b/src/world/area_kzn/kzn_22/C9A540.c
@@ -1,5 +1,7 @@
 #include "kzn_22.h"
 
-INCLUDE_ASM(s32, "world/area_kzn/kzn_22/C9A540", func_80240340_C9A540);
+#define NAMESPACE dup_kzn_22
+#include "world/common/GetFloorCollider.inc.c"
+#define NAMESPACE kzn_22
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_22/C9A540", func_8024036C_C9A56C);
diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c
index 43c6b83b61..8a6a24b573 100644
--- a/src/world/area_mac/mac_00/7EAD10.c
+++ b/src/world/area_mac/mac_00/7EAD10.c
@@ -4,29 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-ApiStatus func_80240034_7EAD44(ScriptInstance* script, s32 isInitialCall) {
-    s32 stickX;
-    s32 stickY;
-
-    if (gCollisionStatus.currentFloor != script->varTable[11]) {
-        script->varTable[0] = 0;
-        return ApiStatus_DONE2;
-    }
-
-    stickX = abs(gGameStatusPtr->stickX);
-    stickY = gGameStatusPtr->stickY;
-
-    if (stickX == 0 && stickY == 0) {
-        return ApiStatus_BLOCK;
-    }
-
-    if (!(atan2(0.0f, 0.0f, stickX, stickY) < 60.0f)) {
-        return ApiStatus_BLOCK;
-    }
-
-    script->varTable[0] = 1;
-    return ApiStatus_DONE2;
-}
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 9bfa5ddce7..fef88277a1 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -5,23 +5,19 @@
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340);
 /*
 ApiStatus N(func_80240630_7EB340)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80245DC0_7F0AD0) == NULL) {
+        N(D_80245DC0_7F0AD0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80245DC0_7F0AD0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80245DC0_7F0AD0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80245DC0_7F0AD0));
+        N(D_80245DC0_7F0AD0) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -32,32 +28,208 @@ ApiStatus N(func_80240630_7EB340)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C);
+/*
+ApiStatus N(func_8024076C_7EB47C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240990_7EB6A0);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409FC_7EB70C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240BA8_7EB8B8);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240D1C_7EBA2C);
+/*
+ApiStatus N(func_80240D1C_7EBA2C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240DA0_7EBAB0);
+/*
+ApiStatus N(func_80240DA0_7EBAB0)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240FB8_7EBCC8);
+/*
+ApiStatus N(func_80240FB8_7EBCC8)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024106C_7EBD7C);
+/*
+ApiStatus N(func_8024106C_7EBD7C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802410A0_7EBDB0);
+/*
+ApiStatus N(func_802410A0_7EBDB0)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241120_7EBE30);
+/*
+ApiStatus N(func_80241120_7EBE30)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241138_7EBE48);
+/*
+ApiStatus N(func_80241138_7EBE48)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64);
+/*
+ApiStatus N(func_80241154_7EBE64)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -72,8 +244,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338);
+/*
+void N(func_80241628_7EC338)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241694_7EC3A4);
+/*
+ApiStatus N(func_80241694_7EC3A4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -83,18 +272,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600);
 /*
 ApiStatus N(func_802418F0_7EC600)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802483E8_7F30F8) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802483E8_7F30F8)) {
+        N(D_802483E8_7F30F8) = FALSE;
+        set_variable(script, *args, N(D_802483EC_7F30FC));
         return ApiStatus_DONE2;
     }
 
@@ -107,23 +292,78 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654);
 ApiStatus N(func_80241944_7EC654)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802483EC_7F30FC) = get_variable(script, *args);
+    N(D_802483E8_7F30F8) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C);
+/*
+ApiStatus N(func_8024197C_7EC68C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728);
+/*
+ApiStatus N(func_80241A18_7EC728)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40);
+/*
+ApiStatus N(func_80241D30_7ECA40)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D74_7ECA84);
+/*
+ApiStatus N(func_80241D74_7ECA84)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241DA0_7ECAB0);
 
diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c
index 64d211531d..a288b5ade1 100644
--- a/src/world/area_mac/mac_00/7ED280.c
+++ b/src/world/area_mac/mac_00/7ED280.c
@@ -94,7 +94,7 @@ ApiStatus N(func_80243104_7EDE14)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +114,7 @@ ApiStatus N(func_80243104_7EDE14)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -167,23 +167,19 @@ ApiStatus N(func_80243104_7EDE14)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400_7EE110);
 /*
 ApiStatus N(func_80243400_7EE110)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_8024ECE8_7F99F8) == NULL) {
+        N(D_8024ECE8_7F99F8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_8024ECE8_7F99F8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_8024ECE8_7F99F8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_8024ECE8_7F99F8));
+        N(D_8024ECE8_7F99F8) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -205,18 +201,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454);
 /*
 ApiStatus N(func_80243744_7EE454)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024ED4C_7F9A5C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024ED4C_7F9A5C)) {
+        N(D_8024ED4C_7F9A5C) = FALSE;
+        set_variable(script, *args, N(D_8024ED50_7F9A60));
         return ApiStatus_DONE2;
     }
 
@@ -229,13 +221,33 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8);
 ApiStatus N(func_80243798_7EE4A8)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_8024ED50_7F9A60) = get_variable(script, *args);
+    N(D_8024ED4C_7F9A5C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0);
+/*
+ApiStatus N(func_802437D0_7EE4E0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #define NAMESPACE dup_mac_00
 #include "world/common/SetManyVars.inc.c"
@@ -246,5 +258,20 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0);
 #define NAMESPACE mac_00
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243AE8_7EE7F8);
+/*
+ApiStatus N(func_80243AE8_7EE7F8)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243B2C_7EE83C);
+/*
+ApiStatus N(func_80243B2C_7EE83C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index fb341d83a0..ed0018a5ed 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -110,7 +110,7 @@ ApiStatus N(func_80241C14_802494)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -130,7 +130,7 @@ ApiStatus N(func_80241C14_802494)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -183,23 +183,19 @@ ApiStatus N(func_80241C14_802494)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790);
 /*
 ApiStatus N(func_80241F10_802790)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80248C30_8094B0) == NULL) {
+        N(D_80248C30_8094B0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80248C30_8094B0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80248C30_8094B0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80248C30_8094B0));
+        N(D_80248C30_8094B0) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -210,32 +206,208 @@ ApiStatus N(func_80241F10_802790)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC);
+/*
+ApiStatus N(func_8024204C_8028CC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242270_802AF0);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422DC_802B5C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242488_802D08);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802425FC_802E7C);
+/*
+ApiStatus N(func_802425FC_802E7C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242680_802F00);
+/*
+ApiStatus N(func_80242680_802F00)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242898_803118);
+/*
+ApiStatus N(func_80242898_803118)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024294C_8031CC);
+/*
+ApiStatus N(func_8024294C_8031CC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242980_803200);
+/*
+ApiStatus N(func_80242980_803200)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A00_803280);
+/*
+ApiStatus N(func_80242A00_803280)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A18_803298);
+/*
+ApiStatus N(func_80242A18_803298)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4);
+/*
+ApiStatus N(func_80242A34_8032B4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -250,8 +422,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788);
+/*
+void N(func_80242F08_803788)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F74_8037F4);
+/*
+ApiStatus N(func_80242F74_8037F4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242FA4_803824);
 
@@ -271,17 +460,17 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_804074);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802439C0_804240);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
@@ -297,18 +486,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554);
 /*
 ApiStatus N(func_80243CD4_804554)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024D944_80E1C4) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024D944_80E1C4)) {
+        N(D_8024D944_80E1C4) = FALSE;
+        set_variable(script, *args, N(D_8024D948_80E1C8));
         return ApiStatus_DONE2;
     }
 
@@ -321,21 +506,56 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D28_8045A8);
 ApiStatus N(func_80243D28_8045A8)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_8024D948_80E1C8) = get_variable(script, *args);
+    N(D_8024D944_80E1C4) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0);
+/*
+ApiStatus N(func_80243D60_8045E0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078_8048F8);
+/*
+ApiStatus N(func_80244078_8048F8)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440BC_80493C);
+/*
+ApiStatus N(func_802440BC_80493C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetPlayerCoins.inc.c"
 
diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c
index 0cdcfbd53e..c54f46a0ee 100644
--- a/src/world/area_mac/mac_01/805DD0.c
+++ b/src/world/area_mac/mac_01/805DD0.c
@@ -94,7 +94,7 @@ ApiStatus N(func_802460E4_806964)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -114,7 +114,7 @@ ApiStatus N(func_802460E4_806964)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c
index 97f8fbd6ed..e29bdb2513 100644
--- a/src/world/area_mac/mac_02/8232C0.c
+++ b/src/world/area_mac/mac_02/8232C0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240034_8232F4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 80abcb2167..4db72e0c65 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -96,7 +96,7 @@ ApiStatus N(func_802414C4_824784)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -116,7 +116,7 @@ ApiStatus N(func_802414C4_824784)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -169,23 +169,19 @@ ApiStatus N(func_802414C4_824784)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80);
 /*
 ApiStatus N(func_802417C0_824A80)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80246150_829410) == NULL) {
+        N(D_80246150_829410) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80246150_829410)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80246150_829410)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80246150_829410));
+        N(D_80246150_829410) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -196,32 +192,208 @@ ApiStatus N(func_802417C0_824A80)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC);
+/*
+ApiStatus N(func_802418FC_824BBC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B20_824DE0);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B8C_824E4C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241D38_824FF8);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241EAC_82516C);
+/*
+ApiStatus N(func_80241EAC_82516C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241F30_8251F0);
+/*
+ApiStatus N(func_80241F30_8251F0)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242148_825408);
+/*
+ApiStatus N(func_80242148_825408)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802421FC_8254BC);
+/*
+ApiStatus N(func_802421FC_8254BC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242230_8254F0);
+/*
+ApiStatus N(func_80242230_8254F0)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422B0_825570);
+/*
+ApiStatus N(func_802422B0_825570)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422C8_825588);
+/*
+ApiStatus N(func_802422C8_825588)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4);
+/*
+ApiStatus N(func_802422E4_8255A4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -236,8 +408,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78);
+/*
+void N(func_802427B8_825A78)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242824_825AE4);
+/*
+ApiStatus N(func_80242824_825AE4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -247,18 +436,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40);
 /*
 ApiStatus N(func_80242A80_825D40)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80248778_82BA38) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80248778_82BA38)) {
+        N(D_80248778_82BA38) = FALSE;
+        set_variable(script, *args, N(D_8024877C_82BA3C));
         return ApiStatus_DONE2;
     }
 
@@ -271,15 +456,55 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94);
 ApiStatus N(func_80242AD4_825D94)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_8024877C_82BA3C) = get_variable(script, *args);
+    N(D_80248778_82BA38) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242B0C_825DCC);
+/*
+ApiStatus N(func_80242B0C_825DCC)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242BA8_825E68);
+/*
+ApiStatus N(func_80242BA8_825E68)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242C44_825F04);
 
@@ -292,13 +517,40 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243040_826300);
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243088_826348);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802430D0_826390);
+/*
+ApiStatus N(func_802430D0_826390)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
+
+    for (i = 0; i <= 90; i++) {
+        N(D_8024EA10)[i] = 128 + i;
+    }
+
+    N(D_8024EA14) = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243380_826640);
+/*
+ApiStatus N(func_80243380_826640)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433C4_826684);
+/*
+ApiStatus N(func_802433C4_826684)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/UnkMusicFunc.inc.c"
diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c
index 9a77193fe9..3fd17e01da 100644
--- a/src/world/area_mac/mac_03/831800.c
+++ b/src/world/area_mac/mac_03/831800.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240034_831834);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index b0b6bb890b..14a5044857 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -7,23 +7,19 @@
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0);
 /*
 ApiStatus N(func_802404B0_831CB0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80246644_837E44) == NULL) {
+        N(D_80246644_837E44) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80246644_837E44)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80246644_837E44)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80246644_837E44));
+        N(D_80246644_837E44) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -34,32 +30,208 @@ ApiStatus N(func_802404B0_831CB0)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC);
+/*
+ApiStatus N(func_802405EC_831DEC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240810_832010);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024087C_83207C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240A28_832228);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240B9C_83239C);
+/*
+ApiStatus N(func_80240B9C_83239C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240C20_832420);
+/*
+ApiStatus N(func_80240C20_832420)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240E38_832638);
+/*
+ApiStatus N(func_80240E38_832638)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240EEC_8326EC);
+/*
+ApiStatus N(func_80240EEC_8326EC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240F20_832720);
+/*
+ApiStatus N(func_80240F20_832720)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FA0_8327A0);
+/*
+ApiStatus N(func_80240FA0_8327A0)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FB8_8327B8);
+/*
+ApiStatus N(func_80240FB8_8327B8)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4);
+/*
+ApiStatus N(func_80240FD4_8327D4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -74,8 +246,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8);
+/*
+void N(func_802414A8_832CA8)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241514_832D14);
+/*
+ApiStatus N(func_80241514_832D14)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -85,18 +274,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70);
 /*
 ApiStatus N(func_80241770_832F70)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80248C6C_83A46C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80248C6C_83A46C)) {
+        N(D_80248C6C_83A46C) = FALSE;
+        set_variable(script, *args, N(D_80248C70_83A470));
         return ApiStatus_DONE2;
     }
 
@@ -109,21 +294,56 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4);
 ApiStatus N(func_802417C4_832FC4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80248C70_83A470) = get_variable(script, *args);
+    N(D_80248C6C_83A46C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC);
+/*
+ApiStatus N(func_802417FC_832FFC)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B14_833314);
+/*
+ApiStatus N(func_80241B14_833314)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B58_833358);
+/*
+ApiStatus N(func_80241B58_833358)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B84_833384);
 
diff --git a/src/world/area_mac/mac_03/833740.c b/src/world/area_mac/mac_03/833740.c
index c2d5f59a26..42230cb202 100644
--- a/src/world/area_mac/mac_03/833740.c
+++ b/src/world/area_mac/mac_03/833740.c
@@ -1,6 +1,6 @@
 #include "mac_03.h"
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F40_833740);
+#include "world/common/GetFloorCollider.inc.c"
 
 #include "world/common/GetPlayerCoins.inc.c"
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 88bea7e1af..9ffb97f205 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -5,23 +5,19 @@
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030);
 /*
 ApiStatus N(func_80240460_843030)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80243FE8_846BB8) == NULL) {
+        N(D_80243FE8_846BB8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80243FE8_846BB8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80243FE8_846BB8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80243FE8_846BB8));
+        N(D_80243FE8_846BB8) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -32,32 +28,208 @@ ApiStatus N(func_80240460_843030)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C);
+/*
+ApiStatus N(func_8024059C_84316C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802407C0_843390);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024082C_8433FC);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802409D8_8435A8);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240B4C_84371C);
+/*
+ApiStatus N(func_80240B4C_84371C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240BD0_8437A0);
+/*
+ApiStatus N(func_80240BD0_8437A0)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240DE8_8439B8);
+/*
+ApiStatus N(func_80240DE8_8439B8)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240E9C_843A6C);
+/*
+ApiStatus N(func_80240E9C_843A6C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240ED0_843AA0);
+/*
+ApiStatus N(func_80240ED0_843AA0)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F50_843B20);
+/*
+ApiStatus N(func_80240F50_843B20)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F68_843B38);
+/*
+ApiStatus N(func_80240F68_843B38)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54);
+/*
+ApiStatus N(func_80240F84_843B54)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -72,8 +244,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028);
+/*
+void N(func_80241458_844028)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414C4_844094);
+/*
+ApiStatus N(func_802414C4_844094)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -83,18 +272,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0);
 /*
 ApiStatus N(func_80241720_8442F0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80246610_8491E0) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80246610_8491E0)) {
+        N(D_80246610_8491E0) = FALSE;
+        set_variable(script, *args, N(D_80246614_8491E4));
         return ApiStatus_DONE2;
     }
 
@@ -107,13 +292,33 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344);
 ApiStatus N(func_80241774_844344)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80246614_8491E4) = get_variable(script, *args);
+    N(D_80246610_8491E0) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802417AC_84437C);
+/*
+ApiStatus N(func_802417AC_84437C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418);
 
@@ -129,7 +334,7 @@ ApiStatus PostChapter4StatUpdate(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241980_844550);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419AC_84457C);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index fe420e75ad..ca9e01d27d 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -104,7 +104,7 @@ ApiStatus N(func_80241024_853194)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -124,7 +124,7 @@ ApiStatus N(func_80241024_853194)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -177,23 +177,19 @@ ApiStatus N(func_80241024_853194)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490);
 /*
 ApiStatus N(func_80241320_853490)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802450B0_857220) == NULL) {
+        N(D_802450B0_857220) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802450B0_857220)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802450B0_857220)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802450B0_857220));
+        N(D_802450B0_857220) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -204,32 +200,208 @@ ApiStatus N(func_80241320_853490)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC);
+/*
+ApiStatus N(func_8024145C_8535CC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241680_8537F0);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416EC_85385C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241898_853A08);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A0C_853B7C);
+/*
+ApiStatus N(func_80241A0C_853B7C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A90_853C00);
+/*
+ApiStatus N(func_80241A90_853C00)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241CA8_853E18);
+/*
+ApiStatus N(func_80241CA8_853E18)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D5C_853ECC);
+/*
+ApiStatus N(func_80241D5C_853ECC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D90_853F00);
+/*
+ApiStatus N(func_80241D90_853F00)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E10_853F80);
+/*
+ApiStatus N(func_80241E10_853F80)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E28_853F98);
+/*
+ApiStatus N(func_80241E28_853F98)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4);
+/*
+ApiStatus N(func_80241E44_853FB4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -244,8 +416,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488);
+/*
+void N(func_80242318_854488)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242384_8544F4);
+/*
+ApiStatus N(func_80242384_8544F4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -255,18 +444,14 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750);
 /*
 ApiStatus N(func_802425E0_854750)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802476D8_859848) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802476D8_859848)) {
+        N(D_802476D8_859848) = FALSE;
+        set_variable(script, *args, N(D_802476DC_85984C));
         return ApiStatus_DONE2;
     }
 
@@ -279,23 +464,78 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4);
 ApiStatus N(func_80242634_8547A4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802476DC_85984C) = get_variable(script, *args);
+    N(D_802476D8_859848) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC);
+/*
+ApiStatus N(func_8024266C_8547DC)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878);
+/*
+ApiStatus N(func_80242708_854878)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A20_854B90);
+/*
+ApiStatus N(func_80242A20_854B90)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A64_854BD4);
+/*
+ApiStatus N(func_80242A64_854BD4)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00);
 
@@ -303,7 +543,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242C78_854DE8);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242E84_854FF4);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80243088_8551F8);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802430B4_855224);
 
diff --git a/src/world/area_mac/machi/7E73A0.c b/src/world/area_mac/machi/7E73A0.c
index 7ddfdaa9a3..725b6df8a8 100644
--- a/src/world/area_mac/machi/7E73A0.c
+++ b/src/world/area_mac/machi/7E73A0.c
@@ -2,9 +2,14 @@
 
 INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240000_7E73A0);
 
-INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240030_7E73D0);
+#include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240038_7E73D8);
+/*
+ApiStatus N(func_80240038_7E73D8)(ScriptInstance *script, s32 isInitialCall) {
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240040_7E73E0);
 
diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c
index 9e63333c5b..fbd87fd926 100644
--- a/src/world/area_mgm/mgm_00/E0E7A0.c
+++ b/src/world/area_mgm/mgm_00/E0E7A0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240034_E0E7D4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -106,7 +106,7 @@ ApiStatus N(func_80240E74_E0F614)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -126,7 +126,7 @@ ApiStatus N(func_80240E74_E0F614)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c
index 6f88072e32..3962c489ee 100644
--- a/src/world/area_mim/mim_01/B93940.c
+++ b/src/world/area_mim/mim_01/B93940.c
@@ -14,7 +14,7 @@ s32 N(func_80240708_B93B48)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_80240B1C_B93F5C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c
index e0e6ed7e2f..5063431ddf 100644
--- a/src/world/area_mim/mim_02/B97C70.c
+++ b/src/world/area_mim/mim_02/B97C70.c
@@ -24,18 +24,14 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802410B0_B98CB0);
 /*
 ApiStatus N(func_802410B0_B98CB0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802416AC_B992AC) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802416AC_B992AC)) {
+        N(D_802416AC_B992AC) = FALSE;
+        set_variable(script, *args, N(D_802416B0_B992B0));
         return ApiStatus_DONE2;
     }
 
@@ -48,10 +44,30 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80241104_B98D04);
 ApiStatus N(func_80241104_B98D04)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802416B0_B992B0) = get_variable(script, *args);
+    N(D_802416AC_B992AC) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024113C_B98D3C);
+/*
+ApiStatus N(func_8024113C_B98D3C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c
index 25e6c9f523..efd01b4c9c 100644
--- a/src/world/area_mim/mim_04/B9DB60.c
+++ b/src/world/area_mim/mim_04/B9DB60.c
@@ -19,23 +19,19 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DF0_B9E750);
 INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80241014_B9E974);
 /*
 ApiStatus N(func_80241014_B9E974)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80242614_B9FF74) == NULL) {
+        N(D_80242614_B9FF74) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80242614_B9FF74)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80242614_B9FF74)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80242614_B9FF74));
+        N(D_80242614_B9FF74) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c
index 085ce3f865..dd7d6d2b52 100644
--- a/src/world/area_mim/mim_05/BA07A0.c
+++ b/src/world/area_mim/mim_05/BA07A0.c
@@ -14,7 +14,7 @@ s32 N(func_80240278_BA09A8)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_8024068C_BA0DBC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c
index 338c53929a..db73a7d349 100644
--- a/src/world/area_mim/mim_06/BA4CF0.c
+++ b/src/world/area_mim/mim_06/BA4CF0.c
@@ -14,7 +14,7 @@ s32 N(func_80240778_BA4EF8)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_80240B8C_BA530C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c
index bd8e48011c..c020d77559 100644
--- a/src/world/area_mim/mim_08/BAD940.c
+++ b/src/world/area_mim/mim_08/BAD940.c
@@ -45,7 +45,7 @@ void N(func_80240CF4_BAE634)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_802443C0_BB1D00)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -76,7 +76,7 @@ ApiStatus N(func_802413AC_BAECEC)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -137,7 +137,7 @@ s32 N(func_802417A0_BAF0E0)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -190,7 +190,7 @@ ApiStatus N(func_80241BB4_BAF4F4)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c
index 7d52557404..cbeea84c6c 100644
--- a/src/world/area_mim/mim_11/BB7070.c
+++ b/src/world/area_mim/mim_11/BB7070.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240034_BB70A4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index c3b20af982..ad3e847b95 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -26,42 +26,38 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4);
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C2C_9C600C);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C80_9C6060);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60_9C6140);
+#include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D68_9C6148);
 /*
 ApiStatus N(func_80240D68_9C6148)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80245F44_9CB324) == NULL) {
+        N(D_80245F44_9CB324) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80245F44_9CB324)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80245F44_9CB324)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80245F44_9CB324));
+        N(D_80245F44_9CB324) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -72,32 +68,208 @@ ApiStatus N(func_80240D68_9C6148)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284);
+/*
+ApiStatus N(func_80240EA4_9C6284)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802410C8_9C64A8);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241134_9C6514);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802412E0_9C66C0);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241454_9C6834);
+/*
+ApiStatus N(func_80241454_9C6834)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802414D8_9C68B8);
+/*
+ApiStatus N(func_802414D8_9C68B8)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802416F0_9C6AD0);
+/*
+ApiStatus N(func_802416F0_9C6AD0)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417A4_9C6B84);
+/*
+ApiStatus N(func_802417A4_9C6B84)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417D8_9C6BB8);
+/*
+ApiStatus N(func_802417D8_9C6BB8)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241858_9C6C38);
+/*
+ApiStatus N(func_80241858_9C6C38)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241870_9C6C50);
+/*
+ApiStatus N(func_80241870_9C6C50)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C);
+/*
+ApiStatus N(func_8024188C_9C6C6C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -112,8 +284,25 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140);
+/*
+void N(func_80241D60_9C7140)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC_9C71AC);
+/*
+ApiStatus N(func_80241DCC_9C71AC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -123,18 +312,14 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408);
 /*
 ApiStatus N(func_80242028_9C7408)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024856C_9CD94C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024856C_9CD94C)) {
+        N(D_8024856C_9CD94C) = FALSE;
+        set_variable(script, *args, N(D_80248570_9CD950));
         return ApiStatus_DONE2;
     }
 
@@ -147,21 +332,56 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C);
 ApiStatus N(func_8024207C_9C745C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80248570_9CD950) = get_variable(script, *args);
+    N(D_8024856C_9CD94C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494);
+/*
+ApiStatus N(func_802420B4_9C7494)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802423CC_9C77AC);
+/*
+ApiStatus N(func_802423CC_9C77AC)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242410_9C77F0);
+/*
+ApiStatus N(func_80242410_9C77F0)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024243C_9C781C);
 
@@ -186,3 +406,11 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428B8_9C7C98);
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428D8_9C7CB8);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242910_9C7CF0);
+/*
+ApiStatus N(func_80242910_9C7CF0)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+
+    playerData->unk_328 = playerData->frameCounter;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c
index 05adb2479d..53b5174006 100644
--- a/src/world/area_nok/nok_02/9D7020.c
+++ b/src/world/area_nok/nok_02/9D7020.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -15,23 +15,19 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054);
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300);
 /*
 ApiStatus N(func_802402E0_9D7300)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802453D0_9DC3F0) == NULL) {
+        N(D_802453D0_9DC3F0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802453D0_9DC3F0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802453D0_9DC3F0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802453D0_9DC3F0));
+        N(D_802453D0_9DC3F0) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -53,18 +49,14 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644);
 /*
 ApiStatus N(func_80240624_9D7644)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80245434_9DC454) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80245434_9DC454)) {
+        N(D_80245434_9DC454) = FALSE;
+        set_variable(script, *args, N(D_80245438_9DC458));
         return ApiStatus_DONE2;
     }
 
@@ -77,10 +69,30 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698);
 ApiStatus N(func_80240678_9D7698)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80245438_9DC458) = get_variable(script, *args);
+    N(D_80245434_9DC454) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802406B0_9D76D0);
+/*
+ApiStatus N(func_802406B0_9D76D0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 84ccf039ab..3094d80c44 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -96,7 +96,7 @@ ApiStatus N(func_80241614_9D8634)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -116,7 +116,7 @@ ApiStatus N(func_80241614_9D8634)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -169,23 +169,19 @@ ApiStatus N(func_80241614_9D8634)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930);
 /*
 ApiStatus N(func_80241910_9D8930)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802470C8_9DE0E8) == NULL) {
+        N(D_802470C8_9DE0E8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802470C8_9DE0E8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802470C8_9DE0E8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802470C8_9DE0E8));
+        N(D_802470C8_9DE0E8) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -196,32 +192,208 @@ ApiStatus N(func_80241910_9D8930)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C);
+/*
+ApiStatus N(func_80241A4C_9D8A6C)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241C70_9D8C90);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CDC_9D8CFC);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241E88_9D8EA8);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241FFC_9D901C);
+/*
+ApiStatus N(func_80241FFC_9D901C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242080_9D90A0);
+/*
+ApiStatus N(func_80242080_9D90A0)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242298_9D92B8);
+/*
+ApiStatus N(func_80242298_9D92B8)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024234C_9D936C);
+/*
+ApiStatus N(func_8024234C_9D936C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242380_9D93A0);
+/*
+ApiStatus N(func_80242380_9D93A0)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242400_9D9420);
+/*
+ApiStatus N(func_80242400_9D9420)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242418_9D9438);
+/*
+ApiStatus N(func_80242418_9D9438)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454);
+/*
+ApiStatus N(func_80242434_9D9454)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -236,8 +408,25 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928);
+/*
+void N(func_80242908_9D9928)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242974_9D9994);
+/*
+ApiStatus N(func_80242974_9D9994)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -247,18 +436,14 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0);
 /*
 ApiStatus N(func_80242BD0_9D9BF0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802496F0_9E0710) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802496F0_9E0710)) {
+        N(D_802496F0_9E0710) = FALSE;
+        set_variable(script, *args, N(D_802496F4_9E0714));
         return ApiStatus_DONE2;
     }
 
@@ -271,21 +456,56 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44);
 ApiStatus N(func_80242C24_9D9C44)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802496F4_9E0714) = get_variable(script, *args);
+    N(D_802496F0_9E0710) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C);
+/*
+ApiStatus N(func_80242C5C_9D9C7C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242F74_9D9F94);
+/*
+ApiStatus N(func_80242F74_9D9F94)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FB8_9D9FD8);
+/*
+ApiStatus N(func_80242FB8_9D9FD8)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FE4_9DA004);
 /*
diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c
index 1d9858d2b5..730b2ece21 100644
--- a/src/world/area_nok/nok_02/9DA8F0.c
+++ b/src/world/area_nok/nok_02/9DA8F0.c
@@ -14,18 +14,14 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C);
 /*
 ApiStatus N(func_80243BEC_9DAC0C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80252400_9E9420) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80252400_9E9420)) {
+        N(D_80252400_9E9420) = FALSE;
+        set_variable(script, *args, N(D_80252404_9E9424));
         return ApiStatus_DONE2;
     }
 
@@ -38,36 +34,72 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60);
 ApiStatus N(func_80243C40_9DAC60)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80252404_9E9424) = get_variable(script, *args);
+    N(D_80252400_9E9420) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C78_9DAC98);
+/*
+ApiStatus N(func_80243C78_9DAC98)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34);
+/*
+ApiStatus N(func_80243D14_9DAD34)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243DB0_9DADD0);
 /*
 ApiStatus N(func_80243DB0_9DADD0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80252720_9E9740) == NULL) {
+        N(D_80252720_9E9740) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80252720_9E9740)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80252720_9E9740)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80252720_9E9740));
+        N(D_80252720_9E9740) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_nok/nok_04/9EDBF0.c b/src/world/area_nok/nok_04/9EDBF0.c
index 0d06344f13..aec83155ee 100644
--- a/src/world/area_nok/nok_04/9EDBF0.c
+++ b/src/world/area_nok/nok_04/9EDBF0.c
@@ -1,6 +1,6 @@
 #include "nok_04.h"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240000_9EDBF0);
+#include "world/common/UnkFunc41.inc.c"
 
 #include "common/UnkFloatFunc.inc.c"
 
diff --git a/src/world/area_nok/nok_04/9EEA80.c b/src/world/area_nok/nok_04/9EEA80.c
index 893a8a0829..4bb639e547 100644
--- a/src/world/area_nok/nok_04/9EEA80.c
+++ b/src/world/area_nok/nok_04/9EEA80.c
@@ -1,3 +1,21 @@
 #include "nok_04.h"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_04/9EEA80", func_80240E90_9EEA80);
+/*
+ApiStatus N(func_80240E90_9EEA80)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c
index 91e948ab25..1701b350ad 100644
--- a/src/world/area_nok/nok_11/9F4A40.c
+++ b/src/world/area_nok/nok_11/9F4A40.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024007C_9F4ABC);
+/*
+void N(func_8024007C_9F4ABC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -51,7 +73,7 @@ void N(func_80241428_9F5E68)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80242888_9F72C8)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -82,7 +104,7 @@ ApiStatus N(func_80241AE0_9F6520)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c
index 34f855a957..347430f36e 100644
--- a/src/world/area_nok/nok_12/9FAD60.c
+++ b/src/world/area_nok/nok_12/9FAD60.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802405EC_9FADDC);
+/*
+void N(func_802405EC_9FADDC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -104,7 +126,7 @@ ApiStatus N(func_802418D8_9FC0C8)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -124,7 +146,7 @@ ApiStatus N(func_802418D8_9FC0C8)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c
index b82710b8fe..dc5df7455f 100644
--- a/src/world/area_nok/nok_14/A02A00.c
+++ b/src/world/area_nok/nok_14/A02A00.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024023C_A02A7C);
+/*
+void N(func_8024023C_A02A7C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -51,7 +73,7 @@ void N(func_802415E8_A03E28)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80243A18_A06258)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -82,7 +104,7 @@ ApiStatus N(func_80241CA0_A044E0)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c
index 15acc60fce..857c4002c8 100644
--- a/src/world/area_nok/nok_15/A06F00.c
+++ b/src/world/area_nok/nok_15/A06F00.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -15,6 +15,28 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34);
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024035C_A0725C);
+/*
+void N(func_8024035C_A0725C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -63,7 +85,7 @@ void N(func_80241708_A08608)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80243D5C_A0AC5C)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -94,7 +116,7 @@ ApiStatus N(func_80241DC0_A08CC0)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c
index a0d9a755d6..f14a8b03f5 100644
--- a/src/world/area_obk/obk_01/BBD980.c
+++ b/src/world/area_obk/obk_01/BBD980.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802407E0_BBD980);
 /*
 ApiStatus N(func_802407E0_BBD980)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802440F0_BC1290) == NULL) {
+        N(D_802440F0_BC1290) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802440F0_BC1290)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802440F0_BC1290)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802440F0_BC1290));
+        N(D_802440F0_BC1290) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -35,18 +31,14 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24_BBDCC4);
 /*
 ApiStatus N(func_80240B24_BBDCC4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80244154_BC12F4) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80244154_BC12F4)) {
+        N(D_80244154_BC12F4) = FALSE;
+        set_variable(script, *args, N(D_80244158_BC12F8));
         return ApiStatus_DONE2;
     }
 
@@ -59,21 +51,56 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18);
 ApiStatus N(func_80240B78_BBDD18)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80244158_BC12F8) = get_variable(script, *args);
+    N(D_80244154_BC12F4) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50);
+/*
+ApiStatus N(func_80240BB0_BBDD50)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240EC8_BBE068);
+/*
+ApiStatus N(func_80240EC8_BBE068)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240F0C_BBE0AC);
+/*
+ApiStatus N(func_80240F0C_BBE0AC)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240F38_BBE0D8);
 
diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c
index 0692895b33..5a6377bfe0 100644
--- a/src/world/area_obk/obk_03/BC43F0.c
+++ b/src/world/area_obk/obk_03/BC43F0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240170_BC43F0);
 /*
 ApiStatus N(func_80240170_BC43F0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80242ECC_BC714C) == NULL) {
+        N(D_80242ECC_BC714C) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80242ECC_BC714C)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80242ECC_BC714C)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80242ECC_BC714C));
+        N(D_80242ECC_BC714C) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -35,18 +31,14 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734);
 /*
 ApiStatus N(func_802404B4_BC4734)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80242F30_BC71B0) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80242F30_BC71B0)) {
+        N(D_80242F30_BC71B0) = FALSE;
+        set_variable(script, *args, N(D_80242F34_BC71B4));
         return ApiStatus_DONE2;
     }
 
@@ -59,18 +51,53 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788);
 ApiStatus N(func_80240508_BC4788)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80242F34_BC71B4) = get_variable(script, *args);
+    N(D_80242F30_BC71B0) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240540_BC47C0);
+/*
+ApiStatus N(func_80240540_BC47C0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240858_BC4AD8);
+/*
+ApiStatus N(func_80240858_BC4AD8)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_8024089C_BC4B1C);
+/*
+ApiStatus N(func_8024089C_BC4B1C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c
index d3d077e9e1..4469cbd523 100644
--- a/src/world/area_obk/obk_04/BC7EB0.c
+++ b/src/world/area_obk/obk_04/BC7EB0.c
@@ -21,23 +21,19 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240910_BC8770);
 INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240940_BC87A0);
 /*
 ApiStatus N(func_80240940_BC87A0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80243A10_BCB870) == NULL) {
+        N(D_80243A10_BCB870) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80243A10_BCB870)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80243A10_BCB870)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80243A10_BCB870));
+        N(D_80243A10_BCB870) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c
index acec6f02ef..427338357a 100644
--- a/src/world/area_obk/obk_07/BCEBF0.c
+++ b/src/world/area_obk/obk_07/BCEBF0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0);
 /*
 ApiStatus N(func_80240000_BCEBF0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241FB0_BD0BA0) == NULL) {
+        N(D_80241FB0_BD0BA0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241FB0_BD0BA0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241FB0_BD0BA0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241FB0_BD0BA0));
+        N(D_80241FB0_BD0BA0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_obk/obk_07/BCF0F0.c b/src/world/area_obk/obk_07/BCF0F0.c
index 3bf57eef6a..ab0380861e 100644
--- a/src/world/area_obk/obk_07/BCF0F0.c
+++ b/src/world/area_obk/obk_07/BCF0F0.c
@@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241674_BD0264);
 
 INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802416F8_BD02E8);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241788_BD0378);
+#include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241790_BD0380);
 
diff --git a/src/world/area_obk/obk_09/BDA7B0.c b/src/world/area_obk/obk_09/BDA7B0.c
index 6f872f60cb..efb2d8ea94 100644
--- a/src/world/area_obk/obk_09/BDA7B0.c
+++ b/src/world/area_obk/obk_09/BDA7B0.c
@@ -1,3 +1,3 @@
 #include "obk_09.h"
 
-INCLUDE_ASM(s32, "world/area_obk/obk_09/BDA7B0", func_80240000_BDA7B0);
+#include "world/common/UnkFunc41.inc.c"
diff --git a/src/world/area_obk/obk_09/BDAB00.c b/src/world/area_obk/obk_09/BDAB00.c
index 8321e03025..9ea1bf9287 100644
--- a/src/world/area_obk/obk_09/BDAB00.c
+++ b/src/world/area_obk/obk_09/BDAB00.c
@@ -1,3 +1,21 @@
 #include "obk_09.h"
 
 INCLUDE_ASM(s32, "world/area_obk/obk_09/BDAB00", func_80240350_BDAB00);
+/*
+ApiStatus N(func_80240350_BDAB00)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_omo/omo_01/D9B150.c b/src/world/area_omo/omo_01/D9B150.c
index 78c3081658..dace9b020c 100644
--- a/src/world/area_omo/omo_01/D9B150.c
+++ b/src/world/area_omo/omo_01/D9B150.c
@@ -1,9 +1,159 @@
 #include "omo_01.h"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_80240260_D9B150);
+/*
+void N(func_80240260_D9B150)(ScriptInstance *script, NpcAISettings *npcAISettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    f32 temp_f0;
+    f32 temp_f20;
+    f64 temp_f2;
+    f32 phi_f22;
+    f32 phi_f24;
+    f32 phi_f26;
+    s32 phi_s3;
+
+    f32 subroutine_arg8;
+    f32 subroutine_arg9;
+    f32 subroutine_argA;
+    f32 subroutine_argB;
+    f32 subroutine_argC;
+    f32 subroutine_argD;
+    f32 subroutine_argE;
+    f32 subroutine_argF;
+    f32 subroutine_arg10;
+
+    npc->duration = npcAISettings->unk_20 / 2 + rand_int(npcAISettings->unk_20 / 2 + 1);
+    npc->currentAnim = enemy->animList[3];
+    npc->moveSpeed = npcAISettings->chaseSpeed;
+    phi_s3 = FALSE;
+
+    temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) + 180.0f);
+    temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20);
+    if (npcAISettings->unk_1C.s < fabsf(temp_f0)) {
+        temp_f20 = npc->yaw;
+        if (temp_f0 < 0.0f) {
+            temp_f20 += -npcAISettings->unk_1C.s;
+        } else {
+            temp_f20 += npcAISettings->unk_1C.s;
+        }
+    }
+
+    npc->yaw = clamp_angle(temp_f20);
+
+    subroutine_arg8 = npc->pos.x;
+    subroutine_arg9 = npc->pos.y;
+    subroutine_argA = npc->pos.z;
+
+    temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) + 180.0f);
+    phi_f22 = 0.0f;
+    phi_f24 = 0.0f;
+    phi_f26 = 0.0f;
+
+    if (func_800DDCEC(npc->unk_80, &subroutine_arg8, &subroutine_arg9, &subroutine_argA, npc->moveSpeed * 4.5, temp_f20, npc->collisionHeight, npc->collisionRadius) != 0) {
+        phi_f22 = dist2D(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+
+        subroutine_argB = npc->pos.x;
+        subroutine_argC = npc->pos.y;
+        subroutine_argD = npc->pos.z;
+
+        if (func_800DDCEC(npc->unk_80, &subroutine_argB, &subroutine_argC, &subroutine_argD, npc->moveSpeed * 4.5, clamp_angle(temp_f20 + 35.0f), npc->collisionHeight, npc->collisionRadius) != 0) {
+            phi_f24 = dist2D(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+        }
+
+        subroutine_argE = npc->pos.x;
+        subroutine_argF = npc->pos.y;
+        subroutine_arg10 = npc->pos.z;
+
+        if (func_800DDCEC(npc->unk_80, &subroutine_argE, &subroutine_argF, &subroutine_arg10, npc->moveSpeed * 4.5, clamp_angle(temp_f20 - 35.0f), npc->collisionHeight, npc->collisionRadius) != 0) {
+            phi_f26 = dist2D(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+        }
+
+        dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+
+        if ((phi_f22 < npc->moveSpeed * 1.5) && (phi_f24 < npc->moveSpeed * 1.5) && (phi_f26 < npc->moveSpeed * 1.5) &&
+            (func_800490B4(territory, enemy, npcAISettings->alertRadius, npcAISettings->unk_10.f, 0) != 0)) {
+            phi_s3 = TRUE;
+        }
+
+        if (!phi_s3) {
+            if ((phi_f24 < phi_f22) && (phi_f26 < phi_f24)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+            } else if ((phi_f24 < phi_f22) && (phi_f24 < phi_f26)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA);
+            } else if ((phi_f22 < phi_f24) && (phi_f26 < phi_f22)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+            } else if ((phi_f26 < phi_f24) && (phi_f22 < phi_f26)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD);
+            } else if ((phi_f22 < phi_f26) && (phi_f24 < phi_f22)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+            } else if ((phi_f24 < phi_f26) && (phi_f22 < phi_f24)) {
+                temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10);
+            }
+
+            temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20);
+            if (npcAISettings->unk_1C.s < fabsf(temp_f0)) {
+                temp_f20 = npc->yaw;
+                if (temp_f0 < 0.0f) {
+                    temp_f20 += -npcAISettings->unk_1C.s;
+                } else {
+                    temp_f20 += npcAISettings->unk_1C.s;
+                }
+            }
+            npc->yaw = clamp_angle(temp_f20);
+        }
+    }
+    if (phi_s3) {
+        npc->duration = 0xA;
+        npc->currentAnim = enemy->animList[8];
+    }
+    script->functionTemp[0].s = 0xD;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_80240844_D9B734);
+/*
+void N(func_80240844_D9B734)(ScriptInstance *script, NpcAISettings *npcAISettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc *npc = get_npc_unsafe(enemy->npcID);
+    s32 var;
+
+    if (func_800490B4(territory, enemy, npcAISettings->chaseRadius, npcAISettings->unk_28.f, 1) == 0) {
+        fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var);
+        npc->currentAnim = enemy->animList[0];
+        npc->duration = 25;
+        script->functionTemp[0].s = 14;
+    } else {
+        if (npc->currentAnim != enemy->animList[8]) {
+            if (npc->moveSpeed < 4.0) {
+                func_8003D660(npc, 0);
+            } else {
+                func_8003D660(npc, 1);
+            }
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+        }
+        if (npc->duration > 0) {
+            npc->duration--;
+            return;
+        } else {
+            script->functionTemp[0].s = 12;
+        }
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_802409A8_D9B898);
+/*
+void N(func_802409A8_D9B898)(ScriptInstance *script, NpcAISettings *npcAISettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc *npc = get_npc_unsafe(enemy->npcID);
+
+    npc->duration--;
+    if (npc->duration == 0) {
+        script->functionTemp[0].s = NULL;
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_omo/omo_01/D9B150", func_802409EC_D9B8DC);
diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c
index e5c67b5926..a7d22d4d7c 100644
--- a/src/world/area_omo/omo_04/DAD400.c
+++ b/src/world/area_omo/omo_04/DAD400.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400);
 /*
 ApiStatus N(func_80240000_DAD400)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80242630_DAFA30) == NULL) {
+        N(D_80242630_DAFA30) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80242630_DAFA30)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80242630_DAFA30)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80242630_DAFA30));
+        N(D_80242630_DAFA30) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -78,7 +74,7 @@ void N(func_80240FF4_DAE3F4)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80242EF0_DB02F0)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -109,7 +105,7 @@ ApiStatus N(func_802416AC_DAEAAC)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c
index 090ffa2644..39f3bf0e58 100644
--- a/src/world/area_omo/omo_05/DB22C0.c
+++ b/src/world/area_omo/omo_05/DB22C0.c
@@ -57,7 +57,7 @@ void N(func_802416A8_DB3968)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80242F88_DB5248)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -88,7 +88,7 @@ ApiStatus N(func_80241D60_DB4020)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -143,18 +143,14 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438);
 /*
 ApiStatus N(func_80242178_DB4438)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80243098_DB5358) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80243098_DB5358)) {
+        N(D_80243098_DB5358) = FALSE;
+        set_variable(script, *args, N(D_8024309C_DB535C));
         return ApiStatus_DONE2;
     }
 
@@ -167,16 +163,48 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802421CC_DB448C);
 ApiStatus N(func_802421CC_DB448C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_8024309C_DB535C) = get_variable(script, *args);
+    N(D_80243098_DB5358) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242204_DB44C4);
+/*
+ApiStatus N(func_80242204_DB44C4)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802422A0_DB4560);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242328_DB45E8);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802423C8_DB4688);
+/*
+ApiStatus N(func_802423C8_DB4688)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
+
+    for (i = 0; i <= 90; i++) {
+        N(D_802457C0)[i] = 128 + i;
+    }
+
+    N(D_8024592C) = 0;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c
index 81bc7d5756..bf68f33b5f 100644
--- a/src/world/area_omo/omo_06/DB8180.c
+++ b/src/world/area_omo/omo_06/DB8180.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180);
 /*
 ApiStatus N(func_80240870_DB8180)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802456C0_DBCFD0) == NULL) {
+        N(D_802456C0_DBCFD0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802456C0_DBCFD0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802456C0_DBCFD0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802456C0_DBCFD0));
+        N(D_802456C0_DBCFD0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c
index c52610660c..5f83a1c84d 100644
--- a/src/world/area_omo/omo_07/DBD2B0.c
+++ b/src/world/area_omo/omo_07/DBD2B0.c
@@ -104,7 +104,7 @@ ApiStatus N(func_80241100_DBE3B0)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -124,7 +124,7 @@ ApiStatus N(func_80241100_DBE3B0)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -227,7 +227,7 @@ void N(func_802425CC_DBF87C)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80243A14_DC0CC4)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -258,7 +258,7 @@ ApiStatus N(func_80242C84_DBFF34)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c
index 620afd964d..58d706d9b3 100644
--- a/src/world/area_omo/omo_07/DC01D0.c
+++ b/src/world/area_omo/omo_07/DC01D0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0);
 /*
 ApiStatus N(func_80242F20_DC01D0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80245E00_DC30B0) == NULL) {
+        N(D_80245E00_DC30B0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80245E00_DC30B0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80245E00_DC30B0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80245E00_DC30B0));
+        N(D_80245E00_DC30B0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c
index 5c7bbf6acc..2d563c11e7 100644
--- a/src/world/area_omo/omo_09/DCD3F0.c
+++ b/src/world/area_omo/omo_09/DCD3F0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0);
 /*
 ApiStatus N(func_80240720_DCD3F0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80247010_DD3CE0) == NULL) {
+        N(D_80247010_DD3CE0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80247010_DD3CE0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80247010_DD3CE0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80247010_DD3CE0));
+        N(D_80247010_DD3CE0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c
index 8b57c85ca4..efb6fb75de 100644
--- a/src/world/area_omo/omo_09/DCD6B0.c
+++ b/src/world/area_omo/omo_09/DCD6B0.c
@@ -104,7 +104,7 @@ ApiStatus N(func_80241AE0_DCE7B0)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -124,7 +124,7 @@ ApiStatus N(func_80241AE0_DCE7B0)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c
index c476c8c030..664c936f2a 100644
--- a/src/world/area_omo/omo_11/DDCFC0.c
+++ b/src/world/area_omo/omo_11/DDCFC0.c
@@ -14,28 +14,6 @@ ApiStatus N(func_802407CC_DDCFFC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240864_DDD094);
-
-INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802408B0_DDD0E0);
-/*
-ApiStatus N(func_802408B0_DDD0E0)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_8024095C_DDD18C);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240BAC_DDD3DC);
@@ -50,16 +28,7 @@ ApiStatus N(func_80240BAC_DDD3DC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240CA0_DDD4D0);
-/*
-ApiStatus N(func_80240CA0_DDD4D0)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240D90_DDD5C0)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240D90_DDD5C0)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80241E98_DDE6C8)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240D90_DDD5C0)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240D90_DDD5C0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241E98_DDE6C8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240D90_DDD5C0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241E98_DDE6C8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -199,4 +168,4 @@ ApiStatus N(func_80240D90_DDD5C0)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241498_DDDCC8);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c
index 5682406a59..8e13dd8a32 100644
--- a/src/world/area_omo/omo_12/DDF310.c
+++ b/src/world/area_omo/omo_12/DDF310.c
@@ -1,6 +1,6 @@
 #include "omo_12.h"
 
-INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240000_DDF310);
+#include "world/common/UnkFunc41.inc.c"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240184_DDF494);
 
diff --git a/src/world/area_omo/omo_12/DDF730.c b/src/world/area_omo/omo_12/DDF730.c
index 98d524bb79..4168ffc8fb 100644
--- a/src/world/area_omo/omo_12/DDF730.c
+++ b/src/world/area_omo/omo_12/DDF730.c
@@ -1,3 +1,21 @@
 #include "omo_12.h"
 
 INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF730", func_80240420_DDF730);
+/*
+ApiStatus N(func_80240420_DDF730)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c
index 530efe73d6..53cfad6645 100644
--- a/src/world/area_omo/omo_13/DE2710.c
+++ b/src/world/area_omo/omo_13/DE2710.c
@@ -24,18 +24,14 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390);
 /*
 ApiStatus N(func_80240F00_DE3390)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80241C04_DE4094) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80241C04_DE4094)) {
+        N(D_80241C04_DE4094) = FALSE;
+        set_variable(script, *args, N(D_80241C08_DE4098));
         return ApiStatus_DONE2;
     }
 
@@ -48,12 +44,32 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4);
 ApiStatus N(func_80240F54_DE33E4)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241C08_DE4098) = get_variable(script, *args);
+    N(D_80241C04_DE4094) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F8C_DE341C);
+/*
+ApiStatus N(func_80240F8C_DE341C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80241028_DE34B8);
diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c
index f43d968ec9..854e12c88f 100644
--- a/src/world/area_omo/omo_13/DE36C0.c
+++ b/src/world/area_omo/omo_13/DE36C0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0);
 /*
 ApiStatus N(func_80241230_DE36C0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80242C70_DE5100) == NULL) {
+        N(D_80242C70_DE5100) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80242C70_DE5100)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80242C70_DE5100)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80242C70_DE5100));
+        N(D_80242C70_DE5100) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c
index d899bfad66..5e1a2757b6 100644
--- a/src/world/area_omo/omo_17/DEF400.c
+++ b/src/world/area_omo/omo_17/DEF400.c
@@ -57,7 +57,7 @@ void N(func_80241C08_DF0AA8)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80246184_DF5024)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -88,7 +88,7 @@ ApiStatus N(func_802422C0_DF1160)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_osr/osr_00/AACBB0.c b/src/world/area_osr/osr_00/AACBB0.c
index 77f5743eff..f3ca3c28b6 100644
--- a/src/world/area_osr/osr_00/AACBB0.c
+++ b/src/world/area_osr/osr_00/AACBB0.c
@@ -1,8 +1,8 @@
 #include "osr_00.h"
 
-INCLUDE_ASM(s32, "world/area_osr/osr_00/AACBB0", func_80240380_AACBB0);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_osr/osr_00/AACBB0", func_802404A4_AACCD4);
+#include "world/common/UnkFunc26.inc.c"
 
 INCLUDE_ASM(s32, "world/area_osr/osr_00/AACBB0", func_80240678_AACEA8);
 
diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c
index 3d473afdd4..e78772f886 100644
--- a/src/world/area_osr/osr_01/AB0350.c
+++ b/src/world/area_osr/osr_01/AB0350.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240360_AB0350);
 /*
 ApiStatus N(func_80240360_AB0350)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802411B8_AB11A8) == NULL) {
+        N(D_802411B8_AB11A8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802411B8_AB11A8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802411B8_AB11A8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802411B8_AB11A8));
+        N(D_802411B8_AB11A8) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -35,18 +31,14 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406A4_AB0694);
 /*
 ApiStatus N(func_802406A4_AB0694)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024121C_AB120C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024121C_AB120C)) {
+        N(D_8024121C_AB120C) = FALSE;
+        set_variable(script, *args, N(D_80241220_AB1210));
         return ApiStatus_DONE2;
     }
 
@@ -59,18 +51,53 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8);
 ApiStatus N(func_802406F8_AB06E8)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241220_AB1210) = get_variable(script, *args);
+    N(D_8024121C_AB120C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720);
+/*
+ApiStatus N(func_80240730_AB0720)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240A48_AB0A38);
+/*
+ApiStatus N(func_80240A48_AB0A38)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240A8C_AB0A7C);
+/*
+ApiStatus N(func_80240A8C_AB0A7C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c
index f5f709ed57..19f3fd8983 100644
--- a/src/world/area_pra/pra_01/D4D060.c
+++ b/src/world/area_pra/pra_01/D4D060.c
@@ -17,18 +17,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC);
 /*
 ApiStatus N(func_802411AC_D4E1EC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80241F94_D4EFD4) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80241F94_D4EFD4)) {
+        N(D_80241F94_D4EFD4) = FALSE;
+        set_variable(script, *args, N(D_80241F98_D4EFD8));
         return ApiStatus_DONE2;
     }
 
@@ -41,15 +37,55 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241200_D4E240);
 ApiStatus N(func_80241200_D4E240)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241F98_D4EFD8) = get_variable(script, *args);
+    N(D_80241F94_D4EFD4) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238_D4E278);
+/*
+ApiStatus N(func_80241238_D4E278)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314);
+/*
+ApiStatus N(func_802412D4_D4E314)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 ApiStatus PostChapter7StatUpdate(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
index 1cdabd1ff8..5eb34e1c0e 100644
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@@ -10,18 +10,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_8024114C_D5113C);
 /*
 ApiStatus N(func_8024114C_D5113C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80242ACC_D52ABC) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80242ACC_D52ABC)) {
+        N(D_80242ACC_D52ABC) = FALSE;
+        set_variable(script, *args, N(D_80242AD0_D52AC0));
         return ApiStatus_DONE2;
     }
 
@@ -34,21 +30,61 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411A0_D51190);
 ApiStatus N(func_802411A0_D51190)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80242AD0_D52AC0) = get_variable(script, *args);
+    N(D_80242ACC_D52ABC) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8);
+/*
+ApiStatus N(func_802411D8_D511C8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241274_D51264);
+/*
+ApiStatus N(func_80241274_D51264)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241310_D51300);
 
 #include "world/common/GetEntityPosition.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241478_D51468);
+#include "world/common/UnkFunc44.inc.c"
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498);
 
diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c
index ae40d26669..3ffc166beb 100644
--- a/src/world/area_pra/pra_05/D55BD0.c
+++ b/src/world/area_pra/pra_05/D55BD0.c
@@ -5,23 +5,19 @@
 INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0);
 /*
 ApiStatus N(func_80240F20_D56AD0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241680_D57230) == NULL) {
+        N(D_80241680_D57230) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241680_D57230)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241680_D57230)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241680_D57230));
+        N(D_80241680_D57230) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c
index fda7c739e9..4da4ce899b 100644
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@@ -10,18 +10,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC);
 /*
 ApiStatus N(func_8024114C_D599DC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80241D98_D5A628) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80241D98_D5A628)) {
+        N(D_80241D98_D5A628) = FALSE;
+        set_variable(script, *args, N(D_80241D9C_D5A62C));
         return ApiStatus_DONE2;
     }
 
@@ -34,15 +30,55 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411A0_D59A30);
 ApiStatus N(func_802411A0_D59A30)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80241D9C_D5A62C) = get_variable(script, *args);
+    N(D_80241D98_D5A628) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411D8_D59A68);
+/*
+ApiStatus N(func_802411D8_D59A68)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241274_D59B04);
+/*
+ApiStatus N(func_80241274_D59B04)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241310_D59BA0);
 
diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c
index c3eb757b95..e68d09aee7 100644
--- a/src/world/area_pra/pra_11/D61520.c
+++ b/src/world/area_pra/pra_11/D61520.c
@@ -5,23 +5,19 @@
 INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420);
 /*
 ApiStatus N(func_80240F20_D62420)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241610_D62B10) == NULL) {
+        N(D_80241610_D62B10) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241610_D62B10)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241610_D62B10)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241610_D62B10));
+        N(D_80241610_D62B10) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c
index 90fcadce78..756a7c19cb 100644
--- a/src/world/area_pra/pra_12/D62D10.c
+++ b/src/world/area_pra/pra_12/D62D10.c
@@ -7,23 +7,19 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10);
 INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60);
 /*
 ApiStatus N(func_80240F50_D63C60)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802416B0_D643C0) == NULL) {
+        N(D_802416B0_D643C0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802416B0_D643C0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802416B0_D643C0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802416B0_D643C0));
+        N(D_802416B0_D643C0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c
index d4eb32d1a3..34704d017b 100644
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@@ -10,18 +10,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C);
 /*
 ApiStatus N(func_8024114C_D6572C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802422CC_D668AC) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802422CC_D668AC)) {
+        N(D_802422CC_D668AC) = FALSE;
+        set_variable(script, *args, N(D_802422D0_D668B0));
         return ApiStatus_DONE2;
     }
 
@@ -34,15 +30,55 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411A0_D65780);
 ApiStatus N(func_802411A0_D65780)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802422D0_D668B0) = get_variable(script, *args);
+    N(D_802422CC_D668AC) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411D8_D657B8);
+/*
+ApiStatus N(func_802411D8_D657B8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241274_D65854);
+/*
+ApiStatus N(func_80241274_D65854)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241310_D658F0);
 
diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c
index f72c3b6e90..5e529b4cd6 100644
--- a/src/world/area_pra/pra_14/D67D20.c
+++ b/src/world/area_pra/pra_14/D67D20.c
@@ -5,23 +5,19 @@
 INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20);
 /*
 ApiStatus N(func_80240F20_D68C20)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241930_D69630) == NULL) {
+        N(D_80241930_D69630) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241930_D69630)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241930_D69630)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241930_D69630));
+        N(D_80241930_D69630) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
index 91441587cb..87cb2551fb 100644
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@@ -10,18 +10,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC);
 /*
 ApiStatus N(func_8024114C_D6FAFC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024219C_D70B4C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024219C_D70B4C)) {
+        N(D_8024219C_D70B4C) = FALSE;
+        set_variable(script, *args, N(D_802421A0_D70B50));
         return ApiStatus_DONE2;
     }
 
@@ -34,15 +30,55 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411A0_D6FB50);
 ApiStatus N(func_802411A0_D6FB50)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802421A0_D70B50) = get_variable(script, *args);
+    N(D_8024219C_D70B4C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411D8_D6FB88);
+/*
+ApiStatus N(func_802411D8_D6FB88)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241274_D6FC24);
+/*
+ApiStatus N(func_80241274_D6FC24)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241310_D6FCC0);
 
diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c
index 6f5dcb46e3..e7f9efa4bf 100644
--- a/src/world/area_pra/pra_27/D799F0.c
+++ b/src/world/area_pra/pra_27/D799F0.c
@@ -7,23 +7,19 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0);
 INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940);
 /*
 ApiStatus N(func_80240F50_D7A940)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241690_D7B080) == NULL) {
+        N(D_80241690_D7B080) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241690_D7B080)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241690_D7B080)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241690_D7B080));
+        N(D_80241690_D7B080) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c
index 798e7c8baf..dfa7f09896 100644
--- a/src/world/area_pra/pra_28/D7B2A0.c
+++ b/src/world/area_pra/pra_28/D7B2A0.c
@@ -7,23 +7,19 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0);
 INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0);
 /*
 ApiStatus N(func_80240F50_D7C1F0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241690_D7C930) == NULL) {
+        N(D_80241690_D7C930) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241690_D7C930)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241690_D7C930)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241690_D7C930));
+        N(D_80241690_D7C930) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c
index bd822f767b..361e794d00 100644
--- a/src/world/area_pra/pra_31/D7ED80.c
+++ b/src/world/area_pra/pra_31/D7ED80.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC);
 /*
 ApiStatus N(func_8024024C_D7EFAC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024119C_D7FEFC) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024119C_D7FEFC)) {
+        N(D_8024119C_D7FEFC) = FALSE;
+        set_variable(script, *args, N(D_802411A0_D7FF00));
         return ApiStatus_DONE2;
     }
 
@@ -32,15 +28,55 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402A0_D7F000);
 ApiStatus N(func_802402A0_D7F000)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802411A0_D7FF00) = get_variable(script, *args);
+    N(D_8024119C_D7FEFC) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402D8_D7F038);
+/*
+ApiStatus N(func_802402D8_D7F038)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240374_D7F0D4);
+/*
+ApiStatus N(func_80240374_D7F0D4)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240410_D7F170);
 
diff --git a/src/world/area_pra/pra_32/D86A20.c b/src/world/area_pra/pra_32/D86A20.c
index 1e15965688..ac380ebe41 100644
--- a/src/world/area_pra/pra_32/D86A20.c
+++ b/src/world/area_pra/pra_32/D86A20.c
@@ -85,7 +85,7 @@ ApiStatus N(func_80240728_D87128)(ScriptInstance* script, s32 isInitialCall) {
 
     ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f));
     ptr->unk_4C = clamp_angle(ptr->unk_4C + 8);
-    if (dist2D(playerStatus->position.x, playerStatus->position.z, 
+    if (dist2D(playerStatus->position.x, playerStatus->position.z,
                ptr->unk_18, ptr->unk_20) <= 30.0f) {
         ptr->unk_4E = 3;
     }
diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c
index f6ab0a6e85..44d4540492 100644
--- a/src/world/area_pra/pra_35/D8D270.c
+++ b/src/world/area_pra/pra_35/D8D270.c
@@ -96,7 +96,7 @@ ApiStatus N(func_80241AB4_D8ED04)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -116,7 +116,7 @@ ApiStatus N(func_80241AB4_D8ED04)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -180,7 +180,7 @@ s32 N(func_80241FB8_D8F208)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -235,7 +235,7 @@ ApiStatus N(func_80242698_D8F8E8)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c
index 5a1f81147a..701a2ab9bc 100644
--- a/src/world/area_pra/pra_35/D8FBA0.c
+++ b/src/world/area_pra/pra_35/D8FBA0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0);
 /*
 ApiStatus N(func_80242950_D8FBA0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80243DE0_D91030) == NULL) {
+        N(D_80243DE0_D91030) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80243DE0_D91030)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80243DE0_D91030)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80243DE0_D91030));
+        N(D_80243DE0_D91030) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c
index 6d735d4364..225e4a9c03 100644
--- a/src/world/area_pra/pra_37/D92F40.c
+++ b/src/world/area_pra/pra_37/D92F40.c
@@ -18,7 +18,7 @@ s32 N(func_80241158_D94098)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -71,7 +71,7 @@ ApiStatus N(func_8024156C_D944AC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index b13525bbb0..674ddd5e21 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -10,18 +10,14 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC);
 /*
 ApiStatus N(func_8024053C_CF80AC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_802432D0_CFAE40) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_802432D0_CFAE40)) {
+        N(D_802432D0_CFAE40) = FALSE;
+        set_variable(script, *args, N(D_802432D4_CFAE44));
         return ApiStatus_DONE2;
     }
 
@@ -34,36 +30,72 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100);
 ApiStatus N(func_80240590_CF8100)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_802432D4_CFAE44) = get_variable(script, *args);
+    N(D_802432D0_CFAE40) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802405C8_CF8138);
+/*
+ApiStatus N(func_802405C8_CF8138)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4);
+/*
+ApiStatus N(func_80240664_CF81D4)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270);
 /*
 ApiStatus N(func_80240700_CF8270)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802435F0_CFB160) == NULL) {
+        N(D_802435F0_CFB160) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802435F0_CFB160)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802435F0_CFB160)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802435F0_CFB160));
+        N(D_802435F0_CFB160) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -74,32 +106,208 @@ ApiStatus N(func_80240700_CF8270)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC);
+/*
+ApiStatus N(func_8024083C_CF83AC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240A60_CF85D0);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240ACC_CF863C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240C78_CF87E8);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240DEC_CF895C);
+/*
+ApiStatus N(func_80240DEC_CF895C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240E70_CF89E0);
+/*
+ApiStatus N(func_80240E70_CF89E0)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241088_CF8BF8);
+/*
+ApiStatus N(func_80241088_CF8BF8)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024113C_CF8CAC);
+/*
+ApiStatus N(func_8024113C_CF8CAC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241170_CF8CE0);
+/*
+ApiStatus N(func_80241170_CF8CE0)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802411F0_CF8D60);
+/*
+ApiStatus N(func_802411F0_CF8D60)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241208_CF8D78);
+/*
+ApiStatus N(func_80241208_CF8D78)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94);
+/*
+ApiStatus N(func_80241224_CF8D94)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -114,16 +322,48 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268);
+/*
+void N(func_802416F8_CF9268)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241764_CF92D4);
+/*
+ApiStatus N(func_80241764_CF92D4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A10_CF9580);
+/*
+ApiStatus N(func_80241A10_CF9580)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A54_CF95C4);
+/*
+ApiStatus N(func_80241A54_CF95C4)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "common/GetItemEntityPosition.inc.c"
 
@@ -132,23 +372,19 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690);
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800);
 /*
 ApiStatus N(func_80241C90_CF9800)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_8024D8F0_D05460) == NULL) {
+        N(D_8024D8F0_D05460) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_8024D8F0_D05460)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_8024D8F0_D05460)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_8024D8F0_D05460));
+        N(D_8024D8F0_D05460) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c
index a26aa3763c..0b221c5920 100644
--- a/src/world/area_sam/sam_02/D05730.c
+++ b/src/world/area_sam/sam_02/D05730.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240034_D05764);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 740bedb187..4fa290b379 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -6,42 +6,38 @@
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409F0_D06120);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240A44_D06174);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254);
+#include "world/common/UnkFunc36.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C);
 /*
 ApiStatus N(func_80240B2C_D0625C)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80246B60_D0C290) == NULL) {
+        N(D_80246B60_D0C290) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80246B60_D0C290)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80246B60_D0C290)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80246B60_D0C290));
+        N(D_80246B60_D0C290) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -52,32 +48,208 @@ ApiStatus N(func_80240B2C_D0625C)(ScriptInstance* script, s32 isInitialCall) {
 #include "world/common/Set80151310.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398);
+/*
+ApiStatus N(func_80240C68_D06398)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240E8C_D065BC);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240EF8_D06628);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802410A4_D067D4);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", begin_battle_D06948);
+/*
+ApiStatus N(begin_battle_D06948)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024129C_D069CC);
+/*
+ApiStatus N(func_8024129C_D069CC)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802414B4_D06BE4);
+/*
+ApiStatus N(func_802414B4_D06BE4)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241568_D06C98);
+/*
+ApiStatus N(func_80241568_D06C98)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024159C_D06CCC);
+/*
+ApiStatus N(func_8024159C_D06CCC)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024161C_D06D4C);
+/*
+ApiStatus N(func_8024161C_D06D4C)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241634_D06D64);
+/*
+ApiStatus N(func_80241634_D06D64)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80);
+/*
+ApiStatus N(func_80241650_D06D80)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -92,5 +264,22 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254);
+/*
+void N(func_80241B24_D07254)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B90_D072C0);
+/*
+ApiStatus N(func_80241B90_D072C0)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c
index 44102a0bfd..1c77445167 100644
--- a/src/world/area_sam/sam_03/D110C0.c
+++ b/src/world/area_sam/sam_03/D110C0.c
@@ -16,7 +16,7 @@ s32 N(func_80240258_D11318)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -69,7 +69,7 @@ ApiStatus N(func_8024066C_D1172C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c
index e7a5dd034b..66fffd8f44 100644
--- a/src/world/area_sam/sam_04/D138E0.c
+++ b/src/world/area_sam/sam_04/D138E0.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C);
 /*
 ApiStatus N(func_8024053C_D13B0C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024387C_D16E4C) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024387C_D16E4C)) {
+        N(D_8024387C_D16E4C) = FALSE;
+        set_variable(script, *args, N(D_80243880_D16E50));
         return ApiStatus_DONE2;
     }
 
@@ -32,12 +28,52 @@ INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240590_D13B60);
 ApiStatus N(func_80240590_D13B60)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80243880_D16E50) = get_variable(script, *args);
+    N(D_8024387C_D16E4C) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_802405C8_D13B98);
+/*
+ApiStatus N(func_802405C8_D13B98)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240664_D13C34);
+/*
+ApiStatus N(func_80240664_D13C34)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c
index 0277c25e68..3767c36227 100644
--- a/src/world/area_sam/sam_05/D187E0.c
+++ b/src/world/area_sam/sam_05/D187E0.c
@@ -14,7 +14,7 @@ s32 N(func_80240208_D189E8)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_8024061C_D18DFC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index c15c19129e..ed67079125 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -41,7 +41,7 @@ void N(func_802411A4_D21034)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_802441B8_D24048)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -72,7 +72,7 @@ ApiStatus N(func_8024185C_D216EC)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
@@ -122,23 +122,19 @@ ApiStatus N(func_8024185C_D216EC)(ScriptInstance* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48_D218D8);
 /*
 ApiStatus N(func_80241A48_D218D8)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802443D0_D24260) == NULL) {
+        N(D_802443D0_D24260) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802443D0_D24260)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802443D0_D24260)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802443D0_D24260));
+        N(D_802443D0_D24260) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -154,18 +150,14 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C);
 /*
 ApiStatus N(func_80241D8C_D21C1C)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80244434_D242C4) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80244434_D242C4)) {
+        N(D_80244434_D242C4) = FALSE;
+        set_variable(script, *args, N(D_80244438_D242C8));
         return ApiStatus_DONE2;
     }
 
@@ -178,42 +170,97 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0_D21C70);
 ApiStatus N(func_80241DE0_D21C70)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80244438_D242C8) = get_variable(script, *args);
+    N(D_80244434_D242C4) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8);
+/*
+ApiStatus N(func_80241E18_D21CA8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44);
+/*
+ApiStatus N(func_80241EB4_D21D44)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/Call800E9894.inc.c"
 
 #include "world/common/Call800E98C4SyncStatusMenu.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28);
+#include "world/common/UnkFunc32.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4);
+#include "world/common/CamSetFOV.inc.c"
 
 #include "world/common/AwaitScriptComplete.inc.c"
 
 #include "world/common/PartnerToggleAbilityScript.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242110_D21FA0);
+#include "world/common/DoesPlayerNeedSleep.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242164_D21FF4);
+#include "world/common/UnkFunc35.inc.c"
 
 #include "world/common/GetPartnerCall800EB168.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4);
+#include "world/common/UnkFunc36.inc.c"
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802424C8_D22358);
+/*
+ApiStatus N(func_802424C8_D22358)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024250C_D2239C);
+/*
+ApiStatus N(func_8024250C_D2239C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242538_D223C8);
diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c
index 42bc964efb..57a58d4fa1 100644
--- a/src/world/area_sam/sam_07/D2BD30.c
+++ b/src/world/area_sam/sam_07/D2BD30.c
@@ -24,7 +24,7 @@ s32 N(func_80240858_D2C588)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -77,7 +77,7 @@ ApiStatus N(func_80240C6C_D2C99C)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c
index a92de76640..b4b301a10b 100644
--- a/src/world/area_sam/sam_08/D2FC80.c
+++ b/src/world/area_sam/sam_08/D2FC80.c
@@ -14,28 +14,6 @@ ApiStatus N(func_8024003C_D2FCBC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802400D4_D2FD54);
-
-INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240120_D2FDA0);
-/*
-ApiStatus N(func_80240120_D2FDA0)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802401CC_D2FE4C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024041C_D3009C);
@@ -50,16 +28,7 @@ ApiStatus N(func_8024041C_D3009C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240510_D30190);
-/*
-ApiStatus N(func_80240510_D30190)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240600_D30280)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240600_D30280)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80241B38_D317B8)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240600_D30280)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240600_D30280)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241B38_D317B8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240600_D30280)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241B38_D317B8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -199,4 +168,4 @@ ApiStatus N(func_80240600_D30280)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240D08_D30988);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c
index 8833950d4a..b6e69a9191 100644
--- a/src/world/area_sam/sam_08/D309C0.c
+++ b/src/world/area_sam/sam_08/D309C0.c
@@ -14,7 +14,7 @@ s32 N(func_80240F48_D30BC8)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_8024135C_D30FDC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_sam/sam_09/D362F0.c b/src/world/area_sam/sam_09/D362F0.c
index de9c26d3d3..671c6b4886 100644
--- a/src/world/area_sam/sam_09/D362F0.c
+++ b/src/world/area_sam/sam_09/D362F0.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240000_D362F0);
 /*
 ApiStatus N(func_80240000_D362F0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802406C0_D369B0) == NULL) {
+        N(D_802406C0_D369B0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802406C0_D369B0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802406C0_D369B0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802406C0_D369B0));
+        N(D_802406C0_D369B0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c
index 035b10c77d..303c3b69c0 100644
--- a/src/world/area_sam/sam_10/D37800.c
+++ b/src/world/area_sam/sam_10/D37800.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800);
 /*
 ApiStatus N(func_80240000_D37800)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241040_D38840) == NULL) {
+        N(D_80241040_D38840) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241040_D38840)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241040_D38840)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241040_D38840));
+        N(D_80241040_D38840) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c
index 9816bac070..8c05934ea0 100644
--- a/src/world/area_sam/sam_10/D37BD0.c
+++ b/src/world/area_sam/sam_10/D37BD0.c
@@ -14,7 +14,7 @@ s32 N(func_802405D8_D37DD8)(ScriptInstance *script) {
     PlayerStatus** playerStatus = &gPlayerStatusPtr;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    Camera* camera = CAM2(gCurrentCamID);
+    Camera* camera = CAM(gCurrentCamID);
     Enemy* enemy2 = get_enemy(enemy->npcID + 1);
     f32 phi_f20;
     s32 ret = TRUE;
@@ -67,7 +67,7 @@ ApiStatus N(func_802409EC_D381EC)(ScriptInstance *script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || (enemy->unk_B0 & 4)) {
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 9c845baeda..bd7619d2c6 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -5,23 +5,19 @@
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0);
 /*
 ApiStatus N(func_802407D0_D3ADA0)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80244F78_D3F548) == NULL) {
+        N(D_80244F78_D3F548) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80244F78_D3F548)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80244F78_D3F548)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80244F78_D3F548));
+        N(D_80244F78_D3F548) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -34,32 +30,208 @@ ApiStatus N(func_802407D0_D3ADA0)(ScriptInstance* script, s32 isInitialCall) {
 #define NAMESPACE sam_11
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC);
+/*
+ApiStatus N(func_8024090C_D3AEDC)(ScriptInstance *script, s32 isInitialCall) {
+    Enemy* enemy = script->owner1.enemyID;
+    u16 phi_s0 = get_variable(script, SI_SAVE_FLAG(1768));
+    u16 phi_s7 = get_variable(script, SI_SAVE_FLAG(1769));
+    u16 temp_s6 = get_variable(script, SI_SAVE_VAR(350));
+    u16 phi_s5 = get_variable(script, SI_SAVE_VAR(351));
+    s32 var;
+    s32 i;
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B30_D3B100);
+    s32 test2;
+    u16 temp_s3 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 sp_10 = (enemy->varTable[0] & 0xFF0000) >> 16;
+    u16 temp_s2 = (enemy->varTable[0] & 0xFF00) >> 8;
+    u16 sp_1e = (enemy->varTable[0] & 0xFF) >> 0;
+    s32 temp_v0;
+    s32 temp_s0_2;
 
-#include "world/common/GetNpcUnsafeOwner2.inc.c"
+    if (temp_s3 != temp_s6) {
+        phi_s7 = 0;
+        phi_s0 = 0;
+    }
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B9C_D3B16C);
+    if (phi_s0 == 0) {
+        if (rand_int(100) < 30) {
+            phi_s5 = rand_int(temp_s2 - 1);
+            temp_s6 = temp_s3;
+            set_variable(script, SI_SAVE_VAR(350), temp_s6);
+            set_variable(script, SI_SAVE_VAR(351), phi_s5);
+            phi_s0 = 1;
+        }
+    }
 
-#include "world/common/UnkAlphaFunc.inc.c"
+    set_variable(script, SI_SAVE_FLAG(1768), phi_s0);
+    set_variable(script, SI_SAVE_FLAG(1769), phi_s7);
+    temp_s0_2 = get_variable(NULL, SI_SAVE_VAR(352));
+    temp_v0 = get_variable(NULL, SI_SAVE_VAR(0));
 
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240D48_D3B318);
+    for (i = 0; i < 8; i++) {
+        if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) {
+            break;
+        }
+    }
+
+    temp_v0 = temp_s0_2 < (*(N(quizRequirements) + i)).unk_04;
+    test2 = var = temp_v0;
+
+    if ((((sp_10 == temp_s6) && (sp_1e == phi_s5) && (phi_s7 == 0) && test2)) ||
+        ((gGameStatusPtr->unk_75 != 0) && var)) {
+        script->varTable[0] = 1;
+    } else {
+        kill_enemy(enemy);
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
+
+#include "world/common/UnkFunc31.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240EBC_D3B48C);
+/*
+ApiStatus N(func_80240EBC_D3B48C)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    u16 quizzesAnswered = gPlayerData.quizzesAnswered;
+
+    if (quizzesAnswered < 0x3E7) {
+        playerData->quizzesAnswered++;
+    }
+
+    if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, SI_SAVE_VAR(352))]) {
+        script->varTable[0] = 1;
+        playerData->quizzesCorrect++;
+    } else {
+        script->varTable[0] = 0;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240F40_D3B510);
+/*
+ApiStatus N(func_80240F40_D3B510)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        Effect** effect = &D_8024DFE0;
+
+        *effect = func_800715D0(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE4 = func_80071810(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)));
+        D_8024DFE8 = func_80072890(0, get_variable(script, SI_ARRAY(1)), get_variable(script, SI_ARRAY(2)), get_variable(script, SI_ARRAY(3)), 1.0f, 0);
+
+        effectPtr = (*effect)->unk_0C;
+        effectPtr->unk_18 = 0;
+        effectPtr->unk_20 = 0;
+        effectPtr->unk_24.s = 0;
+        effectPtr->unk_28 = 0;
+        effectPtr->unk_1C = 0;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+
+    effectPtr->unk_20 += 10;
+    effectPtr->unk_28 += 10;
+    effectPtr->unk_24.s += 10;
+    effectPtr->unk_18 += 10;
+    effectPtr->unk_1C += 10;
+    if (effectPtr->unk_18 >= 255) {
+        effectPtr->unk_18 = 255;
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241158_D3B728);
+/*
+ApiStatus N(func_80241158_D3B728)(ScriptInstance *script, s32 isInitialCall) {
+    EffectInstanceDataThing* effectPtr;
+
+    if (isInitialCall) {
+        D_8024DFE4->flags |= 0x10;
+        D_8024DFE8->flags |= 0x10;
+    }
+
+    effectPtr = D_8024DFE0->unk_0C;
+    effectPtr->unk_18 -= 10;
+    effectPtr->unk_20 -= 10;
+    effectPtr->unk_24.s -= 10;
+    effectPtr->unk_28 -= 10;
+    effectPtr->unk_1C -= 10;
+
+    if (effectPtr->unk_18 <= 0) {
+        effectPtr->unk_18 = 0;
+        remove_effect(D_8024DFE0, effectPtr);
+        free_dynamic_entity(D_8024DFC0);
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024120C_D3B7DC);
+/*
+ApiStatus N(func_8024120C_D3B7DC)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos);
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241240_D3B810);
+/*
+ApiStatus N(func_80241240_D3B810)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var = get_variable(script, *script->ptrReadPos);
+    EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C;
+
+    switch (var) {
+        case 0:
+            effectPtr->unk_38 = 0xC0;
+            break;
+        case 1:
+            effectPtr->unk_38 = 0x80;
+            break;
+        case 2:
+            effectPtr->unk_38 = 0x40;
+            break;
+        default:
+            effectPtr->unk_38 = 0;
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412C0_D3B890);
+/*
+ApiStatus N(func_802412C0_D3B890)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 0;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412D8_D3B8A8);
+/*
+ApiStatus N(func_802412D8_D3B8A8)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 1;
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412F4_D3B8C4);
+/*
+ApiStatus N(func_802412F4_D3B8C4)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFE8->unk_0C->unk_1C = 2;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/GetGameStatus75.inc.c"
 
@@ -74,8 +246,25 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412F4_D3B8C4);
 #include "world/common/UnkPartnerFuncs.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98);
+/*
+void N(func_802417C8_D3BD98)(void) {
+    s32 var = get_variable(NULL, D_8024DFD8);
+
+    if (var == 1) {
+        func_80071690(0, 0, 0, 0);
+    } else if (var == 2) {
+        func_80071690(1, 0, 0, 0);
+    }
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241834_D3BE04);
+/*
+ApiStatus N(func_80241834_D3BE04)(ScriptInstance *script, s32 isInitialCall) {
+    D_8024DFC0 = create_dynamic_entity_frontUI(NULL, N(func_80242468_95D668));
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241864_D3BE34);
 
diff --git a/src/world/area_sbk/sbk_01/929A90.c b/src/world/area_sbk/sbk_01/929A90.c
index 92c5665dcd..2813bda956 100644
--- a/src/world/area_sbk/sbk_01/929A90.c
+++ b/src/world/area_sbk/sbk_01/929A90.c
@@ -3,6 +3,9 @@
 
 #include "world/common/SpawnSunEffect.inc.c"
 
+extern Script N(main);
+extern NpcGroupList N(npcGroupList_802407D8);
+
 EntryList N(entryList) = {
     { -475.0f, 0.0f, 0.0f, 90.0f },
     { 475.0f, 0.0f, 0.0f, 270.0f },
diff --git a/src/world/area_sbk/sbk_02/92A2B0.c b/src/world/area_sbk/sbk_02/92A2B0.c
index d016a717c3..998892fba6 100644
--- a/src/world/area_sbk/sbk_02/92A2B0.c
+++ b/src/world/area_sbk/sbk_02/92A2B0.c
@@ -2,9 +2,9 @@
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240000_92A2B0);
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240040_92A2F0);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240164_92A414);
+#include "world/common/UnkFunc26.inc.c"
 
 // Accesses SI_MAP_VAR(0) which is an effect handle
 INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240338_92A5E8);
diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c
index 99e632fda9..66c88ee23a 100644
--- a/src/world/area_sbk/sbk_02/92A9A0.c
+++ b/src/world/area_sbk/sbk_02/92A9A0.c
@@ -8,18 +8,14 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC);
 /*
 ApiStatus N(func_8024091C_92ABCC)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_8024404C_92E2FC) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_8024404C_92E2FC)) {
+        N(D_8024404C_92E2FC) = FALSE;
+        set_variable(script, *args, N(D_80244050_92E300));
         return ApiStatus_DONE2;
     }
 
@@ -32,34 +28,50 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240970_92AC20);
 ApiStatus N(func_80240970_92AC20)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80244050_92E300) = get_variable(script, *args);
+    N(D_8024404C_92E2FC) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802409A8_92AC58);
+/*
+ApiStatus N(func_802409A8_92AC58)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44_92ACF4);
 /*
 ApiStatus N(func_80240A44_92ACF4)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802441D8_92E488) == NULL) {
+        N(D_802441D8_92E488) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802441D8_92E488)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802441D8_92E488)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802441D8_92E488));
+        N(D_802441D8_92E488) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c
index c472e2e1f6..0b071baa1e 100644
--- a/src/world/area_sbk/sbk_30/93F5B0.c
+++ b/src/world/area_sbk/sbk_30/93F5B0.c
@@ -2,9 +2,9 @@
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240000_93F5B0);
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240040_93F5F0);
+#include "world/common/UnkFunc27.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240164_93F714);
+#include "world/common/UnkFunc26.inc.c"
 
 #include "world/common/SpawnSunEffect.inc.c"
 
@@ -31,23 +31,19 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240B64_940114);
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240DDC_94038C);
 /*
 ApiStatus N(func_80240DDC_94038C)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241FF4_9415A4) == NULL) {
+        N(D_80241FF4_9415A4) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241FF4_9415A4)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241FF4_9415A4)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241FF4_9415A4));
+        N(D_80241FF4_9415A4) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -63,18 +59,14 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241120_9406D0);
 /*
 ApiStatus N(func_80241120_9406D0)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80242058_941608) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80242058_941608)) {
+        N(D_80242058_941608) = FALSE;
+        set_variable(script, *args, N(D_8024205C_94160C));
         return ApiStatus_DONE2;
     }
 
@@ -87,22 +79,77 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241174_940724);
 ApiStatus N(func_80241174_940724)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_8024205C_94160C) = get_variable(script, *args);
+    N(D_80242058_941608) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C);
+/*
+ApiStatus N(func_802411AC_94075C)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8);
+/*
+ApiStatus N(func_80241248_9407F8)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241560_940B10);
+/*
+ApiStatus N(func_80241560_940B10)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415A4_940B54);
+/*
+ApiStatus N(func_802415A4_940B54)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/foliage.inc.c"
diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c
index 688b3fc771..629925da0b 100644
--- a/src/world/area_sbk/sbk_34/945F10.c
+++ b/src/world/area_sbk/sbk_34/945F10.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240040_945F10);
 /*
 ApiStatus N(func_80240040_945F10)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80240D9C_946C6C) == NULL) {
+        N(D_80240D9C_946C6C) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80240D9C_946C6C)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80240D9C_946C6C)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80240D9C_946C6C));
+        N(D_80240D9C_946C6C) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -35,18 +31,14 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240384_946254);
 /*
 ApiStatus N(func_80240384_946254)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32* ptr;
 
     if (isInitialCall) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
+        N(D_80240E00_946CD0) = FALSE;
     }
 
-    ptr = &D_80241CCC_BE0A5C;
-    if (*ptr != NULL) {
-        ptr = &D_80241CCC_BE0A5C;
-        *ptr = 0;
-        set_variable(script, *args, D_80241CD0_BE0A60);
+    if (N(D_80240E00_946CD0)) {
+        N(D_80240E00_946CD0) = FALSE;
+        set_variable(script, *args, N(D_80240E04_946CD4));
         return ApiStatus_DONE2;
     }
 
@@ -59,18 +51,53 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802403D8_9462A8);
 ApiStatus N(func_802403D8_9462A8)(ScriptInstance* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241CD0_BE0A60 = get_variable(script, *args);
-    D_80241CCC_BE0A5C = 1;
+    N(D_80240E04_946CD4) = get_variable(script, *args);
+    N(D_80240E00_946CD0) = TRUE;
     return ApiStatus_DONE2;
 }
 */
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240410_9462E0);
+/*
+ApiStatus N(func_80240410_9462E0)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = get_variable(script, *args);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            N(D_80244A20)[i] = ptr[i];
+        }
+        N(D_80244A20)[i] = 0;
+    } else {
+        for (i = 0; i < 0x70; i++) {
+            N(D_80244A20)[i] = i + 16;
+            N(D_80244A20)[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+*/
 
 #include "world/common/SetManyVars.inc.c"
 
 #include "world/common/UnkYawFunc.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240728_9465F8);
+/*
+ApiStatus N(func_80240728_9465F8)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->varTable[2]);
+
+    D_8024E1B4 = npc->currentAnim;
+    npc->currentAnim = script->varTable[4];
+    return ApiStatus_DONE2;
+}
+*/
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_8024076C_94663C);
+/*
+ApiStatus N(func_8024076C_94663C)(ScriptInstance *script, s32 isInitialCall) {
+    get_npc_unsafe(script->varTable[2])->currentAnim = D_8024E1B4;
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c
index 56b117e3e7..a205c9acd7 100644
--- a/src/world/area_sbk/sbk_56/953FC0.c
+++ b/src/world/area_sbk/sbk_56/953FC0.c
@@ -20,28 +20,6 @@ ApiStatus N(func_802400BC_95407C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240154_954114);
-
-INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802401A0_954160);
-/*
-ApiStatus N(func_802401A0_954160)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024024C_95420C);
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024049C_95445C);
@@ -56,16 +34,7 @@ ApiStatus N(func_8024049C_95445C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240590_954550);
-/*
-ApiStatus N(func_80240590_954550)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -79,15 +48,15 @@ ApiStatus N(func_80240680_954640)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -110,7 +79,7 @@ ApiStatus N(func_80240680_954640)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80241488_955448)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -119,7 +88,7 @@ ApiStatus N(func_80240680_954640)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -127,7 +96,7 @@ ApiStatus N(func_80240680_954640)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241488_955448)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -145,7 +114,7 @@ ApiStatus N(func_80240680_954640)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241488_955448)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -205,4 +174,4 @@ ApiStatus N(func_80240680_954640)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D88_954D48);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c
index 2adcac6b28..78e6b3600d 100644
--- a/src/world/area_tik/tik_01/8694B0.c
+++ b/src/world/area_tik/tik_01/8694B0.c
@@ -8,7 +8,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340_8697F0);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c
index 222d359786..ac52f48e54 100644
--- a/src/world/area_tik/tik_02/86CA50.c
+++ b/src/world/area_tik/tik_02/86CA50.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50);
 /*
 ApiStatus N(func_80240310_86CA50)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_802410C0_86D800) == NULL) {
+        N(D_802410C0_86D800) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_802410C0_86D800)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_802410C0_86D800)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_802410C0_86D800));
+        N(D_802410C0_86D800) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c
index 32a82846e2..525557a3b6 100644
--- a/src/world/area_tik/tik_03/86EB00.c
+++ b/src/world/area_tik/tik_03/86EB00.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240034_86EB34);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c
index 2c6144b0cb..4c8a76a3a0 100644
--- a/src/world/area_tik/tik_04/871A30.c
+++ b/src/world/area_tik/tik_04/871A30.c
@@ -8,7 +8,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240340_871D70);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_04/872020.c b/src/world/area_tik/tik_04/872020.c
index 3a0a22db34..cc64098f89 100644
--- a/src/world/area_tik/tik_04/872020.c
+++ b/src/world/area_tik/tik_04/872020.c
@@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240960_872390);
 
 INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240A00_872430);
 
-INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240BF4_872624);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240C20_872650);
diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c
index 174a7d691c..9583b0b188 100644
--- a/src/world/area_tik/tik_05/8750D0.c
+++ b/src/world/area_tik/tik_05/8750D0.c
@@ -5,23 +5,19 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240310_8750D0);
 INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440);
 /*
 ApiStatus N(func_80240680_875440)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241800_8765C0) == NULL) {
+        N(D_80241800_8765C0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241800_8765C0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241800_8765C0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241800_8765C0));
+        N(D_80241800_8765C0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c
index 9ee1d71ba2..6f0196895c 100644
--- a/src/world/area_tik/tik_06/876EE0.c
+++ b/src/world/area_tik/tik_06/876EE0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240034_876F14);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c
index c64e6d4f67..d6a5c0454c 100644
--- a/src/world/area_tik/tik_07/879BE0.c
+++ b/src/world/area_tik/tik_07/879BE0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240034_879C14);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
@@ -26,28 +26,6 @@ ApiStatus N(func_8024031C_879EFC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802403B4_879F94);
-
-INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240400_879FE0);
-/*
-ApiStatus N(func_80240400_879FE0)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802404AC_87A08C);
 
 INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802406FC_87A2DC);
@@ -62,16 +40,7 @@ ApiStatus N(func_802406FC_87A2DC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802407F0_87A3D0);
-/*
-ApiStatus N(func_802407F0_87A3D0)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -85,15 +54,15 @@ ApiStatus N(func_802408E0_87A4C0)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -116,7 +85,7 @@ ApiStatus N(func_802408E0_87A4C0)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80243A48_87D628)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -125,7 +94,7 @@ ApiStatus N(func_802408E0_87A4C0)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -133,7 +102,7 @@ ApiStatus N(func_802408E0_87A4C0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243A48_87D628)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -151,7 +120,7 @@ ApiStatus N(func_802408E0_87A4C0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243A48_87D628)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -211,4 +180,4 @@ ApiStatus N(func_802408E0_87A4C0)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FE8_87ABC8);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c
index b2fb951864..fb0e44e7d5 100644
--- a/src/world/area_tik/tik_07/87AC00.c
+++ b/src/world/area_tik/tik_07/87AC00.c
@@ -45,7 +45,7 @@ void N(func_80242044_87BC24)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80244CB0_87E890)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c
index c4d1f60472..a9a6f17c2e 100644
--- a/src/world/area_tik/tik_08/87EDF0.c
+++ b/src/world/area_tik/tik_08/87EDF0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240034_87EE24);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_08/87F820.c b/src/world/area_tik/tik_08/87F820.c
index 3549bc78b7..2739411ec0 100644
--- a/src/world/area_tik/tik_08/87F820.c
+++ b/src/world/area_tik/tik_08/87F820.c
@@ -1,5 +1,5 @@
 #include "tik_08.h"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_08/87F820", func_80240A30_87F820);
+#include "world/common/GetFloorCollider.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_08/87F820", func_80240A5C_87F84C);
diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c
index 5f243bed33..cbd7878b12 100644
--- a/src/world/area_tik/tik_09/8821C0.c
+++ b/src/world/area_tik/tik_09/8821C0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240034_8821F4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c
index 65bddaafe5..24187bd9b8 100644
--- a/src/world/area_tik/tik_09/882BF0.c
+++ b/src/world/area_tik/tik_09/882BF0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240AAC_882C6C);
+/*
+void N(func_80240AAC_882C6C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c
index 4d4b7ee58e..e7672f1ac7 100644
--- a/src/world/area_tik/tik_10/8866D0.c
+++ b/src/world/area_tik/tik_10/8866D0.c
@@ -16,28 +16,6 @@ ApiStatus N(func_802406BC_886A7C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240754_886B14);
-
-INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802407A0_886B60);
-/*
-ApiStatus N(func_802407A0_886B60)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024084C_886C0C);
 
 INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240A9C_886E5C);
@@ -52,16 +30,7 @@ ApiStatus N(func_80240A9C_886E5C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240B90_886F50);
-/*
-ApiStatus N(func_80240B90_886F50)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -75,15 +44,15 @@ ApiStatus N(func_80240C80_887040)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -106,7 +75,7 @@ ApiStatus N(func_80240C80_887040)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80242088_888448)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -115,7 +84,7 @@ ApiStatus N(func_80240C80_887040)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -123,7 +92,7 @@ ApiStatus N(func_80240C80_887040)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242088_888448)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -141,7 +110,7 @@ ApiStatus N(func_80240C80_887040)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242088_888448)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -201,4 +170,4 @@ ApiStatus N(func_80240C80_887040)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241388_887748);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c
index 77f08e87b0..16bad66280 100644
--- a/src/world/area_tik/tik_12/888BD0.c
+++ b/src/world/area_tik/tik_12/888BD0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240034_888C04);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c
index 9603df52ed..c0c35ca296 100644
--- a/src/world/area_tik/tik_12/8891C0.c
+++ b/src/world/area_tik/tik_12/8891C0.c
@@ -5,23 +5,19 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802405F0_8891C0);
 INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530);
 /*
 ApiStatus N(func_80240960_889530)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80243C40_88C810) == NULL) {
+        N(D_80243C40_88C810) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80243C40_88C810)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80243C40_88C810)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80243C40_88C810));
+        N(D_80243C40_88C810) = NULL;
     }
     return ApiStatus_DONE2;
 }
@@ -47,28 +43,6 @@ ApiStatus N(func_80240C58_889828)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240CF0_8898C0);
-
-INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240D3C_88990C);
-/*
-ApiStatus N(func_80240D3C_88990C)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240DE8_8899B8);
 
 INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241038_889C08);
@@ -83,16 +57,7 @@ ApiStatus N(func_80241038_889C08)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024112C_889CFC);
-/*
-ApiStatus N(func_8024112C_889CFC)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -106,15 +71,15 @@ ApiStatus N(func_8024121C_889DEC)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -137,7 +102,7 @@ ApiStatus N(func_8024121C_889DEC)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80243D04_88C8D4)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -146,7 +111,7 @@ ApiStatus N(func_8024121C_889DEC)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -154,7 +119,7 @@ ApiStatus N(func_8024121C_889DEC)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243D04_88C8D4)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -172,7 +137,7 @@ ApiStatus N(func_8024121C_889DEC)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243D04_88C8D4)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -232,4 +197,4 @@ ApiStatus N(func_8024121C_889DEC)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241924_88A4F4);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c
index dab54e5488..b8f5699a87 100644
--- a/src/world/area_tik/tik_12/88A530.c
+++ b/src/world/area_tik/tik_12/88A530.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802419DC_88A5AC);
+/*
+void N(func_802419DC_88A5AC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c
index e6034ef175..76f7d4d170 100644
--- a/src/world/area_tik/tik_14/88D600.c
+++ b/src/world/area_tik/tik_14/88D600.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240034_88D634);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c
index 0ed22c8c94..2f4233cbe1 100644
--- a/src/world/area_tik/tik_15/88FBA0.c
+++ b/src/world/area_tik/tik_15/88FBA0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240034_88FBD4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c
index a42e1d4e91..7e91fd2eb7 100644
--- a/src/world/area_tik/tik_15/890190.c
+++ b/src/world/area_tik/tik_15/890190.c
@@ -5,23 +5,19 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_802405F0_890190);
 INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240960_890500);
 /*
 ApiStatus N(func_80240960_890500)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80242758_8922F8) == NULL) {
+        N(D_80242758_8922F8) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80242758_8922F8)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80242758_8922F8)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80242758_8922F8));
+        N(D_80242758_8922F8) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c
index af1a9528f1..a0015bb1c4 100644
--- a/src/world/area_tik/tik_17/892A50.c
+++ b/src/world/area_tik/tik_17/892A50.c
@@ -14,28 +14,6 @@ ApiStatus N(func_8024006C_892A8C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240104_892B24);
-
-INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240150_892B70);
-/*
-ApiStatus N(func_80240150_892B70)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802401FC_892C1C);
 
 INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024044C_892E6C);
@@ -50,16 +28,7 @@ ApiStatus N(func_8024044C_892E6C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240540_892F60);
-/*
-ApiStatus N(func_80240540_892F60)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240630_893050)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240630_893050)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80241478_893E98)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240630_893050)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240630_893050)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241478_893E98)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240630_893050)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80241478_893E98)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -199,4 +168,4 @@ ApiStatus N(func_80240630_893050)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240D38_893758);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c
index 5008a94683..7d8ac7c889 100644
--- a/src/world/area_tik/tik_17/893790.c
+++ b/src/world/area_tik/tik_17/893790.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240DA4_8937C4);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c
index eb52a0bce9..b90bb766fa 100644
--- a/src/world/area_tik/tik_19/8975E0.c
+++ b/src/world/area_tik/tik_19/8975E0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240034_897614);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c
index 8b7dfd65cd..0b772d9369 100644
--- a/src/world/area_tik/tik_19/897BD0.c
+++ b/src/world/area_tik/tik_19/897BD0.c
@@ -14,28 +14,6 @@ ApiStatus N(func_8024062C_897C0C)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc18.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802406C4_897CA4);
-
-INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240710_897CF0);
-/*
-ApiStatus N(func_80240710_897CF0)(ScriptInstance *script, s32 isInitialCall) {
-    PlayerData* playerData = &gPlayerData;
-    s32 i;
-    s16 var = script->varTable[12] >= 0;
-
-    script->varTable[0] = -1;
-
-    for (i = 1; i < 12; i++) {
-        if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) {
-            script->varTable[0] = 1;
-            break;
-        }
-    }
-
-    return ApiStatus_DONE2;
-}
-*/
-
 INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802407BC_897D9C);
 
 INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A0C_897FEC);
@@ -50,16 +28,7 @@ ApiStatus N(func_80240A0C_897FEC)(ScriptInstance* script, s32 isInitialCall) {
 
 #include "world/common/UnkFunc20.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B00_8980E0);
-/*
-ApiStatus N(func_80240B00_8980E0)(ScriptInstance *script, s32 isInitialCall) {
-    Effect* effect = get_variable(script, *script->ptrReadPos);
-
-    effect->flags |= 0x10;
-
-    return ApiStatus_DONE2;
-}
-*/
+#include "world/common/UnkFunc39.inc.c"
 
 #include "world/common/UnkFunc21.inc.c"
 
@@ -73,15 +42,15 @@ ApiStatus N(func_80240BF0_8981D0)(ScriptInstance *script, s32 isInitialCall) {
     f32 sinTheta, cosTheta;
     s32 i;
     f32 var;
-    UserData* userDataPtr;
-    UserData* scriptPtr;
+    N(UserData)* userDataPtr;
+    N(UserData)* scriptPtr;
     f32 save, save2;
 
     sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta);
 
     if (isInitialCall) {
-        script->userData = (UserData*)general_heap_malloc(0x68);
-        scriptPtr = (UserData*)script->userData;
+        script->userData = (N(UserData)*)general_heap_malloc(0x68);
+        scriptPtr = (N(UserData)*)script->userData;
 
         scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args));
 
@@ -104,7 +73,7 @@ ApiStatus N(func_80240BF0_8981D0)(ScriptInstance *script, s32 isInitialCall) {
         userDataPtr = scriptPtr;
         for (i = 0, save = 50.0f; i < 3; i++) {
             var = 0;
-            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++));
+            add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80242708_899CE8)[i]);
             userDataPtr->unk_38[i] = cosTheta * var;
             userDataPtr->unk_50[i] = sinTheta * var;
             userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]);
@@ -113,7 +82,7 @@ ApiStatus N(func_80240BF0_8981D0)(ScriptInstance *script, s32 isInitialCall) {
         }
     }
 
-    scriptPtr = (UserData*)script->userData;
+    scriptPtr = (N(UserData)*)script->userData;
     switch (scriptPtr->unk_00) {
         case 0:
             save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14);
@@ -121,7 +90,7 @@ ApiStatus N(func_80240BF0_8981D0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242708_899CE8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -139,7 +108,7 @@ ApiStatus N(func_80240BF0_8981D0)(ScriptInstance *script, s32 isInitialCall) {
             for (i = 0; i < 3; i++) {
                 scriptPtr->unk_20[i] = save2;
                 var = save2;
-                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i));
+                add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242708_899CE8)[i]);
                 scriptPtr->unk_14[i] = cosTheta * var;
                 scriptPtr->unk_2C[i] = sinTheta * var;
             }
@@ -199,4 +168,4 @@ ApiStatus N(func_80240BF0_8981D0)(ScriptInstance *script, s32 isInitialCall) {
 
 #include "world/common/UnkPartnerPosFuncs.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802412F8_8988D8);
+#include "world/common/UnkFunc40.inc.c"
diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c
index ae6d2c3c1c..d38e230592 100644
--- a/src/world/area_tik/tik_20/89A350.c
+++ b/src/world/area_tik/tik_20/89A350.c
@@ -8,7 +8,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240340_89A690);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c
index bf6cbd179c..8b19e1c500 100644
--- a/src/world/area_tik/tik_20/89ACB0.c
+++ b/src/world/area_tik/tik_20/89ACB0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_802409DC_89AD2C);
+/*
+void N(func_802409DC_89AD2C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c
index f14c531672..ba926c750a 100644
--- a/src/world/area_tik/tik_21/89D7A0.c
+++ b/src/world/area_tik/tik_21/89D7A0.c
@@ -8,7 +8,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240340_89DAE0);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c
index e1342b9f18..e2a8133301 100644
--- a/src/world/area_tik/tik_22/89FEF0.c
+++ b/src/world/area_tik/tik_22/89FEF0.c
@@ -8,7 +8,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370_8A0230);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c
index 81a4d4527d..3789343ea1 100644
--- a/src/world/area_tik/tik_23/8A23D0.c
+++ b/src/world/area_tik/tik_23/8A23D0.c
@@ -4,7 +4,7 @@
 
 #include "world/common/GetCurrentFloor.inc.c"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240034_8A2404);
+#include "world/common/UnkFunc25.inc.c"
 
 #include "world/common/GetEntryPos.inc.c"
 
diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c
index fd9426c9cb..86cf0a1d14 100644
--- a/src/world/area_tik/tik_23/8A2D30.c
+++ b/src/world/area_tik/tik_23/8A2D30.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_23/8A2D30", func_802409DC_8A2DAC);
+/*
+void N(func_802409DC_8A2DAC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c
index 5c72c4c7b7..5a41b2013c 100644
--- a/src/world/area_tik/tik_24/8A5DE0.c
+++ b/src/world/area_tik/tik_24/8A5DE0.c
@@ -5,6 +5,28 @@ INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240360_8A5DE0);
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_8024074C_8A61CC);
+/*
+void N(func_8024074C_8A61CC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c
index c7b3ac011c..979c2598b8 100644
--- a/src/world/area_trd/trd_00/999F80.c
+++ b/src/world/area_trd/trd_00/999F80.c
@@ -3,23 +3,19 @@
 INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80);
 /*
 ApiStatus N(func_80240310_999F80)(ScriptInstance* script, s32 isInitialCall) {
-    s32** ptr = &N(D_80241C68_BE09F8);
     s32 i;
-    s32* test;
 
-    if (*ptr == NULL) {
-        i = heap_malloc(16 * sizeof(s32));
-        *ptr = i;
-        for (i = 0, test = *ptr; i < 16; i++) {
-            *test++ = script->varTable[i];
+    if (N(D_80241340_99AFB0) == NULL) {
+        N(D_80241340_99AFB0) = heap_malloc(16 * sizeof(s32));
+        for (i = 0; i < 16; i++) {
+            N(D_80241340_99AFB0)[i] = script->varTable[i];
         }
     } else {
-        for (i = 0, test = *ptr; i < 16; i++) {
-            script->varTable[i] = *test++;
+        for (i = 0; i < 16; i++) {
+            script->varTable[i] = N(D_80241340_99AFB0)[i];
         }
-        ptr = &N(D_80241C68_BE09F8);
-        heap_free(*ptr);
-        *ptr = NULL;
+        heap_free(N(D_80241340_99AFB0));
+        N(D_80241340_99AFB0) = NULL;
     }
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c
index 9cd5cd291e..e8c2e3fb6b 100644
--- a/src/world/area_trd/trd_01/99CD80.c
+++ b/src/world/area_trd/trd_01/99CD80.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_8024046C_99CDFC);
+/*
+void N(func_8024046C_99CDFC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c
index 753a9647b0..949108d0fc 100644
--- a/src/world/area_trd/trd_02/9A10C0.c
+++ b/src/world/area_trd/trd_02/9A10C0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_8024015C_9A113C);
+/*
+void N(func_8024015C_9A113C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -104,7 +126,7 @@ ApiStatus N(func_80241448_9A2428)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -124,7 +146,7 @@ ApiStatus N(func_80241448_9A2428)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c
index 398aa66c22..2d97e03d73 100644
--- a/src/world/area_trd/trd_03/9A46F0.c
+++ b/src/world/area_trd/trd_03/9A46F0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_8024011C_9A476C);
+/*
+void N(func_8024011C_9A476C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c
index eaa6677e3b..ed807eece5 100644
--- a/src/world/area_trd/trd_04/9A88A0.c
+++ b/src/world/area_trd/trd_04/9A88A0.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024052C_9A891C);
+/*
+void N(func_8024052C_9A891C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -104,7 +126,7 @@ ApiStatus N(func_80241818_9A9C08)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->patrol.detect.z;
     territory.sizeX = enemy->territory->patrol.detectSizeX;
     territory.sizeZ = enemy->territory->patrol.detectSizeZ;
-    territory.unk_34 = 65.0f;
+    territory.unk_18 = 65.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall || enemy->unk_B0 & 4) {
@@ -124,7 +146,7 @@ ApiStatus N(func_80241818_9A9C08)(ScriptInstance* script, s32 isInitialCall) {
             enemy->unk_B0 &= ~4;
         } else if (enemy->flags & 0x40000000) {
             script->functionTemp[0].s = 12;
-            enemy->flags &= 0xBFFFFFFF;
+            enemy->flags &= ~0x40000000;
         }
 
         posX = npc->pos.x;
@@ -219,7 +241,7 @@ void N(func_80242A6C_9AAE5C)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_802456F4_9ADAE4)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -250,7 +272,7 @@ ApiStatus N(func_80243124_9AB514)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_trd/trd_06/9B2280.c b/src/world/area_trd/trd_06/9B2280.c
index 89b7557541..354f47acaa 100644
--- a/src/world/area_trd/trd_06/9B2280.c
+++ b/src/world/area_trd/trd_06/9B2280.c
@@ -1,3 +1,3 @@
 #include "trd_06.h"
 
-INCLUDE_ASM(s32, "world/area_trd/trd_06/9B2280", func_80240AF0_9B2280);
+#include "world/common/UnkFunc41.inc.c"
diff --git a/src/world/area_trd/trd_06/9B2410.c b/src/world/area_trd/trd_06/9B2410.c
index f7101e01cc..7597434b9e 100644
--- a/src/world/area_trd/trd_06/9B2410.c
+++ b/src/world/area_trd/trd_06/9B2410.c
@@ -1,3 +1,21 @@
 #include "trd_06.h"
 
 INCLUDE_ASM(s32, "world/area_trd/trd_06/9B2410", func_80240C80_9B2410);
+/*
+ApiStatus N(func_80240C80_9B2410)(ScriptInstance *script, s32 isInitialCall) {
+    s32 var;
+    void* temp_s0 = load_asset_by_name("party_pokopi", &var);
+
+    decode_yay0(temp_s0, N(D_80247B00));
+    general_heap_free(temp_s0);
+
+    N(D_8024BA90).unk_00 = N(D_80247D00);
+    N(D_8024BA90).unk_08 = 0x96;
+    N(D_8024BA90).unk_0A = 0x69;
+    N(D_8024BA90).unk_0C = 2;
+    N(D_8024BA90).unk_04 = N(D_80247B00);
+    N(D_8024BA90).unk_10 = 1;
+    set_message_images(&N(D_8024BA90));
+    return ApiStatus_DONE2;
+}
+*/
diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c
index afe14da320..bf567ef6e0 100644
--- a/src/world/area_trd/trd_07/9B6C90.c
+++ b/src/world/area_trd/trd_07/9B6C90.c
@@ -3,6 +3,28 @@
 #include "world/common/set_script_owner_npc_anim.inc.c"
 
 INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024038C_9B6D0C);
+/*
+void N(func_8024038C_9B6D0C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    if ((npc->duration <= 0) || (--npc->duration <= 0)) {
+        if (npc->turnAroundYawAdjustment == 0) {
+            npc->currentAnim = enemy->animList[9];
+            npc->moveSpeed = aiSettings->chaseSpeed;
+            if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) {
+                npc->collisionHeight = enemy->varTable[6] / 2;
+            }
+            npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8;
+            if (npc->duration < enemy->varTable[3]) {
+                npc->duration = enemy->varTable[3];
+            }
+            enemy->varTable[4] = npc->duration;
+            script->functionTemp[0].s = 14;
+        }
+    }
+}
+*/
 
 #include "world/common/UnkNpcAIFunc12.inc.c"
 
@@ -51,7 +73,7 @@ void N(func_80241738_9B80B8)(ScriptInstance* script, NpcAISettings* aiSettings,
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++];
+    npc->pos.y += N(D_80242EAC_9B982C)[npc->duration++];
     if (npc->duration >= 5) {
         script->functionTemp[0].s = 12;
     }
@@ -82,7 +104,7 @@ ApiStatus N(func_80241DF0_9B8770)(ScriptInstance* script, s32 isInitialCall) {
     territory.pointZ = enemy->territory->wander.detect.z;
     territory.sizeX = enemy->territory->wander.detectSizeX;
     territory.sizeZ = enemy->territory->wander.detectSizeZ;
-    territory.unk_34 = 120.0f;
+    territory.unk_18 = 120.0f;
     territory.unk_1C = 0;
 
     if (isInitialCall) {
diff --git a/src/world/area_trd/trd_10/9C2910.c b/src/world/area_trd/trd_10/9C2910.c
index 03e21765f2..f4af10b58d 100644
--- a/src/world/area_trd/trd_10/9C2910.c
+++ b/src/world/area_trd/trd_10/9C2910.c
@@ -85,7 +85,7 @@ ApiStatus N(func_80240708_9C3018)(ScriptInstance* script, s32 isInitialCall) {
 
     ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f));
     ptr->unk_4C = clamp_angle(ptr->unk_4C + 8);
-    if (dist2D(playerStatus->position.x, playerStatus->position.z, 
+    if (dist2D(playerStatus->position.x, playerStatus->position.z,
                ptr->unk_18, ptr->unk_20) <= 30.0f) {
         ptr->unk_4E = 3;
     }
diff --git a/src/world/common/CamSetFOV.inc.c b/src/world/common/CamSetFOV.inc.c
new file mode 100644
index 0000000000..1d2cc6aa2a
--- /dev/null
+++ b/src/world/common/CamSetFOV.inc.c
@@ -0,0 +1,11 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(CamSetFOV)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 camIdx = get_variable(script, *args++);
+
+    CAM(camIdx)->vfov = get_variable(script, *args++);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/DoesPlayerNeedSleep.inc.c b/src/world/common/DoesPlayerNeedSleep.inc.c
new file mode 100644
index 0000000000..bf586a27df
--- /dev/null
+++ b/src/world/common/DoesPlayerNeedSleep.inc.c
@@ -0,0 +1,20 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(DoesPlayerNeedSleep)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+
+    script->varTable[1] = FALSE;
+    if (playerData->curMaxHP != playerData->curHP) {
+        return ApiStatus_DONE2;
+    }
+    if (playerData->curMaxFP != playerData->curFP) {
+        return ApiStatus_DONE2;
+    }
+    if (playerData->specialBarsFilled != playerData->maxStarPower * 256) {
+        return ApiStatus_DONE2;
+    }
+    script->varTable[1] = TRUE;
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/GetFloorCollider.inc.c b/src/world/common/GetFloorCollider.inc.c
new file mode 100644
index 0000000000..d44e8dbfa4
--- /dev/null
+++ b/src/world/common/GetFloorCollider.inc.c
@@ -0,0 +1,9 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(GetFloorCollider)(ScriptInstance *script, s32 isInitialCall) {
+    CollisionStatus* collisionStatus = &gCollisionStatus;
+
+    set_variable(script, *script->ptrReadPos, collisionStatus->currentFloor);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/GetNpcUnsafeOwner2.inc.c b/src/world/common/GetNpcUnsafeOwner2.inc.c
deleted file mode 100644
index dddf005631..0000000000
--- a/src/world/common/GetNpcUnsafeOwner2.inc.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-#include "map.h"
-
-ApiStatus N(GetNpcUnsafeOwner2)(ScriptInstance* script, s32 isInitialCall) {
-    get_npc_unsafe(script->owner2.npcID);
-    return ApiStatus_BLOCK;
-}
diff --git a/src/world/common/UnkAlphaFunc.inc.c b/src/world/common/UnkAlphaFunc.inc.c
deleted file mode 100644
index 4def2e7ad1..0000000000
--- a/src/world/common/UnkAlphaFunc.inc.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "common.h"
-
-ApiStatus N(UnkAlphaFunc)(ScriptInstance* script, s32 isInitialCall) {
-    if (isInitialCall) {
-        s32 i;
-
-        func_8011D82C(1);
-        D_801512F0[0] = 1;
-        set_background_color_blend(0, 0, 0, 0);
-
-        for (i = 0; i < 64; i++) {
-            Npc* npc = get_npc_by_index(i);
-
-            if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != UNK_ALPHA_FUNC_NPC) {
-                npc->flags |= 0x800000;
-            }
-        }
-
-        for (i = 0; i < 256; i++) {
-            ItemEntity* itemEntity = get_item_entity(i);
-
-            if (itemEntity != NULL && itemEntity->flags & 0x10) {
-                itemEntity->flags |= 0x8000000;
-            }
-        }
-
-        script->functionTemp[0].s = 0;
-    }
-
-    script->functionTemp[0].s += 8;
-    if (script->functionTemp[0].s > 255) {
-        script->functionTemp[0].s = 255;
-    }
-
-    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
-    return (script->functionTemp[0].s == 255) * ApiStatus_DONE2;
-}
diff --git a/src/world/common/UnkFunc10.inc.c b/src/world/common/UnkFunc10.inc.c
index 4fdb87f1fe..b3a7fe7c2e 100644
--- a/src/world/common/UnkFunc10.inc.c
+++ b/src/world/common/UnkFunc10.inc.c
@@ -11,9 +11,9 @@ void N(UnkFunc10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrit
     npc_move_heading(npc, npc->moveSpeed, npc->yaw);
 
     phi_s1 = 0;
-    if (is_point_within_region(enemy->territory->wander.detectShape, 
-            enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, 
-            npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX, 
+    if (is_point_within_region(enemy->territory->wander.detectShape,
+            enemy->territory->wander.detect.x, enemy->territory->wander.detect.z,
+            npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX,
             enemy->territory->wander.detectSizeZ)) {
         phi_s1 = 1;
     }
@@ -22,7 +22,7 @@ void N(UnkFunc10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrit
     posY = npc->pos.y;
     posZ = npc->pos.z;
 
-    if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ, 
+    if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ,
             1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) {
         phi_s1 = 1;
     }
@@ -35,4 +35,4 @@ void N(UnkFunc10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrit
         script->functionTemp[0].s = 4;
         enemy->unk_07 = 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc11.inc.c b/src/world/common/UnkFunc11.inc.c
index 6305ca82ea..0df2114e5a 100644
--- a/src/world/common/UnkFunc11.inc.c
+++ b/src/world/common/UnkFunc11.inc.c
@@ -25,4 +25,4 @@ ApiStatus N(UnkFunc11)(ScriptInstance *script, s32 isInitialCall) {
     }
 
     return ApiStatus_DONE2;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc12.inc.c b/src/world/common/UnkFunc12.inc.c
index 63135332f3..2d589ad086 100644
--- a/src/world/common/UnkFunc12.inc.c
+++ b/src/world/common/UnkFunc12.inc.c
@@ -21,4 +21,4 @@ ApiStatus N(UnkFunc12)(ScriptInstance *script, s32 isInitialCall) {
     playerStatus->position.z = posZ;
 
     return ApiStatus_DONE2;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc15.inc.c b/src/world/common/UnkFunc15.inc.c
index 8b456f9573..2209389c33 100644
--- a/src/world/common/UnkFunc15.inc.c
+++ b/src/world/common/UnkFunc15.inc.c
@@ -20,4 +20,4 @@ ApiStatus N(UnkFunc15)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyT
             script->functionTemp[0].s = 12;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc16.inc.c b/src/world/common/UnkFunc16.inc.c
index 37963c0bfa..3db5cbb967 100644
--- a/src/world/common/UnkFunc16.inc.c
+++ b/src/world/common/UnkFunc16.inc.c
@@ -17,4 +17,4 @@ void N(UnkFunc16)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrit
     npc->currentAnim = enemy->animList[1];
     script->functionTemp[1].s = 0;
     script->functionTemp[0].s = 1;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc18.inc.c b/src/world/common/UnkFunc18.inc.c
index ed5e5f8ed9..4cef324297 100644
--- a/src/world/common/UnkFunc18.inc.c
+++ b/src/world/common/UnkFunc18.inc.c
@@ -11,4 +11,33 @@ ApiStatus N(UnkFunc18)(ScriptInstance *script, s32 isInitialCall) {
     set_variable(script, si_var, playerData->partners[partnerIdx].level);
 
     return ApiStatus_DONE2;
-}
\ No newline at end of file
+}
+
+s32 N(UnkFunc37)(s32 idx, s16 arg1) {
+    if (!gPlayerData.partners[idx].enabled) {
+        return -1;
+    }
+
+    if (gPlayerData.partners[idx].level <= arg1) {
+        return gPlayerData.partners[idx].level;
+    }
+
+    return -1;
+}
+
+ApiStatus N(UnkFunc38)(ScriptInstance *script, s32 isInitialCall) {
+    PlayerData* playerData = &gPlayerData;
+    s32 i;
+    s16 var = script->varTable[12] >= 0;
+
+    script->varTable[0] = -1;
+
+    for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) {
+        if (playerData->partners[i].enabled && N(UnkFunc37)(i, var) != -1) {
+            script->varTable[0] = 1;
+            break;
+        }
+    }
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc21.inc.c b/src/world/common/UnkFunc21.inc.c
index af5794ae45..9bce23dce5 100644
--- a/src/world/common/UnkFunc21.inc.c
+++ b/src/world/common/UnkFunc21.inc.c
@@ -5,6 +5,6 @@ ApiStatus N(UnkFunc21)(ScriptInstance *script, s32 isInitialCall) {
     Entity* entity = get_entity_by_index(get_variable(script, *script->ptrReadPos));
 
     func_80070BB0(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B);
-    
+
     return ApiStatus_DONE2;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc22.inc.c b/src/world/common/UnkFunc22.inc.c
index cf5992c83e..6e169ed7a1 100644
--- a/src/world/common/UnkFunc22.inc.c
+++ b/src/world/common/UnkFunc22.inc.c
@@ -7,4 +7,4 @@ ApiStatus N(UnkFunc22)(ScriptInstance *script, s32 isInitialCall) {
     func_80070BB0(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 0x1E);
 
     return ApiStatus_DONE2;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc23.inc.c b/src/world/common/UnkFunc23.inc.c
index 5c9b6088dc..7f23603fc8 100644
--- a/src/world/common/UnkFunc23.inc.c
+++ b/src/world/common/UnkFunc23.inc.c
@@ -46,4 +46,4 @@ s32 N(UnkFunc23)(ScriptInstance *script, s32 isInitialCall) {
     set_transition_stencil_zoom_0(1, script->functionTemp[1].s);
 
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc24.inc.c b/src/world/common/UnkFunc24.inc.c
index ffe172966a..adbdeb2737 100644
--- a/src/world/common/UnkFunc24.inc.c
+++ b/src/world/common/UnkFunc24.inc.c
@@ -8,4 +8,4 @@ ApiStatus N(UnkFunc24)(ScriptInstance *script, s32 isInitialCall) {
     }
 
     return ApiStatus_DONE2;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc25.inc.c b/src/world/common/UnkFunc25.inc.c
new file mode 100644
index 0000000000..943b0bff54
--- /dev/null
+++ b/src/world/common/UnkFunc25.inc.c
@@ -0,0 +1,24 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc25)(ScriptInstance* script, s32 isInitialCall) {
+    CollisionStatus* collisionStatus = &gCollisionStatus;
+    s32 stickX, stickY;
+
+    if (collisionStatus->currentFloor != script->varTable[11]) {
+        script->varTable[0] = FALSE;
+        return ApiStatus_DONE2;
+    }
+
+    stickX = abs(gGameStatusPtr->stickX);
+    stickY = gGameStatusPtr->stickY;
+
+    if (stickX != 0 || stickY != 0) {
+        if (atan2(0.0f, 0.0f, stickX, stickY) < 60.0f) {
+            script->varTable[0] = TRUE;
+            return ApiStatus_DONE2;
+        }
+    }
+
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/common/UnkFunc26.inc.c b/src/world/common/UnkFunc26.inc.c
new file mode 100644
index 0000000000..9fd9cc02d7
--- /dev/null
+++ b/src/world/common/UnkFunc26.inc.c
@@ -0,0 +1,33 @@
+#include "common.h"
+#include "map.h"
+
+void func_8011BEB4(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7, u8 var8, s32 var9, s32 var10);
+void func_8011BF98(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7);
+
+ApiStatus N(UnkFunc26)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode *args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+    s32 var4 = get_variable(script, *args++);
+    s32 var5 = get_variable(script, *args++);
+    s32 var6 = get_variable(script, *args++);
+    s32 var7 = get_variable(script, *args++);
+    s32 var8 = get_variable(script, *args++);
+    s32 var9 = get_variable(script, *args++);
+    s32 var10 = get_variable(script, *args++);
+
+    switch (var1) {
+        case 1:
+            set_background_color_blend(var2, var3, var4, var5);
+            break;
+        case 2:
+            func_8011BEB4(var2, var3, var4, var5, var6, var7, var8, var9, var10);
+            break;
+        case 3:
+            func_8011BF98(var2, var3, var4, var5, var6, var7);
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc27.inc.c b/src/world/common/UnkFunc27.inc.c
new file mode 100644
index 0000000000..2c90739757
--- /dev/null
+++ b/src/world/common/UnkFunc27.inc.c
@@ -0,0 +1,49 @@
+#include "common.h"
+#include "map.h"
+
+void func_8011B950(u16, s32, s32, s32);
+
+ApiStatus N(UnkFunc27)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode *args = script->ptrReadPos;
+    s32 testS2 = get_variable(script, *args++);
+    s32 testS0 = get_variable(script, *args++);
+    s32 testS1 = get_variable(script, *args++);
+    s32* temp_s0_3 = testS0;
+    s32 temp_s1 = testS1;
+    s32 temp_s2 = testS2;
+
+    if (temp_s0_3 == -1) {
+        func_8011D82C(temp_s1);
+        return ApiStatus_DONE2;
+    }
+
+    switch (temp_s2) {
+        case 0:
+            temp_s2 = 0xFFFF;
+            while (TRUE) {
+                if (*temp_s0_3 == temp_s2) {
+                    break;
+                }
+                func_8011BC7C(get_model_from_list_index(get_model_list_index_from_tree_index(*temp_s0_3)), -1, temp_s1);
+                temp_s0_3++;
+            };
+            break;
+
+        case 1:
+            temp_s2 = 0xFFFF;
+            while (TRUE) {
+                if (*temp_s0_3 == temp_s2) {
+                    break;
+                }
+                func_8011B950(*temp_s0_3, -1, temp_s1, 0);
+                temp_s0_3++;
+            };
+            break;
+
+        case 2:
+            *D_801512F0 = temp_s1;
+            break;
+
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc31.inc.c b/src/world/common/UnkFunc31.inc.c
new file mode 100644
index 0000000000..098bb1f704
--- /dev/null
+++ b/src/world/common/UnkFunc31.inc.c
@@ -0,0 +1,106 @@
+#include "common.h"
+#include "map.h"
+
+s32 N(UnkFunc28)(Npc* npc);
+
+ApiStatus N(UnkFunc31)(ScriptInstance *script, s32 isInitialCall) {
+    Npc *npc = get_npc_unsafe(script->owner2.npcID);
+
+    npc->onRender = N(UnkFunc28);
+    npc->blurBuf = heap_malloc(8);
+    *((s32*)npc->blurBuf) = 0;
+
+    return ApiStatus_DONE1;
+}
+
+ApiStatus N(GetNpcUnsafeOwner2)(ScriptInstance* script, s32 isInitialCall) {
+    get_npc_unsafe(script->owner2.npcID);
+    return ApiStatus_BLOCK;
+}
+
+s32 N(UnkFunc28)(Npc* npc) {
+    Camera* camera = &gCameras[gCurrentCamID];
+
+    if (*((s32*)npc->blurBuf) & 1) {
+        clamp_angle(-camera->currentYaw);
+    }
+}
+
+ApiStatus N(UnkAlphaFunc)(ScriptInstance* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        s32 i;
+
+        func_8011D82C(1);
+        D_801512F0[0] = 1;
+        set_background_color_blend(0, 0, 0, 0);
+
+        for (i = 0; i < MAX_NPCS; i++) {
+            Npc* npc = get_npc_by_index(i);
+
+            if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != UNK_ALPHA_FUNC_NPC) {
+                npc->flags |= 0x800000;
+            }
+        }
+
+        for (i = 0; i < MAX_ITEM_ENTITIES; i++) {
+            ItemEntity* itemEntity = get_item_entity(i);
+
+            if (itemEntity != NULL && itemEntity->flags & 0x10) {
+                itemEntity->flags |= 0x8000000;
+            }
+        }
+
+        script->functionTemp[0].s = 0;
+    }
+
+    script->functionTemp[0].s += 8;
+    if (script->functionTemp[0].s > 255) {
+        script->functionTemp[0].s = 255;
+    }
+
+    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
+    return (script->functionTemp[0].s == 255) * ApiStatus_DONE2;
+}
+
+ApiStatus N(UnkFunc29)(ScriptInstance *script, s32 isInitialCall) {
+    s32 i;
+
+    if (isInitialCall) {
+        set_background_color_blend(0, 0, 0, 255);
+        script->functionTemp[0].s = 255;
+        script->functionTemp[1].s = 0;
+    }
+
+    script->functionTemp[0].s -= 8;
+    if (script->functionTemp[0].s < 0) {
+        script->functionTemp[0].s = 0;
+    }
+
+    set_background_color_blend(0, 0, 0, script->functionTemp[0].s);
+    if (script->functionTemp[0].s == 0 && script->functionTemp[1].s == 0) {
+        script->functionTemp[1].s = 1;
+    } else if (script->functionTemp[1].s == 1) {
+        func_8011D82C(0);
+        *D_801512F0 = 0;
+
+        for (i = 0; i < MAX_NPCS; i++) {
+            Npc* npc = get_npc_by_index(i);
+            if (npc != NULL && npc->flags != 0) {
+                if (npc->npcID != NPC_PARTNER && npc->npcID != UNK_ALPHA_FUNC_NPC) {
+                    npc->flags &= ~0x00800000;
+                }
+            }
+        }
+
+        for (i = 0; i < MAX_ITEM_ENTITIES; i++) {
+            Entity* entity = get_item_entity(i);
+            if (entity != NULL && entity->flags & 0x10) {
+                entity->flags &= ~0x08000000;
+            }
+        }
+
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/common/UnkFunc32.inc.c b/src/world/common/UnkFunc32.inc.c
new file mode 100644
index 0000000000..cbbd5e1d72
--- /dev/null
+++ b/src/world/common/UnkFunc32.inc.c
@@ -0,0 +1,13 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc32)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+
+    set_transition_stencil_center(0, 0, 190, 145);
+    set_transition_stencil_zoom_0(var1, var2);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc35.inc.c b/src/world/common/UnkFunc35.inc.c
new file mode 100644
index 0000000000..84caa8798d
--- /dev/null
+++ b/src/world/common/UnkFunc35.inc.c
@@ -0,0 +1,12 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc35)(ScriptInstance *script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = get_variable(script, *args++);
+    s32 var2 = get_variable(script, *args++);
+    s32 var3 = get_variable(script, *args++);
+
+    set_transition_stencil_color(0, var1, var2, var3);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc36.inc.c b/src/world/common/UnkFunc36.inc.c
new file mode 100644
index 0000000000..c296cee27d
--- /dev/null
+++ b/src/world/common/UnkFunc36.inc.c
@@ -0,0 +1,6 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc36)(ScriptInstance *script, s32 isInitialCall) {
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc39.inc.c b/src/world/common/UnkFunc39.inc.c
new file mode 100644
index 0000000000..85047c419f
--- /dev/null
+++ b/src/world/common/UnkFunc39.inc.c
@@ -0,0 +1,10 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc39)(ScriptInstance *script, s32 isInitialCall) {
+    Effect* effect = get_variable(script, *script->ptrReadPos);
+
+    effect->flags |= 0x10;
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc40.inc.c b/src/world/common/UnkFunc40.inc.c
new file mode 100644
index 0000000000..c000c1b3a1
--- /dev/null
+++ b/src/world/common/UnkFunc40.inc.c
@@ -0,0 +1,10 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc40)(ScriptInstance *script, s32 isInitialCall) {
+    script->varTable[0] = 0;
+    if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) {
+        script->varTable[0] = 1;
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc41.inc.c b/src/world/common/UnkFunc41.inc.c
new file mode 100644
index 0000000000..1e6568aaf6
--- /dev/null
+++ b/src/world/common/UnkFunc41.inc.c
@@ -0,0 +1,47 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc41)(ScriptInstance* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    PlayerData* playerData = &gPlayerData;
+    NpcID npcID = get_variable(script, *args++);
+    PartnerID partnerID = get_variable(script, *args++);
+    Npc* npc = get_npc_safe(npcID);
+
+    if (isInitialCall) {
+        if (gPlayerData.currentPartner == PARTNER_NONE) {
+            script->functionTemp[0].s = 2;
+        } else {
+            script->functionTemp[0].s = 0;
+        }
+    }
+
+    switch (script->functionTemp[0].s) {
+        case 0:
+            func_800EB168(0);
+            script->functionTemp[1].s = 30;
+            script->functionTemp[0].s = 1;
+            break;
+        case 1:
+            script->functionTemp[1].s--;
+            if (script->functionTemp[1].s == -1) {
+                script->functionTemp[0].s = 2;
+            }
+            break;
+        case 2:
+            playerData->currentPartner = partnerID;
+            playerData->partners[partnerID].enabled = TRUE;
+            clear_partner_move_history(npc);
+            func_800EB2A4(playerData->currentPartner);
+            script->functionTemp[0].s = 3;
+            break;
+        case 3:
+            set_npc_yaw(get_npc_safe(NPC_PARTNER), npc->yaw);
+            npc->flags &= ~4;
+            disable_npc_shadow(npc);
+            npc->pos.y = -1000.0f;
+            return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/common/UnkFunc42.inc.c b/src/world/common/UnkFunc42.inc.c
new file mode 100644
index 0000000000..44db5698e0
--- /dev/null
+++ b/src/world/common/UnkFunc42.inc.c
@@ -0,0 +1,7 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc42)(ScriptInstance *script, s32 isInitialCall) {
+    script->varTable[10] = atan2(script->varTable[0], script->varTable[2], script->varTable[3], script->varTable[5]);
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc43.inc.c b/src/world/common/UnkFunc43.inc.c
new file mode 100644
index 0000000000..49f2869cc5
--- /dev/null
+++ b/src/world/common/UnkFunc43.inc.c
@@ -0,0 +1,12 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc43)(ScriptInstance *script, s32 isInitialCall) {
+    f32 var1 = script->varTable[0] - script->varTable[3];
+    f32 var2 = script->varTable[1] - script->varTable[4];
+    f32 var3 = script->varTable[2] - script->varTable[5];
+
+    script->varTable[0] = SQ(var1) + SQ(var2) + SQ(var3) < SQ(60.0f);
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc44.inc.c b/src/world/common/UnkFunc44.inc.c
new file mode 100644
index 0000000000..35ecebcfd7
--- /dev/null
+++ b/src/world/common/UnkFunc44.inc.c
@@ -0,0 +1,13 @@
+#include "common.h"
+#include "map.h"
+
+ApiStatus N(UnkFunc44)(ScriptInstance *script, s32 isInitialCall) {
+    script->varTable[0] = 0;
+    do {} while(0);
+    if (gPlayerActionState == ACTION_STATE_GROUND_POUND) {
+        script->varTable[0] = 1;
+    } else if (gPlayerActionState == ACTION_STATE_ULTRA_POUND) {
+        script->varTable[0] = 1;
+    }
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc45.inc.c b/src/world/common/UnkFunc45.inc.c
new file mode 100644
index 0000000000..aa2f728fa6
--- /dev/null
+++ b/src/world/common/UnkFunc45.inc.c
@@ -0,0 +1,14 @@
+#include "common.h"
+#include "map.h"
+
+void N(UnkFunc45)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    npc->duration--;
+    if (npc->duration <= 0) {
+        enemy->varTable[2] = 0;
+        npc->duration = 0;
+        script->functionTemp[0].s = 0;
+    }
+}
diff --git a/src/world/common/UnkFunc5.inc.c b/src/world/common/UnkFunc5.inc.c
index 87e025b9ba..3bbfa2a3ae 100644
--- a/src/world/common/UnkFunc5.inc.c
+++ b/src/world/common/UnkFunc5.inc.c
@@ -28,4 +28,4 @@ void N(UnkFunc5)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *
     enemy->varTable[7] = ((posY * 100.0) + 0.5);
     script->functionTemp[1].s = aiSettings->unk_14;
     enemy->unk_B0 |= 0x10;
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc6.inc.c b/src/world/common/UnkFunc6.inc.c
index 9e03be12ef..f1f0bb8e8b 100644
--- a/src/world/common/UnkFunc6.inc.c
+++ b/src/world/common/UnkFunc6.inc.c
@@ -25,8 +25,8 @@ void N(UnkFunc6)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrito
         enemy->unk_07 = 0;
         if (!(npc->flags & 8)) {
             posX = npc->pos.x;
-            posY = npc->pos.y; 
-            posZ = npc->pos.z; 
+            posY = npc->pos.y;
+            posZ = npc->pos.z;
             posW = 1000.0f;
             phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW);
         } else {
@@ -69,8 +69,8 @@ void N(UnkFunc6)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrito
         }
 
         posX = npc->pos.x;
-        posY = npc->pos.y + npc->collisionHeight; 
-        posZ = npc->pos.z; 
+        posY = npc->pos.y + npc->collisionHeight;
+        posZ = npc->pos.z;
         posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0;
         if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) {
             if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) {
@@ -86,4 +86,4 @@ void N(UnkFunc6)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrito
         }
         npc->jumpVelocity = 0.0f;
     }
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc8.inc.c b/src/world/common/UnkFunc8.inc.c
index 58e8aea56b..8d7a074cd3 100644
--- a/src/world/common/UnkFunc8.inc.c
+++ b/src/world/common/UnkFunc8.inc.c
@@ -2,14 +2,12 @@
 #include "map.h"
 
 void N(UnkFunc8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
-    PlayerStatus** playerStatus;
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
     s32 var;
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        playerStatus = &gPlayerStatusPtr;
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z);
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
         script->functionTemp[0].s = 12;
     } else {
         npc->duration--;
@@ -25,4 +23,4 @@ void N(UnkFunc8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerrito
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/world/common/UnkFunc9.inc.c b/src/world/common/UnkFunc9.inc.c
index 815e30f3e9..89ab3deada 100644
--- a/src/world/common/UnkFunc9.inc.c
+++ b/src/world/common/UnkFunc9.inc.c
@@ -4,10 +4,9 @@
 void N(UnkFunc9)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc *npc = get_npc_unsafe(enemy->npcID);
-    PlayerStatus** playerStatus = &gPlayerStatusPtr;
 
     if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) {
-        npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z);
+        npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
         script->functionTemp[0].s = 12;
     } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) {
         npc->duration = 10;
diff --git a/src/world/common/set_script_owner_npc_anim.inc.c b/src/world/common/set_script_owner_npc_anim.inc.c
index 9856b558aa..d876d49c02 100644
--- a/src/world/common/set_script_owner_npc_anim.inc.c
+++ b/src/world/common/set_script_owner_npc_anim.inc.c
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "map.h"
 
-void N(set_script_owner_npc_anim)(ScriptInstance* script) {
+void N(set_script_owner_npc_anim)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
diff --git a/src/world/common/set_script_owner_npc_col_height.inc.c b/src/world/common/set_script_owner_npc_col_height.inc.c
index 6c393b741a..f09ac00672 100644
--- a/src/world/common/set_script_owner_npc_col_height.inc.c
+++ b/src/world/common/set_script_owner_npc_col_height.inc.c
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "map.h"
 
-void N(set_script_owner_npc_col_height)(ScriptInstance* script) {
+void N(set_script_owner_npc_col_height)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
diff --git a/src/world/partners.c b/src/world/partners.c
index ff5b2de830..d459e77a8d 100644
--- a/src/world/partners.c
+++ b/src/world/partners.c
@@ -601,7 +601,7 @@ void func_800EBB40(Npc* partner) {
     D_800F8344 = partner->pos.z;
 }
 
-INCLUDE_ASM(s32, "world/partners", func_800EBC74);
+INCLUDE_ASM(void, "world/partners", func_800EBC74, Npc* partner);
 
 INCLUDE_ASM(void, "world/partners", enable_partner_flying, Npc* partner, s32 val);
 
@@ -732,6 +732,6 @@ void func_800EF628(void) {
     temp_8010EBB0->unk_14++;
 }
 
-INCLUDE_ASM(s32, "world/partners", func_800EF640);
+INCLUDE_ASM(void, "world/partners", func_800EF640, Npc* partner);
 
 INCLUDE_ASM(s32, "world/partners", func_800EF82C);
diff --git a/tools/assist_copy_paste.py b/tools/assist_copy_paste.py
index 55ffe5e3ee..7202275246 100644
--- a/tools/assist_copy_paste.py
+++ b/tools/assist_copy_paste.py
@@ -1,5 +1,15 @@
 import sys
 from pathlib import Path
+import re
+
+RUN_ME = False
+if not RUN_ME:
+    print(f"Are you sure yo uwant to run this? Edit RUN_ME in the script if so")
+    exit()
+
+WRITE_FILE = True
+DO_OVERWRITE = True
+DO_OVERWRITE_DECOMP = False
 
 def get_file_name(name):
     out = ""
@@ -34,11 +44,12 @@ def find_file_path(looking_for):
                 x -= 1
                 file_path = map_[x].split(".o",1)[0].split("build/",1)[1].strip()
                 break
-    if file_path:
-        if not "src/world/area_" in file_path:
-            file_path = ""
+    if not "src/world/area_" in file_path:
+        file_path = ""
     return file_name, file_path, decomp
 
+
+
 map_file = (Path(__file__).parent.parent / "ver" / "current" / "build" / "papermario.map").read_text().splitlines()
 # cut out half the map
 map_ = []
@@ -98,35 +109,175 @@ for file in files[1:]:
         print(f"Failed to find {file}")
         continue
 
+    if function[3] == "_" and function[6] == "_" and function.startswith(Path(file_path).parts[3]):
+        function = function[len("xxx_yy_"):]
+
     print(f"Func:\"{function}\" path:\"{file_path}\" Decomped: {decomp}")
 
+    asm_path = Path(__file__).parent.parent / "ver" / "us" / "asm" / "nonmatchings"
+    fixed = list(Path(file_path).parts[1:])
+    fixed[-1] = fixed[-1][:-2]
+    asm_path = asm_path / "/".join(fixed) / function
+    asm_path = asm_path.with_suffix(".s")
+
     file_path = (Path(__file__).parent.parent / file_path).resolve()
     
     # don't want to try and replace already-decompiled functions
-    if decomp:
-        print(f"{file_path} already has this function decompiled")
+    if decomp and not DO_OVERWRITE:
+        print(f"{file_path} already has this function decompiled and not overwriting")
         continue
 
     func_file = file_path.read_text().splitlines()
     new_func_file = []
-    for i,line in enumerate(func_file):
+    i = 0
+    while i < len(func_file):
+        line = func_file[i]
         if line:
             stripped_line = line.strip()
             split_line = stripped_line.split(" ")
 
-            if len(split_line) > 2 and "INCLUDE_ASM" in split_line[0] and function in split_line[2] and i+1 < len(func_file) and "/*" not in func_file[i+1]:
+            if DO_OVERWRITE_DECOMP and decomp and len(split_line) > 2 and decomp and function in split_line[1]:
+                if DO_OVERWRITE:
+                    x = i
+                    while not (func_file[x] == "}"):
+                        x += 1
+                    x += 1
+
+                    old_data_name = ""
+                    new_data_name = ""
+
+                    #if "ptr" in func_file[i+1]:
+                    #    new_func_data = function_text.splitlines()[1:-1]
+                    #    old_data_name = new_func_data[3].split("if (",1)[1].split(" == ",1)[0]
+                    #    new_data_name = func_file[i+1].split(" = ",1)[1][1:-1]
+
+                    func_data = function_text.replace(old_data_name, new_data_name)
+
+                    func_data = func_data.splitlines()[1:-1]
+                    func_data[0] = func_data[0].replace("N()", f"N({function})")
+                    new_func_file.append("\n".join(func_data))
+
+                    i = x-1
+                    #print("\n".join(temp))
+                    #print()
+                else:
+                    new_func_file.append(line)
+
+            elif len(split_line) > 2 and "INCLUDE_ASM" in split_line[0] and function in split_line[2] and ((i+1 < len(func_file) and "/*" not in func_file[i+1] and not func_file[i+1].startswith("#endif")) or (i+1 == len(func_file))):
+                func_data = function_text.splitlines()
+
+                '''
+                if asm_path.is_file():
+                    asm_data = asm_path.read_text().splitlines()
+                    for asm_line in asm_data:
+                        if "lui" in asm_line and "ldc1" in asm_data[x+1] and asm_line.count("_") == 2:
+                            new_data_name = asm_line.split(" ")[-1]
+                            break
+                    else:
+                        print(f"Failed to find new data name")
+                        exit()
+
+                    old_data_name = "N(" + func_data[8].split("N(",1)[1].split(")",1)[0] + ")"
+                    func_data = function_text.replace(old_data_name, "N(" + new_data_name + ")").splitlines()
+                '''
+                '''
+                if asm_path.is_file():
+                    asm_data = asm_path.read_text().splitlines()
+                    for x,asm_line in enumerate(asm_data):
+                        if "lui" in asm_line and "addiu" in asm_data[x+1] and "D_" in asm_line and asm_line.count("_") == 1:
+                            new_data_name1 = asm_line.split("(",1)[1].split(")",1)[0]
+                        elif "lui" in asm_line and "sw" in asm_data[x+1] and "D_" in asm_line and asm_line.count("_") == 1:
+                            new_data_name2 = asm_line.split("(",1)[1].split(")",1)[0]
+                            break
+                    else:
+                        print(f"Failed to find new data name")
+                        exit()
+
+                    old_data_name1 = func_data[5].split("N(",1)[1].split(")",1)[0]
+                    old_data_name2 = func_data[8].split("N(",1)[1].split(")",1)[0]
+
+                    ft2 = function_text
+                    ft2 = ft2.replace("N(" + old_data_name1 + ")", old_data_name1)
+                    ft2 = ft2.replace("N(" + old_data_name2 + ")", old_data_name2)
+                    ft2 = ft2.replace(old_data_name1, "N(" + new_data_name1 + ")")
+                    func_data = ft2.replace(old_data_name2, "N(" + new_data_name2 + ")").splitlines()
+                '''
+
                 new_func_file.append(stripped_line)
-                temp = function_text.splitlines()
-                temp[1] = temp[1].replace("N()", f"N({function})")
-                new_func_file.append("\n".join(temp))
+                func_data[1] = func_data[1].replace("N()", f"N({function})")
+                new_func_file.append("\n".join(func_data))
+
+                #print("\n".join(func_data))
+                #print()
+            
+            elif len(split_line) > 2 and "INCLUDE_ASM" in split_line[0] and function in split_line[2] and func_file[i+1].startswith("#endif"):
+                if DO_OVERWRITE:
+                    #a NON_MATCHING func
+                    x = i
+                    while not func_file[x].startswith("#ifdef NON_MATCHING"):
+                        x -= 1
+                    # strip away lines already added
+                    new_func_file = new_func_file[:x]
+                    new_func_file.append(stripped_line)
+                    func_data = function_text.splitlines()
+                    func_data[1] = func_data[1].replace("N()", f"N({function})")
+                    new_func_file.append("\n".join(func_data))
+                    i += 1
+                else:
+                    new_func_file.append(line)
+
             elif len(split_line) > 2 and "INCLUDE_ASM" in split_line[0] and function in split_line[2] and i+1 < len(func_file) and "/*" in func_file[i+1]:
-                print(f"{file_path} already has this function commented out")
-                new_func_file.append(line)
+                if DO_OVERWRITE:
+                    while not (func_file[i] == "}" and func_file[i+1] == "*/"):
+                        i += 1
+                    i += 1
+
+                    func_data = function_text.splitlines()
+
+                    '''
+                    if asm_path.is_file():
+                        #print(f"Reading asm file {asm_path}")
+                        asm_data = asm_path.read_text().splitlines()
+                        for x,asm_line in enumerate(asm_data):
+                            if "lui" in asm_line and "addu" in asm_data[x+1] and "D_" in asm_line and asm_line.count("_") == 2:
+                                new_data_name1 = asm_line.split("(",1)[1].split(")",1)[0]
+                                break
+                        else:
+                            print(f"Failed to find new data name")
+                            exit()
+ 
+                        #print(func_data[5])
+ 
+                        old_data_name1 = func_data[5].split("N(",1)[1].split(")",1)[0]
+ 
+                        ft2 = function_text
+                        ft2 = ft2.replace("N(" + old_data_name1 + ")", old_data_name1)
+                        func_data = ft2.replace(old_data_name1, "N(" + new_data_name1 + ")").splitlines()
+                    '''
+                    
+                    new_func_file.append(stripped_line)
+                    func_data[1] = func_data[1].replace("N()", f"N({function})")
+                    new_func_file.append("\n".join(func_data))
+
+                    #print("\n".join(func_data))
+                    #print()
+                else:
+                    print(f"{file_path} already has this function commented out")
+                    new_func_file.append(line)
             else:
                 new_func_file.append(line)
         else:
             new_func_file.append(line)
+        i += 1
 
+    if new_func_file[-1] != "":
+        new_func_file.append("")
+
+    #print("===========")
     #print(f"Altering {file_path}")
     #print("\n".join(new_func_file))
-    file_path.write_text("\n".join(new_func_file))
+    #print("===========")
+    if WRITE_FILE:
+        file_path.write_text("\n".join(new_func_file))
+    #if "dro_02" in str(file_path):
+    #    exit()
diff --git a/tools/build/cc_dsl/compile_script.py b/tools/build/cc_dsl/compile_script.py
index 156c662f2d..0ff89826ed 100755
--- a/tools/build/cc_dsl/compile_script.py
+++ b/tools/build/cc_dsl/compile_script.py
@@ -534,7 +534,7 @@ class Compile(Transformer):
         return Cmd("ScriptOpcode_SPAWN_SCRIPT", tree.children[0], meta=tree.meta)
     def spawn_set_stmt(self, tree):
         lhs, script = tree.children
-        return Cmd("ScriptOpcode_SPAWN_SCRIPT_GET_ID", script, lhs, meta=tree.meta)
+        return Cmd("ScriptOpcode_SPAWN_GET_ID", script, lhs, meta=tree.meta)
     def await_stmt(self, tree):
         return Cmd("ScriptOpcode_AWAIT_SCRIPT", tree.children[0], meta=tree.meta)
     def jump_stmt(self, tree):
diff --git a/tools/disasm_script.py b/tools/disasm_script.py
index 108589857a..bb20526560 100755
--- a/tools/disasm_script.py
+++ b/tools/disasm_script.py
@@ -176,6 +176,9 @@ def get_constants():
     return
 
 def make_anim_macro(self, sprite, palette, anim):
+    if sprite == 0xFF and palette == 0xFF and anim == 0xFF:
+        return "-1"
+
     call = "NPC_ANIM("
     if sprite in CONSTANTS["NPC_SPRITE"]:
         call += f"{CONSTANTS['NPC_SPRITE'][sprite]['name']}, "
@@ -204,7 +207,9 @@ def fix_args(self, func, args, info):
             arg = "0x" + arg[2:]
         if "0x" in arg and int(arg, 16) >= 0xF0000000:
             arg = f"{int(arg, 16) - 0x100000000}"
-        if i in info:
+        if i in info or (i+1 == len(args) and -1 in info):
+            if i+1 == len(args) and -1 in info:
+                i = -1
             if "_" in arg:
                 new_args.append(f"{arg}")
                 continue
@@ -219,6 +224,10 @@ def fix_args(self, func, args, info):
                 palette = (argNum & 0xFF00)   >> 8
                 anim    = (argNum & 0xFF)     >> 0
 
+                #if argNum not in CONSTANTS["MAP_NPCS"]:
+                #    new_args.append(f"0x{argNum:X}")
+                #    continue
+                
                 if func == "SetAnimation" and int(new_args[1], 10) == 0:
                     call = f"{CONSTANTS['PlayerAnims'][argNum]}"
                 elif "SI_" not in args[0] and int(args[0]) >= 0 and CONSTANTS["MAP_NPCS"].get(int(args[0])) == "NPC_PLAYER":
@@ -251,6 +260,10 @@ def fix_args(self, func, args, info):
                     enabled.append(f"0")
                 new_args.append("((" + " | ".join(enabled) + "))")
             elif info[i] == "NpcIDs":
+                if argNum not in CONSTANTS["MAP_NPCS"]:
+                    new_args.append(f"0x{argNum:X}")
+                    continue
+
                 if argNum >= 0:
                     new_args.append(CONSTANTS["MAP_NPCS"][argNum])
                 else:
@@ -266,6 +279,7 @@ def fix_args(self, func, args, info):
                 else:
                     #Print the unknowns in hex
                     new_args.append(f"0x{int(argNum):X}")
+
         else:
             new_args.append(f"{arg}")
     return ", ".join(new_args)
@@ -290,9 +304,11 @@ replace_funcs = {
 
     "EnableIdleScript"          :{0:"ActorIDs"},
     "EnableNpcShadow"           :{0:"NpcIDs", 1:"Bool"},
+    "EndSpeech"                 :{1:"CustomAnim", 2:"CustomAnim"},
     "EnemyDamageTarget"         :{0:"ActorIDs"},
     "EnemyTestTarget"           :{0:"ActorIDs"},
 
+    "FindKeyItem"               :{0:"ItemIDs"},
     "ForceHomePos"              :{0:"ActorIDs"},
 
     "func_802CFE2C"             :{0:"NpcIDs"},
@@ -353,14 +369,18 @@ replace_funcs = {
     "SetNpcRotation"            :{0:"NpcIDs"},
     "SetNpcScale"               :{0:"NpcIDs"},
     "SetNpcSpeed"               :{0:"NpcIDs"},
+    "SetNpcSprite"              :{1:"Hex"},
     "SetNpcYaw"                 :{0:"NpcIDs"},
     "SetPlayerAnimation"        :{0:"PlayerAnims"},
     "SetSelfEnemyFlagBits"      :{0:"NpcFlags", 1:"Bool"},
     #"SetSelfVar"                :{1:"Bool"}, # apparently this was a bool in some scripts but it passes non-0/1 values, including negatives
     "SetTargetActor"            :{0:"ActorIDs"},
+    "ShowChoice"                :{0:"CustomMsg"},
     "ShowEmote"                 :{1:"Emotes"},
     "ShowMessageAtScreenPos"    :{0:"CustomMsg"},
-    "SpeakToPlayer"             :{0:"NpcIDs", 1:"CustomAnim", 2:"CustomAnim", 4:"CustomMsg"},
+    "ShowMessageAtWorldPos"     :{0:"CustomMsg"},
+    "SpeakToPlayer"             :{0:"NpcIDs", 1:"CustomAnim", 2:"CustomAnim", -1:"CustomMsg"},
+    "SwitchMessage"             :{0:"CustomMsg"},
 
     "UseIdleAnimation"          :{0:"ActorIDs"},
 }
@@ -470,7 +490,9 @@ class ScriptDisassembler:
         name = "N(" + name.replace("function", "func") + f"_{(vram - 0x80240000)+self.romstart:X}" + ")"
         return name
 
-    def replace_star_rod_prefix(self, addr):
+    def replace_star_rod_prefix(self, addr, isArg=False):
+        if type(addr) is str:
+            return addr
         if addr > 0x80000000 and addr in self.symbol_map:
             name = self.symbol_map[addr][0][1]
             toReplace = True
@@ -501,12 +523,16 @@ class ScriptDisassembler:
                 if name not in self.INCLUDED["functions"]:
                     self.INCLUDES_NEEDED["forward"].append(prefix + name + suffix + ";")
                     self.INCLUDED["functions"].add(name)
-            return name
+                return name
+            elif not isArg or name.startswith("\""):
+                return name
+            else:
+                return str(addr)
         return addr
 
-    def addr_ref(self, addr):
+    def addr_ref(self, addr, isArg=False):
         if addr in self.symbol_map:
-            return self.replace_star_rod_prefix(addr)
+            return self.replace_star_rod_prefix(addr, isArg)
         return f"0x{addr:08X}"
 
     def trigger(self, trigger):
@@ -1073,7 +1099,7 @@ class ScriptDSLDisassembler(ScriptDisassembler):
             if addr in self.symbol_map:
                 func_name = self.addr_ref(addr)
                 for i,arg in enumerate(argv):
-                    argv[i] = self.replace_star_rod_prefix(arg)
+                    argv[i] = self.replace_star_rod_prefix(arg, isArg=True)
                 argv_str = ", ".join(self.var(arg) for arg in argv[1:])
                 argv_str = replace_constants(self, func_name, argv_str)
 
@@ -1135,20 +1161,32 @@ if __name__ == "__main__":
     parser.add_argument("offset", type=lambda x: int(x, 16), default=0, help="Offset to start dissassembling from")
     parser.add_argument("-end", "-e", "--e", type=lambda x: int(x, 16), default=0, dest="end", required=False, help="End offset to stop dissassembling from.\nOnly used as a way to find valid scripts.")
     parser.add_argument("-vram", "-v", "--v", type=lambda x: int(x, 16), default=0, dest="vram", required=False, help="VRAM start will be tracked and used for the script output name")
+    parser.add_argument("-si", "--si", action="store_true", default=False, dest="si", required=False, help="Force si script output")
 
     args = parser.parse_args()
     vram_base = args.vram
     get_constants()
 
+    INCLUDED = {}
+    INCLUDED["functions"] = set()
+    INCLUDED["includes"] = set()
+    INCLUDES_NEEDED = {}
+    INCLUDES_NEEDED["include"] = []
+    INCLUDES_NEEDED["forward"] = []
+    INCLUDES_NEEDED["npcs"] = {}
+    INCLUDES_NEEDED["sprites"] = set()
+
     if args.end > args.offset:
         # Search the given memory range and report scripts
         with open(args.file, "rb") as f:
             gap = False
             first_print = False
+            
+
             while args.offset < args.end:
                 f.seek(args.offset)
 
-                script = ScriptDSLDisassembler(f)
+                script = ScriptDSLDisassembler(f, "", {}, 0x978DE0, INCLUDES_NEEDED, INCLUDED)
                 try:
                     script_text = script.disassemble()
 
@@ -1194,15 +1232,19 @@ if __name__ == "__main__":
 
             f.seek(args.offset)
 
-            script = ScriptDSLDisassembler(f)
-            try:
-                script_text = script.disassemble()
+            script = ScriptDSLDisassembler(f, "", {}, 0x978DE0, INCLUDES_NEEDED, INCLUDED)
 
-                print(f"Script read from 0x{script.start_pos:X} to 0x{script.end_pos:X} "
-                      f"(0x{script.end_pos - script.start_pos:X} bytes, {script.instructions} instructions)")
-                print()
-                print(script_text, end="")
+            if args.si:
+                print(ScriptDisassembler(f, "", {}, 0x978DE0, INCLUDES_NEEDED, INCLUDED).disassemble(), end="")
+            else:
+                try:
+                    script_text = script.disassemble()
 
-            except UnsupportedScript:
-                f.seek(args.offset)
-                print(ScriptDisassembler(f).disassemble(), end="")
+                    print(f"Script read from 0x{script.start_pos:X} to 0x{script.end_pos:X} "
+                          f"(0x{script.end_pos - script.start_pos:X} bytes, {script.instructions} instructions)")
+                    print()
+                    print(script_text, end="")
+
+                except UnsupportedScript:
+                    f.seek(args.offset)
+                    print(ScriptDisassembler(f).disassemble(), end="")
diff --git a/tools/splat_ext/msg.yaml b/tools/splat_ext/msg.yaml
index fd5078f025..3cda85b1f4 100644
--- a/tools/splat_ext/msg.yaml
+++ b/tools/splat_ext/msg.yaml
@@ -4,6 +4,8 @@
 - [0x19, 0x0040, kmr_12_tattle]
 - [0x19, 0x0060, sbk_00_tattle]
 - [0x19, 0x0061, sbk_01_tattle]
+- [0x19, 0x0093, dro_01_tattle]
+- [0x19, 0x0094, dro_02_tattle]
 - [0x19, 0x00BB, arn_07_tattle]
 - [0x19, 0x00BC, arn_03_tattle]
 - [0x19, 0x00BD, arn_05_tattle]
@@ -34,6 +36,25 @@
 - [0x19, 0x00D6, arn_12_tattle]
 - [0x19, 0x00D7, arn_13_tattle]
 - [0x19, 0x00D8, arn_11_tattle]
+- [0x19, 0x0114, flo_00_tattle]
+- [0x19, 0x0115, flo_03_tattle]
+- [0x19, 0x0116, flo_07_tattle]
+- [0x19, 0x0117, flo_08_tattle]
+- [0x19, 0x0118, flo_09_tattle]
+- [0x19, 0x011B, flo_11_tattle]
+- [0x19, 0x011C, flo_12_tattle]
+- [0x19, 0x011D, flo_13_tattle]
+- [0x19, 0x011E, flo_14_tattle]
+- [0x19, 0x011F, flo_15_tattle]
+- [0x19, 0x0120, flo_16_tattle]
+- [0x19, 0x0121, flo_17_tattle]
+- [0x19, 0x0122, flo_18_tattle]
+- [0x19, 0x0123, flo_19_tattle]
+- [0x19, 0x0124, flo_21_tattle]
+- [0x19, 0x0125, flo_22_tattle]
+- [0x19, 0x0126, flo_23_tattle]
+- [0x19, 0x0127, flo_24_tattle]
+- [0x19, 0x0128, flo_25_tattle]
 
 - [0x1C, 0x0000, actor_goomba_tattle]
 - [0x1C, 0x0001, actor_spiked_goomba_tattle]
diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py
index 639b561244..5af0c7a66c 100755
--- a/tools/star_rod_idx_to_c.py
+++ b/tools/star_rod_idx_to_c.py
@@ -22,6 +22,37 @@ INCLUDES_NEEDED["include"] = []
 INCLUDES_NEEDED["forward"] = []
 INCLUDES_NEEDED["npcs"] = {}
 INCLUDES_NEEDED["sprites"] = set()
+INCLUDES_NEEDED["tattle"] = []
+
+def get_flag_name(arg):
+    v = arg - 2**32 # convert to s32
+    if v > -250000000:
+        if v <= -220000000: return str((v + 230000000) / 1024)
+        elif v <= -200000000: return f"SI_ARRAY_FLAG({v + 210000000})"
+        elif v <= -180000000: return f"SI_ARRAY({v + 190000000})"
+        elif v <= -160000000:
+            if v + 170000000 == 0:
+                return "STORY_PROGRESS"
+            elif v + 170000000 == 425:
+                return "WORLD_LOCATION"
+            else:
+                return f"SI_SAVE_VAR({v + 170000000})"
+        elif v <= -140000000: return f"SI_AREA_VAR({v + 150000000})"
+        elif v <= -120000000: return f"SI_SAVE_FLAG({v + 130000000})"
+        elif v <= -100000000: return f"SI_AREA_FLAG({v + 110000000})"
+        elif v <= -80000000: return f"SI_MAP_FLAG({v + 90000000})"
+        elif v <= -60000000: return f"SI_FLAG({v + 70000000})"
+        elif v <= -40000000: return f"SI_MAP_VAR({v + 50000000})"
+        elif v <= -20000000: return f"SI_VAR({v + 30000000})"
+
+    if arg == 0xFFFFFFFF:
+        return "-1"
+    elif (arg & 0xFF000000) == 0x80000000:
+        return f"0x{arg:X}"
+    elif arg >= 0x80000000:
+        return f"{arg - 0x100000000}"
+    else:
+        return f"{arg}"
 
 def get_function_list(area_name, map_name, rom_offset):
     map_file = (Path(__file__).parent.parent / "ver" / "current" / "build" / "papermario.map").read_text().splitlines()
@@ -29,7 +60,7 @@ def get_function_list(area_name, map_name, rom_offset):
     firstFind = False
     functions = {}
     while i < len(map_file):
-        if map_file[i].startswith(f" ver/us/build/src/world/area_{area_name}/{map_name}/"):
+        if map_file[i].startswith(f".{map_name}"):
             firstFind = True
             i += 1
             while not map_file[i].startswith(" .data"):
@@ -95,6 +126,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
 
     INDENT = f"    "
     afterHeader = False
+    treePrint = False
 
     while len(midx) > 0:
         struct = midx.pop(0)
@@ -129,6 +161,15 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
                 bytes.seek(pos)
                 script_text = disasm_script.ScriptDisassembler(bytes, name, symbol_map, romstart, INCLUDES_NEEDED, INCLUDED).disassemble()
 
+            if "shakeTree" in name or "searchBush" in name:
+                symbol_map[struct["vaddr"]][0][1] = name.split("_",1)[0] + ")"
+                if not treePrint:
+                    out += f"=======================================\n"
+                    out += f"==========BELOW foliage.inc.c==========\n"
+                    out += f"=======================================\n\n"
+                    treePrint = True
+                continue
+
             if try_replace and "exitWalk" in name:
                 script_text = script_text.splitlines()
                 walkDistance = exitIdx = map_ = entryIdx = ""
@@ -147,9 +188,26 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
         elif struct["type"] == "EntryList":
             entry_list_name = name
             out += f"EntryList {name} = {{"
-            for i in range(0, struct["length"], 4 * 4):
-                x,y,z,yaw = unpack(">ffff", bytes.read(4 * 4))
-                out += f"\n    {{ {x}f, {y}f, {z}f, {yaw}f }},"
+            entry_list = bytes.read(struct["length"])
+            entry_count = len(entry_list) // 16
+            pos = 0
+            x = []
+            y = []
+            z = []
+            w = []
+            for _ in range(entry_count):
+                a,b,c,d = unpack_from(">ffff", entry_list, pos)
+                x.append(f"{a:.01f}"); y.append(f"{b:.01f}"); z.append(f"{c:.01f}"); w.append(f"{d:.01f}")
+                pos += 16
+
+            x_size = max([len(a) for a in x])
+            y_size = max([len(a) for a in y])
+            z_size = max([len(a) for a in z])
+            w_size = max([len(a) for a in w])
+
+            for a,b,c,d in zip(x,y,z,w):
+                out += f"\n    {{ {a:>{x_size}}f, {b:>{y_size}}f, {c:>{z_size}}f, {d:>{w_size}}f }},"
+
             out += f"\n}};\n"
         elif struct["type"] == "NpcSettings":
             tmp_out = f"NpcSettings {name} = {{\n"
@@ -161,7 +219,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
                     var_names = ["unk_00", "unk_24"]
                     data = unpack_from(">4B", npcSettings, i)
                     if not sum(data) == 0:
-                        tmp_out += INDENT + f".{var_names[0] if i == 0 else var_names[1]} = {{ " + ", ".join(f"{x:02X}" for x in unk_00) + f" }},\n"
+                        tmp_out += INDENT + f".{var_names[0] if i == 0 else var_names[1]} = {{ " + ", ".join(f"0x{x:02X}" for x in data) + f" }},\n"
                 elif i == 0x4 or i == 0x28:
                     var_names = ["height", "radius", "level", "unk_2A"]
                     for x,var in enumerate(unpack_from(">2h", npcSettings, i)):
@@ -245,7 +303,11 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
                         addr = unpack_from(f">I", staticNpc, curr_base+i)[0]
                         if not addr == 0:
                             if var_name != "flags" and addr in symbol_map:
-                                tmp_out += INDENT + f".{var_name} = &{symbol_map[addr][0][1]},\n"
+                                if var_name == "extraAnimations":
+                                    tmp_out += INDENT + f".{var_name} = {symbol_map[addr][0][1]},\n"
+                                else:
+                                    tmp_out += INDENT + f".{var_name} = &{symbol_map[addr][0][1]},\n"
+
                                 if symbol_map[addr][0][1] not in INCLUDED["functions"]:
                                     INCLUDES_NEEDED["forward"].append(symbol_map[addr][0][1])
                             else:
@@ -425,6 +487,155 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
             for item in items:
                 out += f"    {disasm_script.CONSTANTS['ItemIDs'][item]},\n"
             out += f"}};\n"
+        elif struct["type"] == "TreeDropList":
+            new_name = "N(" + name.split('_',1)[1][:-1].lower() + "_Drops)"
+            symbol_map[struct["vaddr"]][0][1] = new_name
+            
+            out += f"FoliageDropList {new_name} = {{\n"
+
+            data = bytes.read(struct["length"])
+            count = unpack_from(">I", data, 0)[0]
+
+            out += f"{INDENT}.count = {count},\n"
+
+            if count > 0:
+                out += f"{INDENT}.drops = {{\n"
+
+            pos = 4
+            for _ in range(count):
+                entry = list(unpack_from(">7I", data, pos))
+                pos += 7*4
+
+                entry[1] = entry[1] - 0x100000000 if entry[1] >= 0x80000000 else entry[1]
+                entry[2] = entry[2] - 0x100000000 if entry[2] >= 0x80000000 else entry[2]
+                entry[3] = entry[3] - 0x100000000 if entry[3] >= 0x80000000 else entry[3]
+
+                flag1 = get_flag_name(entry[5])
+                flag2 = get_flag_name(entry[6])
+
+                out += f"{INDENT * 2}{{\n"
+                out += f"{INDENT * 3}.itemID = {disasm_script.CONSTANTS['ItemIDs'][entry[0]]},\n"
+                out += f"{INDENT * 3}.pos = {{ {entry[1]}, {entry[2]}, {entry[3]} }},\n"
+                if entry[4] != 0:
+                    out += f"{INDENT * 3}.spawnMode = 0x{entry[4]:X},\n"
+                if flag1 != '0':
+                    out += f"{INDENT * 3}.pickupFlag = {flag1},\n"
+                if flag2 != '0':
+                    out += f"{INDENT * 3}.spawnFlag = {flag2},\n"
+                out += f"{INDENT * 2}}},\n"
+
+            if count > 0:
+                out += f"{INDENT}}}\n"
+
+            out += f"}};\n"
+
+        elif struct["type"] == "TreeModelList" or struct["type"] == "TreeEffectVectors":
+            isModelList = struct["type"] == "TreeModelList"
+
+            name_parts = name.split('_')
+            if isModelList:
+                new_name = "N(" + name_parts[1].lower() + "_" + name_parts[2]
+            else:
+                new_name = "N(" + name_parts[1][:-1].lower() + "_Vectors)"
+            symbol_map[struct["vaddr"]][0][1] = new_name
+
+            if isModelList:
+                out += f"FoliageModelList {new_name} = {{\n"
+            else:
+                out += f"TreeEffectVectors {new_name} = {{\n"
+
+            data = bytes.read(struct["length"])
+            count = unpack_from(">I", data, 0)[0]
+
+            out += f"{INDENT}.count = {count},\n"
+
+            if isModelList:
+                if count > 0:
+                    out += f"{INDENT}.models = {{ "
+                
+                pos = 4
+                for _ in range(count):
+                    entry = unpack_from(">I", data, pos)[0]
+                    pos += 4
+
+                    out += f"{entry}, "
+
+                if count > 0:
+                    out = out[:-2]
+                    out += f" }}\n"
+
+            else:
+                if count > 0:
+                    out += f"{INDENT}.vectors = {{\n"
+                
+                pos = 4
+                for _ in range(count):
+                    entry = list(unpack_from(">3I", data, pos))
+
+                    entry[0] = entry[0] - 0x100000000 if entry[0] >= 0x80000000 else entry[0]
+                    entry[1] = entry[1] - 0x100000000 if entry[1] >= 0x80000000 else entry[1]
+                    entry[2] = entry[2] - 0x100000000 if entry[2] >= 0x80000000 else entry[2]
+                    
+                    pos += 3*4
+
+                    out += f"{INDENT * 2}{{ {entry[0]}, {entry[1]}, {entry[2]} }},\n"
+
+                if count > 0:
+                    out += f"{INDENT}}}\n"
+
+            out += f"}};\n"
+
+        elif struct["type"] == "SearchBushEvent":
+            new_name = "N(" + name.split('_',1)[1].lower()
+            symbol_map[struct["vaddr"]][0][1] = new_name
+
+            num = int(new_name.split("bush",1)[1][:-1])
+            out += f"SearchBushConfig {new_name} = {{\n"
+
+            data = bytes.read(struct["length"])
+            entry = unpack_from(">4I", data, 0)
+
+            if entry[0] != 0:
+                out += f"{INDENT}.bush = &N(bush{num}_Bush),\n"
+            if entry[1] != 0:
+                out += f"{INDENT}.drops = &N(bush{num}_Drops),\n"
+            if entry[2] != 0:
+                out += f"{INDENT}.vectors = &N(bush{num}_Vectors),\n"
+            if entry[3] != 0:
+                out += f"{INDENT}.callback = &N(bush{num}_Callback),\n"
+
+            out += f"}};\n"
+
+        elif struct["type"] == "ShakeTreeEvent":
+            new_name = "N(" + name.split('_',1)[1].lower()
+            symbol_map[struct["vaddr"]][0][1] = new_name
+            
+            num = int(new_name.split("tree",1)[1][:-1])
+            out += f"ShakeTreeConfig {new_name} = {{\n"
+
+            data = bytes.read(struct["length"])
+            entry = unpack_from(">5I", data, 0)
+
+            if entry[0] != 0:
+                out += f"{INDENT}.leaves = &N(tree{num}_Leaves),\n"
+            if entry[1] != 0:
+                out += f"{INDENT}.trunk = &N(tree{num}_Trunk),\n"
+            if entry[2] != 0:
+                out += f"{INDENT}.drops = &N(tree{num}_Drops),\n"
+            if entry[3] != 0:
+                out += f"{INDENT}.vectors = &N(tree{num}_Vectors),\n"
+            if entry[4] != 0:
+                out += f"{INDENT}.callback = &N(tree{num}_Callback),\n"
+
+            out += f"}};\n"
+
+        elif struct["type"] == "TriggerCoord":
+            out += f"Vec4f {name} = {{"
+
+            data = bytes.read(struct["length"])
+            entry = unpack_from(">4f", data, 0)
+
+            out += f" {entry[0]:.01f}f, {entry[1]:.01f}f, {entry[2]:.01f}f, {entry[3]:.01f}f }};\n"
 
         elif struct["type"] == "Header":
             out += f"MapConfig N(config) = {{\n"
@@ -443,7 +654,9 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
                 out += f"    .background = &gBackgroundImage,\n"
             elif bg != 0:
                 raise Exception(f"unknown MapConfig background {bg:X}")
-            out += f"    .tattle = {{ 0x{tattle:X} }},\n"
+            #out += f"    .tattle = 0x{tattle:X},\n"
+            INCLUDES_NEEDED["tattle"].append(f"- [0x{(tattle & 0xFF0000) >> 16:02X}, 0x{tattle & 0xFFFF:04X}, {map_name}_tattle]")
+            out += f"    .tattle = {{ MSG_{map_name}_tattle }},\n"
 
             out += f"}};\n"
             afterHeader = True
@@ -467,6 +680,18 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0):
                 out += f" {word:.01f}f,"
 
             out += f"\n}};\n"
+        elif struct["type"] == "VectorList":
+            data = bytes.read(struct["length"])
+            if len(data) > 0:
+                out += f"Vec3f {name}[] = {{\n"
+                out += f"\t"
+            for i,pos in enumerate(range(0, len(data), 0xC)):
+                x, y, z = unpack_from(">fff", data, pos)
+                out += f" {{ {x:.01f}, {y:.01f}, {z:.01f} }},"
+                if (i+1) % 2 == 0:
+                    out += f"\n\t"
+            out += f"\n}};\n"
+
         elif struct["type"] == "Formation":
             out += f"Formation {struct['name']} = {{\n"
 
@@ -919,10 +1144,12 @@ if __name__ == "__main__":
         print()
 
         if INCLUDES_NEEDED["forward"]:
-            print()
             print("========== Forward declares: ==========\n")
             for forward in sorted(INCLUDES_NEEDED["forward"]):
-                print(forward)
+                if not (forward.startswith("ApiStatus") or forward.startswith("void")):
+                    print("extern " + forward)
+                else:
+                    print(forward)
             print()
 
         if INCLUDES_NEEDED["npcs"]:
@@ -935,6 +1162,9 @@ if __name__ == "__main__":
             print(f"}};")
             print()
 
+        [print(x) for x in INCLUDES_NEEDED["tattle"]]
+        print()
+
         print("=======================================\n")
         print(disasm.rstrip())
 
diff --git a/tools/substitute2.py b/tools/substitute2.py
index 2821eecc1d..8ca17584bf 100644
--- a/tools/substitute2.py
+++ b/tools/substitute2.py
@@ -1,14 +1,22 @@
 from pathlib import Path
 
-FUNC="""    script->varTable[0] = 0;
-    if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) {
-        script->varTable[0] = 1;
-    }
+RUN_ME = False
+if not RUN_ME:
+    print(f"Are you sure yo uwant to run this? Edit RUN_ME in the script if so")
+    exit()
+    
+FUNC="""    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    return ApiStatus_DONE2;
+    npc->duration--;
+    if (npc->duration <= 0) {
+        enemy->varTable[2] = 0;
+        npc->duration = 0;
+        script->functionTemp[0].s = 0;
+    }
 }""".splitlines()
 
-NEW_FUNC_NAME = f"UnkFunc24"
+NEW_FUNC_NAME = f"UnkFunc45"
 NEW_INCLUDE = f"#include \"world/common/{NEW_FUNC_NAME}.inc.c\""
 
 RENAMED = []
@@ -26,11 +34,25 @@ def parse_folder(path):
 
         i = 0
         while i < len(fd):
-            if (i+2 < len(fd) and 
-                fd[i].startswith("INCLUDE_ASM") and
-                fd[i+1] == "/*"):
+            if (#i+2 < len(fd) and 
+                fd[i].startswith("INCLUDE_ASM") or 
+                fd[i].startswith("ApiStatus N(") or
+                fd[i].startswith("void N(")):
+                #and fd[i+1] == "/*"):
+                if fd[i].startswith("INCLUDE_ASM"):
+                    base_fd = i+3
+                    base_name = i+2
+                elif fd[i].startswith("ApiStatus N(") or fd[i].startswith("void N("):
+                    base_fd = i+1
+                    base_name = i
 
-                for func, test in zip(fd[i+3:], FUNC):
+                if len(fd[base_fd:]) < len(FUNC):
+                    i += 1
+                    continue
+
+                #print(f"Starting from {fd[base_fd]}")
+
+                for func, test in zip(fd[base_fd:], FUNC):
                     if func != test:
                         break
                 else:
@@ -40,9 +62,9 @@ def parse_folder(path):
 
                     include_path = Path("src/world/common/") / (NEW_FUNC_NAME + ".inc.c")
                     if not include_path.is_file():
-                        name_start = fd[i+2].find("N(")
-                        name_end = fd[i+2].find("(",name_start+2)
-                        new_file_name = fd[i+2][:name_start] + "N(" + NEW_FUNC_NAME + ")" + fd[i+2][name_end:]
+                        name_start = fd[base_name].find("N(")
+                        name_end = fd[base_name].find("(",name_start+2)
+                        new_file_name = fd[base_name][:name_start] + "N(" + NEW_FUNC_NAME + ")" + fd[base_name][name_end:]
                         
                         new_fd = ["#include \"common.h\"",
                                   "#include \"map.h\"",
@@ -52,25 +74,35 @@ def parse_folder(path):
                         new_fd.extend(FUNC)
                         include_path.write_text("\n".join(new_fd))
 
-                    old_func_name = fd[i].split(",")[2].strip().replace(");", "")
+                    if fd[i].startswith("INCLUDE_ASM"):
+                        old_func_name = fd[i].split(",")[2].strip().replace(");", "")
+                    else:
+                        old_func_name = fd[i].split("N(",1)[1].split(")",1)[0]
+
                     RENAMED.append({"name":old_func_name, "area":area_name})
 
-                    fd = fd[:i] + [NEW_INCLUDE] + fd[i+3+len(FUNC)+1:]
+                    fd = fd[:i] + [NEW_INCLUDE] + fd[base_fd+len(FUNC)+1:]
+
+                    if i+1 < len(fd) and fd[i+1] != "":
+                        fd = fd[:i+1] + [""] + fd[i+1:]
 
                     if fd[-1] != "":
                         fd.append("")
 
+                    #print("\n".join(fd))
+
                     entry.write_text("\n".join(fd))
+
                     break
 
             i += 1
 
 parse_folder(Path("src/world"))
 
-def do_renames(path):
+def do_renames_asm(path):
     for entry in path.iterdir():
         if entry.is_dir():
-            do_renames(entry)
+            do_renames_asm(entry)
             continue
 
         fd = entry.read_text()
@@ -78,4 +110,27 @@ def do_renames(path):
             if rename["name"] in fd:
                 fd = fd.replace(rename["name"], f"{rename['area']}_{NEW_FUNC_NAME}")
                 entry.write_text(fd)
-do_renames(Path("ver/us/asm"))
+do_renames_asm(Path("ver/us/asm"))
+
+def do_renames_src(path):
+    for entry in path.iterdir():
+        if entry.is_dir():
+            do_renames_src(entry)
+            continue
+
+        fd = entry.read_text().splitlines()
+        i = 0
+        renamed = False
+        while i < len(fd):
+            for rename in RENAMED:
+                start = fd[i].find(rename["name"])
+                if start > -1:
+                    renamed = True
+                    if fd[i][start-1] == "(":
+                        fd[i] = fd[i].replace(rename["name"], f"{NEW_FUNC_NAME}")
+                    else:
+                        fd[i] = fd[i].replace(rename["name"], f"N({NEW_FUNC_NAME})")
+            i += 1
+        if renamed:
+            entry.write_text("\n".join(fd))
+do_renames_src(Path("src/world"))
diff --git a/ver/jp/asm/nonmatchings/19EB0/func_80041024.s b/ver/jp/asm/nonmatchings/19EB0/func_80041024.s
index 8758497f42..f56bd317f5 100644
--- a/ver/jp/asm/nonmatchings/19EB0/func_80041024.s
+++ b/ver/jp/asm/nonmatchings/19EB0/func_80041024.s
@@ -40,8 +40,8 @@ glabel func_80041024
 /* 1C4A8 800410A8 AEA50094 */  sw        $a1, 0x94($s5)
 /* 1C4AC 800410AC AEA50098 */  sw        $a1, 0x98($s5)
 /* 1C4B0 800410B0 A2A20008 */  sb        $v0, 8($s5)
-/* 1C4B4 800410B4 3C01800A */  lui       $at, %hi(D_8009A634)
-/* 1C4B8 800410B8 A020A634 */  sb        $zero, %lo(D_8009A634)($at)
+/* 1C4B4 800410B4 3C01800A */  lui       $at, %hi(gCurrentCamID)
+/* 1C4B8 800410B8 A020A634 */  sb        $zero, %lo(gCurrentCamID)($at)
 /* 1C4BC 800410BC 3C018007 */  lui       $at, %hi(D_80077C10)
 /* 1C4C0 800410C0 AC207C10 */  sw        $zero, %lo(D_80077C10)($at)
 /* 1C4C4 800410C4 0C0B117A */  jal       func_802C45E8
@@ -241,8 +241,8 @@ glabel func_80041024
 /* 1C784 80041384 0C053FEA */  jal       func_8014FFA8
 /* 1C788 80041388 00000000 */   nop
 /* 1C78C 8004138C 24020001 */  addiu     $v0, $zero, 1
-/* 1C790 80041390 3C01800A */  lui       $at, %hi(D_8009A634)
-/* 1C794 80041394 A022A634 */  sb        $v0, %lo(D_8009A634)($at)
+/* 1C790 80041390 3C01800A */  lui       $at, %hi(gCurrentCamID)
+/* 1C794 80041394 A022A634 */  sb        $v0, %lo(gCurrentCamID)($at)
 /* 1C798 80041398 2402000A */  addiu     $v0, $zero, 0xa
 /* 1C79C 8004139C AEA2009C */  sw        $v0, 0x9c($s5)
 /* 1C7A0 800413A0 24020001 */  addiu     $v0, $zero, 1
diff --git a/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s b/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s
index 7689d50b78..d93bad5b67 100644
--- a/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s
+++ b/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s
@@ -109,8 +109,8 @@ glabel func_80041BD0
 /* 1D154 80041D54 A2C000A4 */  sb        $zero, 0xa4($s6)
 /* 1D158 80041D58 A2C000A8 */  sb        $zero, 0xa8($s6)
 /* 1D15C 80041D5C A2C000AC */  sb        $zero, 0xac($s6)
-/* 1D160 80041D60 3C02800A */  lui       $v0, %hi(D_8009A634)
-/* 1D164 80041D64 8042A634 */  lb        $v0, %lo(D_8009A634)($v0)
+/* 1D160 80041D60 3C02800A */  lui       $v0, %hi(gCurrentCamID)
+/* 1D164 80041D64 8042A634 */  lb        $v0, %lo(gCurrentCamID)($v0)
 /* 1D168 80041D68 24110001 */  addiu     $s1, $zero, 1
 /* 1D16C 80041D6C A6C000A2 */  sh        $zero, 0xa2($s6)
 /* 1D170 80041D70 A6C000A6 */  sh        $zero, 0xa6($s6)
diff --git a/ver/jp/undefined_syms_auto.txt b/ver/jp/undefined_syms_auto.txt
index 7f66229a32..63d4f0fff1 100644
--- a/ver/jp/undefined_syms_auto.txt
+++ b/ver/jp/undefined_syms_auto.txt
@@ -321,7 +321,7 @@ D_80098618 = 0x80098618;
 D_80098650 = 0x80098650;
 D_8010F459 = 0x8010F459;
 D_80098658 = 0x80098658;
-D_8009A634 = 0x8009A634;
+gCurrentCamID = 0x8009A634;
 D_80077C10 = 0x80077C10;
 D_8009A648 = 0x8009A648;
 D_8009A650 = 0x8009A650;
diff --git a/ver/us/asm/data/16A3E0.data.s b/ver/us/asm/data/16A3E0.data.s
index 0113dfdf1c..5c099c8d3b 100644
--- a/ver/us/asm/data/16A3E0.data.s
+++ b/ver/us/asm/data/16A3E0.data.s
@@ -141,7 +141,7 @@ glabel D_80249DCC
 .word D_8024BA60, 0x18000000, 0x00000120, 0x00C00000, func_802440BC, 0x00000000, 0x2C000000, 0x00000001, 0x00000000, D_8024BA98, 0x17000000, 0x00000140, 0x00F00000, func_80244030, 0x00000000, 0xFF000000, 0x00000001, 0x00000000, D_8024BA98, 0x00000000, 0x00000000
 
 glabel D_80249E20
-.word 0x802423DC, func_80242434_9D9454, 0x8024248C, 0x802424E4, D_8024253C_AB46AC, 0x80242594, dgb_16_npcGroup_802425EC, 0x80242408, 0x80242460, 0x802424B8, D_80242510_D95450, D_80242568_A4EF88, 0x802425C0, D_80242618_9800E8, 0x802422D4, 0x80242300, mac_02_SetCamVfov, func_80242358_DCF028, func_80242384_833B84, D_802423B0_9EDBA0
+.word 0x802423DC, func_80242434_9D9454, 0x8024248C, 0x802424E4, D_8024253C_AB46AC, 0x80242594, dgb_16_npcGroup_802425EC, 0x80242408, flo_14_updateTexturePan_80242460, 0x802424B8, D_80242510_D95450, D_80242568_A4EF88, 0x802425C0, D_80242618_9800E8, 0x802422D4, 0x80242300, mac_02_SetCamVfov, func_80242358_DCF028, func_80242384_833B84, D_802423B0_9EDBA0
 
 glabel D_80249E70
 .word 0x00000102, 0x02030405, 0x06000001, 0x02020306, 0x06060000, 0x01020203, 0x06060600, 0x00010202, 0x03060606, 0x00000102, 0x02030606, 0x06000000
diff --git a/ver/us/asm/data/pause/1422A0.data.s b/ver/us/asm/data/pause/1422A0.data.s
index b0d0594943..85a531efee 100644
--- a/ver/us/asm/data/pause/1422A0.data.s
+++ b/ver/us/asm/data/pause/1422A0.data.s
@@ -135,10 +135,10 @@ glabel D_8024F314
 .word 0x00000000, 0x00060100, D_8024F1C8, pause_tabs_init, pause_tabs_handle_input, pause_tabs_update, pause_tabs_cleanup
 
 glabel D_8024F330
-.word arn_03_802429D4, 0x8024286C, 0x8024290C, D_80108558, D_801086AC, dgb_18_idle_80242A24, 0x802429FC, D_80108518, func_80242AD4_825D94, 0x802429AC, D_801083D8, 0x80242B24
+.word arn_03_802429D4, flo_00_npcAISettings_8024286C, 0x8024290C, D_80108558, D_801086AC, dgb_18_idle_80242A24, 0x802429FC, D_80108518, func_80242AD4_825D94, 0x802429AC, D_801083D8, 0x80242B24
 
 glabel D_8024F360
-.word 0x8024286C, mac_05_UnkYawFunc, 0x802428BC, 0x802428E4
+.word flo_00_npcAISettings_8024286C, mac_05_UnkYawFunc, flo_00_npcSettings_802428BC, 0x802428E4
 
 glabel D_8024F370
 .word 0x8024290C, func_80242934_C63644, func_8024295C_8B29CC, 0x80242984
diff --git a/ver/us/asm/data/world/area_dgb/dgb_02/C30650.data.s b/ver/us/asm/data/world/area_dgb/dgb_02/C30650.data.s
new file mode 100644
index 0000000000..ac546ccc1d
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_02/C30650.data.s
@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80241AB0_C30650
+.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024061C_C2F1BC, 0x80241B9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241BCC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_802410D4_C2FC74, 0x80241C68, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241C98, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_02_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80241D34, 0x00000000, 0x00000000, D_80241AB0_C30650, 0x00000000, 0x00000000, 0x000D0008, 0x0000000A, 0x80241C3C, 0xC3480000, 0x00000000, 0x43340000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF38, 0x00000000, 0x000000B4, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF38, 0x00000000, 0x000000AF, 0x000000FA, 0x0000005A, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80241B6C, 0x00000000, 0x0000000B, 0x80241DDC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80241B94, 0x00000000, 0x0000001E, 0x80241D08, 0x43BB8000, 0x00000000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000177, 0x00000000, 0x00000064, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000140, 0x00000000, 0x000000AF, 0x000000FA, 0x0000005A, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x80241DDC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80241B94, 0x00000000, 0x00000002, 0x80241E08, 0x0F020001, 0x00000002, 0x802421E8, 0x0F010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_03/C345C0.data.s b/ver/us/asm/data/world/area_dgb/dgb_03/C345C0.data.s
new file mode 100644
index 0000000000..0cdda91d89
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_03/C345C0.data.s
@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_802430E0_C345C0
+.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, dgb_03_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, dgb_03_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001B, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000033, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405F94, 0x00000000, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000030, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001B, 0x00000046, 0x00000001, D_802430E0_C345C0, 0x00000003, 0x00000001, 0x0000005A, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF8405F95, 0x00000000, 0x00000024, 0x00000002, 0xF8405F94, 0x00000001, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405F94, 0x00000000, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFD0, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, D_802430E0_C345C0, 0x00000003, 0x00000001, 0x0000005A, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF8405F95, 0x00000001, 0x00000024, 0x00000002, 0xF8405F94, 0x00000001, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000033, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000033, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000033, 0x0000000A, 0x00000002, 0xF8405F94, 0x00000000, 0x00000047, 0x00000005, 0x80243470, 0x00000040, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024353C, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F95, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFD0, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000033, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_03/C34E50.data.s b/ver/us/asm/data/world/area_dgb/dgb_03/C34E50.data.s
new file mode 100644
index 0000000000..7e017b401e
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_03/C34E50.data.s
@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80243970_C34E50
+.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024086C_C31D4C, 0x80243A5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80243A8C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3FC00000, 0x00000014, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_802419B0_C32E90, 0x80243B28, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80243B58, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80242480_C33960, 0x80243BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80243C24, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_03_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80243CC0, 0x00000000, 0x00000000, D_80243970_C34E50, 0x00000000, 0x00000000, 0x000D0008, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFEB6, 0x000000D2, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80243AFC, 0x43340000, 0x00000000, 0xC2F40000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000B4, 0x00000000, 0xFFFFFF86, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000163, 0x000000FF, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243D68, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80243A54, 0x00000000, 0x00000002, 0x80243BC8, 0xC3880000, 0x00000000, 0xC3070000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000002, 0xFFFFFEF0, 0x00000000, 0xFFFFFF79, 0xFFFFFF55, 0x00000000, 0xFFFFFF79, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x0000004B, 0x00000163, 0x000000FF, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80243D68, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80243A54, 0x00000000, 0x00000004, 0x80243C94, 0xC3A30000, 0x43520000, 0x42A00000, 0x00000C00, 0x80243D94, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFEBA, 0x000000D2, 0x00000050, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000163, 0x000000FF, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80243D68, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80243A54, 0x00000000, 0x00000002, 0x80243DE8, 0x0F010002, 0x00000002, 0x802441C8, 0x0F010002, 0x00000002, 0x802445A8, 0x0F030001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s b/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s
new file mode 100644
index 0000000000..0082c29a01
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s
@@ -0,0 +1,21 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80243560_C39A90
+.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80242154_C38684, 0x802435B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x802444D8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80243578, 0x00000000, 0x802435E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x80243AFC, 0x428C0000, 0xC35C0000, 0x433A0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0xFFFFFF24, 0x000000BA, 0x0000000F, 0x00000028, 0xFFFF8001, 0x00000001, 0x00000050, 0xFFFFFF24, 0x000000AA, 0x00000050, 0x00000096, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243B28, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+
+glabel D_80243D30_C3A260
+.word 0x001D00F0, 0x001D00F1
+
+glabel D_80243D38_C3A268
+.word 0x00010002, 0x00030004, 0x00090006, 0x00070008
+
+glabel D_80243D48_C3A278
+.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF
+
+glabel D_80243D88_C3A2B8
+.word 0x430C0000, 0x43340000, 0x435C0000, 
+
+
+0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, dgb_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024240C_C3893C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, dgb_04_UnkFunc22, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802429D0_C38F00, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F96, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dgb_04_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dgb_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, dgb_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, dgb_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024259C_C38ACC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802427EC_C38D1C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D94, 0x00000043, 0x00000003, dgb_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F96, 0x00000001, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, dgb_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000001F4, 0xFFFFFE98, 0x0000006E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F96, 0x00000043, 0x00000002, AssignScript, 0x80243EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_05/C3C2D0.data.s b/ver/us/asm/data/world/area_dgb/dgb_05/C3C2D0.data.s
new file mode 100644
index 0000000000..60679f262e
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_05/C3C2D0.data.s
@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_802418C0_C3C2D0
+.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80240E80_C3B890, 0x802419AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802419DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80241A78, 0x00000000, 0x00000000, D_802418C0_C3C2D0, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x80241A4C, 0x43040000, 0xC2DC0000, 0x436E0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000084, 0xFFFFFF92, 0x000000EE, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000145, 0x00000000, 0x000000B9, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802419A4, 0x00000000, 0x00000003, 0x80241A4C, 0x43FB8000, 0xC3520000, 0x43610000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000001F7, 0xFFFFFF2E, 0x000000E1, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001F7, 0xFFFFFF2E, 0x00000122, 0x000000C8, 0x00000096, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802419A4, 0x00000000, 0x00000002, 0x80241B4C, 0x0F010003, 0x00000002, 0x80241F2C, 0x0F020003, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_07/C3F3E0.data.s b/ver/us/asm/data/world/area_dgb/dgb_07/C3F3E0.data.s
new file mode 100644
index 0000000000..253c320930
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_07/C3F3E0.data.s
@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_802417F0_C3F3E0
+.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80240E20_C3EA10, 0x802418DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x8024190C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x802419A8, 0x00000000, 0x00000000, D_802417F0_C3F3E0, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x8024197C, 0xC3FA0000, 0x00000000, 0xC3700000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFE0C, 0x00000000, 0xFFFFFF10, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE0C, 0x00000000, 0xFFFFFF10, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x802418AC, 0x00000000, 0x00000001, 0x80241A50, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418D4, 0x00000000, 0x00000002, 0x80241A7C, 0x0F010003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s b/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s
new file mode 100644
index 0000000000..91234f6f67
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s
@@ -0,0 +1,9 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80244100_C43EB0
+.word 0x40900000, 0x00000000, 0x00000000, 0x432A0000, 0x42B40000, 0x00000001, 0x4079999A, 0x000000B4, 0x00000002, 0x432A0000, 0x42B40000, 0x00000001, 0x00000043, 0x00000002, func_80240B94_C40944, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x80244130, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_802414AC_C4125C, 0x802442C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802442F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x8024438C, 0x00000000, 0x00000000, 0x802441D4, 0x00000000, 0x00000000, 0x000D0008
+
+glabel D_80244460_C44210
+.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_802438F0_C436A0, 0x802444B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80246E20, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80244478, 0x00000000, 0x802444E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFE5, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C7, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x006A000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFD67, 0x000000D2, 0x000000B4, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDEE, 0x000000B4, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C8, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE0C, 0x00000050, 0x0000000A, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244D7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80243B98_C43948, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243C10_C439C0, 0x00000044, 0x00000001, 0x80244D08, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_80240B94_C40944, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dgb_08_UnkFunc1, 0x00000043, 0x00000003, GotoMap, 0x80246E28, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE4, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFE6, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80244E58, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244A54, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x000000D2, 0x00000050, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0x8024417C, 0x00000000, 0xC47A0000, 0x00000000, 0x00A40004, 0x80244E94, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x0000000A, 0xFFFFFE70, 0x000000D2, 0x00000050, 0xFFFFFF9C, 0x000000D2, 0x00000050, 0x00000064, 0x000000D2, 0x00000050, 0x00000190, 0x000000D2, 0x00000050, 0x00000334, 0x00000064, 0x00000050, 0x00000334, 0x00000064, 0x00000104, 0x00000190, 0x00000000, 0x00000104, 0x00000064, 0x00000000, 0x000000C8, 0xFFFFFF9C, 0x00000000, 0x000000AF, 0xFFFFFE3E, 0x00000000, 0x000000AF, 0xFFFF8001, 0x00000096, 0x00000000, 0x000000AF, 0x000005AA, 0x000000C8, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0007, 0x006A000A, 0x006A000D, 0x006A000D, 0x006A0019, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000002, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000003, 0x80244360, 0x435C0000, 0x00000000, 0x431B0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000DC, 0x00000000, 0x0000009B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000DC, 0x00000000, 0x0000009B, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000004, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000005, 0x80244360, 0x444E4000, 0x42C80000, 0x43480000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000339, 0x00000064, 0x000000C8, 0x00000019, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000339, 0x00000064, 0x000000C8, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x80244290, 0x00000000, 0x00000006, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000007, 0x802449FC, 0x42960000, 0x439B0000, 0x42AA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000136, 0x00000055, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000004B, 0x00000000, 0x00000055, 0x000000FA, 0x00000037, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x802449FC, 0xC3E18000, 0x439B0000, 0x42A20000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFE3D, 0x00000136, 0x00000051, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFECA, 0x00000000, 0x000000AF, 0x000000FA, 0x00000091, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002F1, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00390005, 0x00390002, 0x00000000, 0x000E00F2, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000024, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80246310, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246210, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x80244A28, 0x43D50000, 0x00000000, 0x42180000, 0x00600D01, 0x802464C4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x001A00B6, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246718, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000401, 0x80246728, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000001, 0x80246768, 0x0F020003, 0x00000002, 0x80245290, 0x0F020003, 0x00000002, 0x80245670, 0x0F020003, 0x00000002, 0x80245A50, 0x0F030003, 0x00000001, 0x80245E30, 0x00000000, 0x00000001, 0x80246020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802450A0, 0x0F040001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80246528, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_09/C4ABE0.data.s b/ver/us/asm/data/world/area_dgb/dgb_09/C4ABE0.data.s
new file mode 100644
index 0000000000..67ac8be86f
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_09/C4ABE0.data.s
@@ -0,0 +1,9 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80244000_C4ABE0
+.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024061C_C471FC, 0x802440EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x8024411C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_802410D4_C47CB4, 0x802441B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802441E8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_09_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80244284, 0x00000000, 0x00000000, D_80244000_C4ABE0, 0x00000000, 0x00000000, 0x000D0008
+
+glabel D_80244358_C4AF38
+.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80243578_C4A158, 0x802443AC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x802457A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80244370, 0x00000000, 0x802443DC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x8024418C, 0xC3AF0000, 0x00000000, 0x43340000, 0x00000D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFEA2, 0x00000000, 0x000000B4, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000258, 0x000000FA, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x802440BC, 0x00000000, 0x00000001, 0x8024432C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802440E4, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000F0, 0x00000000, 0x00000058, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x80244258, 0x439B0000, 0x00000000, 0x42B00000, 0x00000D00, 0x80244D00, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000136, 0x00000000, 0x00000058, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000258, 0x000000FA, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x802440BC, 0x00000000, 0x00000003, 0x8024432C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802440E4, 0x00000000, 0x00000004, 0x802448F4, 0xC1A00000, 0x42C80000, 0x43340000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFEC, 0x00000064, 0x000000B4, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFEC, 0x00000064, 0x000000B4, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80244920, 0x0F030001, 0x00000002, 0x80244D6C, 0x0F010001, 0x00000001, 0x8024514C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_15/C513B0.data.s b/ver/us/asm/data/world/area_dgb/dgb_15/C513B0.data.s
new file mode 100644
index 0000000000..7816514360
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_15/C513B0.data.s
@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_80241EA0_C513B0
+.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024061C_C4FB2C, 0x80241F8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241FBC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_15_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80242058, 0x00000000, 0x00000000, D_80241EA0_C513B0, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000D0000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000096, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF8405FAB, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFB82, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x000000B4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF5DE024B, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000058, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006A0009, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFCB, 0x000000B4, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A0006, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x006A0010, 0x006A0006, 0x00000000, 0x000E00F3, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x8024274C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00010002, 0x00000043, 0x00000006, GetDist2D, 0xFE363C8A, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000018, 0x00000001, 0x000000C8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A80E7, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7DB4, 0x00000057, 0x00000000, 0x00000018, 0x00000001, 0x0000012C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7CE7, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000057, 0x00000000, 0x0000001B, 0x00000001, 0x0000012C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7AE7, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7AB4, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000012, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40400000, 0x0000001E, 0x0000001E, 0x43160000, 0x42A00000, 0x00000001, 0x40600000, 0x000000B4, 0x00000002, 0x43200000, 0x42A00000, 0x00000001, 0x00000044, 0x00000001, 0x80242184, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006A000C, 0x00000044, 0x00000001, 0x802424E8, 0x00000043, 0x00000002, func_80241464_C50974, 0x8024271C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dgb_15_UnkFunc1, 0x00000043, 0x00000003, GotoMap, 0x80243028, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFE0, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x0000000B, 0x00000002, 0xF5DE024B, 0x0000000F, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80242238, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFECA, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024274C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802427B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x8024212C, 0x00000000, 0xC47A0000, 0x00000000, 0x00A40900, 0x802427EC, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000007, 0xFFFFFE0C, 0x00000000, 0x000000C8, 0xFFFFFD44, 0x00000000, 0x000000C8, 0xFFFFFC7C, 0x00000000, 0x000000C8, 0xFFFFFC18, 0x00000000, 0x000000C8, 0xFFFFFCE0, 0x00000000, 0x000000C8, 0xFFFFFDA8, 0x00000000, 0x000000C8, 0xFFFFFE70, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFE0C, 0x00000000, 0x000000C8, 0x000003E8, 0x000000FA, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0006, 0x006A0009, 0x006A000C, 0x006A000C, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802428C0, 0x0F040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dgb/dgb_16/C53D00.data.s b/ver/us/asm/data/world/area_dgb/dgb_16/C53D00.data.s
new file mode 100644
index 0000000000..2cb3bb0100
--- /dev/null
+++ b/ver/us/asm/data/world/area_dgb/dgb_16/C53D00.data.s
@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_802417C0_C53D00
+.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80240E20_C53360, 0x802418AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802418DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_16_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80241978, 0x00000000, 0x00000000, D_802417C0_C53D00, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x8024194C, 0xC28C0000, 0x00000000, 0xC2C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFFBA, 0x00000000, 0xFFFFFF9C, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x8024187C, 0x00000000, 0x00000001, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000005, 0x8024194C, 0x00000000, 0x00000000, 0xC36B0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000000, 0x00000000, 0xFFFFFF15, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x0000000A, 0x8024194C, 0x428C0000, 0x00000000, 0xC2C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000046, 0x00000000, 0xFFFFFF9C, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x0000000F, 0x8024194C, 0x430C0000, 0x00000000, 0xC36B0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x0000008C, 0x00000000, 0xFFFFFF15, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000014, 0x8024194C, 0x43520000, 0x00000000, 0xC2C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000D2, 0x00000000, 0xFFFFFF9C, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000015, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000019, 0x8024194C, 0x438C0000, 0x00000000, 0xC36B0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000118, 0x00000000, 0xFFFFFF15, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001A, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000002, 0x80241A4C, 0x0F030003, 0x00000002, 0x80241E2C, 0x0F000003, 0x00000002, 0x8024220C, 0x0F000003, 0x00000002, 0x802425EC, 0x0F000003, 0x00000002, 0x802429CC, 0x0F010003, 0x00000002, 0x80242DAC, 0x0F010003, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_dro/dro_02/9780D0.rodata.s b/ver/us/asm/data/world/area_dro/dro_02/9780D0.rodata.s
index 69810d2b9f..d5ec18ca96 100644
--- a/ver/us/asm/data/world/area_dro/dro_02/9780D0.rodata.s
+++ b/ver/us/asm/data/world/area_dro/dro_02/9780D0.rodata.s
@@ -5,20 +5,5 @@
 glabel D_8024EF10_9780D0
 .word 0x64726F5F, 0x30310000, 0x73626B5F, 0x30320000
 
-glabel jtbl_8024EF20_9780E0
-.word L80242458_96B618, L8024252C_96B6EC, L802425CC_96B78C, L802425F4_96B7B4, L80242660_96B820, L802426F4_96B8B4, L802427C4_96B984, L802428A8_96BA68, L80242978_96BB38, L802429D0_96BB90, L80242A54_96BC14, L80242A80_96BC40, L80242C2C_96BDEC, L80242E94_96C054
 
-glabel D_8024EF58_978118
-.double 0.1
 
-glabel D_8024EF60_978120
-.double 0.1
-
-glabel D_8024EF68_978128
-.double 0.01
-
-glabel D_8024EF70_978130
-.double 0.4
-
-glabel D_8024EF78_978138
-.double 0.05
diff --git a/ver/us/asm/data/world/area_end/end_01/E0C0C0.data.s b/ver/us/asm/data/world/area_end/end_01/E0C0C0.data.s
index f49a9a33f4..53f3966877 100644
--- a/ver/us/asm/data/world/area_end/end_01/E0C0C0.data.s
+++ b/ver/us/asm/data/world/area_end/end_01/E0C0C0.data.s
@@ -12,7 +12,7 @@ glabel D_80246EAC_E0C20C
 .word 0x00000038, 0x0000003A, 0x0000003B, 0x0000003C, 0x0000003D, 0x0000003E, 0x0000003F, 0x0000FFFF
 
 glabel D_80246ECC_E0C22C
-.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFA6, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000045, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_80242CF0_E08050, 0x00000000, D_80246EAC_E0C20C, 0x00000003, 0x00000043, 0x0000000B, func_80242E14_E08174, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000078, 0x00000078, 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x0000000B, func_80242E14_E08174, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFA6, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000045, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, end_01_UnkFunc27, 0x00000000, D_80246EAC_E0C20C, 0x00000003, 0x00000043, 0x0000000B, end_01_UnkFunc26, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000078, 0x00000078, 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x0000000B, end_01_UnkFunc26, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247098_E0C3F8
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x00E7000D, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x00E7000E, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_flo/flo_09/CB9190.rodata.s b/ver/us/asm/data/world/area_flo/flo_09/CB9190.rodata.s
index 38b99d6660..8392518e8c 100644
--- a/ver/us/asm/data/world/area_flo/flo_09/CB9190.rodata.s
+++ b/ver/us/asm/data/world/area_flo/flo_09/CB9190.rodata.s
@@ -8,11 +8,5 @@ glabel D_80244190_CB9190
 glabel D_802441A0_CB91A0
 .double 32767.0
 
-glabel D_802441A8_CB91A8
-.double 0.09
-
-glabel D_802441B0_CB91B0
-.double 0.09
-
 glabel jtbl_802441B8_CB91B8
 .word L80241738_CB6738, L80241748_CB6748, L80241760_CB6760, L80241770_CB6770, L802417F0_CB67F0, L802417F0_CB67F0, L802417F0_CB67F0, L802417F0_CB67F0, L802417F0_CB67F0, L802417F0_CB67F0, L80241788_CB6788, L80241798_CB6798, L802417B0_CB67B0, L802417C8_CB67C8, L802417E0_CB67E0, 0, 0, 0
diff --git a/ver/us/asm/data/world/area_flo/flo_13/CCB230.rodata.s b/ver/us/asm/data/world/area_flo/flo_13/CCB230.rodata.s
index 92286c82fe..572c5b53e9 100644
--- a/ver/us/asm/data/world/area_flo/flo_13/CCB230.rodata.s
+++ b/ver/us/asm/data/world/area_flo/flo_13/CCB230.rodata.s
@@ -8,11 +8,5 @@ glabel D_80247A20_CCB230
 glabel D_80247A30_CCB240
 .double 32767.0
 
-glabel D_80247A38_CCB248
-.double 0.09
-
-glabel D_80247A40_CCB250
-.double 0.09
-
 glabel jtbl_80247A48_CCB258
 .word L802415DC_CC4DEC, L802415EC_CC4DFC, L80241604_CC4E14, L80241614_CC4E24, L80241694_CC4EA4, L80241694_CC4EA4, L80241694_CC4EA4, L80241694_CC4EA4, L80241694_CC4EA4, L80241694_CC4EA4, L8024162C_CC4E3C, L8024163C_CC4E4C, L80241654_CC4E64, L8024166C_CC4E7C, L80241684_CC4E94, 0
diff --git a/ver/us/asm/data/world/area_flo/flo_14/CD0280.data.s b/ver/us/asm/data/world/area_flo/flo_14/CD0280.data.s
index a825eb52d2..64754d11d7 100644
--- a/ver/us/asm/data/world/area_flo/flo_14/CD0280.data.s
+++ b/ver/us/asm/data/world/area_flo/flo_14/CD0280.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 glabel D_80244F70_CD0280
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242360_CCD670, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000044, 0x00000001, D_80244F70_CD0280, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80244F70_CD0280, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, flo_14_func_80242360_CCD670, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000044, 0x00000001, D_80244F70_CD0280, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80244F70_CD0280, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_flo/flo_14/CD0620.rodata.s b/ver/us/asm/data/world/area_flo/flo_14/CD0620.rodata.s
index 38cff24676..7c2862fa7c 100644
--- a/ver/us/asm/data/world/area_flo/flo_14/CD0620.rodata.s
+++ b/ver/us/asm/data/world/area_flo/flo_14/CD0620.rodata.s
@@ -5,12 +5,6 @@
 glabel D_80245310_CD0620
 .word 0x666C6F5F, 0x30300000, 0x666C6F5F, 0x31330000
 
-glabel D_80245320_CD0630
-.double 0.04
-
-glabel D_80245328_CD0638
-.double 0.98
-
 glabel D_80245330_CD0640
 .double 3.141592
 
@@ -26,11 +20,9 @@ glabel D_80245348_CD0658
 glabel D_80245350_CD0660
 .double 32767.0
 
-glabel D_80245358_CD0668
-.double 0.09
 
-glabel D_80245360_CD0670
-.double 0.09
+
+
 
 glabel jtbl_80245368_CD0678
 .word L80241F28_CCD238, L80241F38_CCD248, L80241F50_CCD260, L80241F60_CCD270, L80241FE0_CCD2F0, L80241FE0_CCD2F0, L80241FE0_CCD2F0, L80241FE0_CCD2F0, L80241FE0_CCD2F0, L80241FE0_CCD2F0, L80241F78_CCD288, L80241F88_CCD298, L80241FA0_CCD2B0, L80241FB8_CCD2C8, L80241FD0_CCD2E0, 0, 0, 0
diff --git a/ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s b/ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s
index 259a96d419..09421d2959 100644
--- a/ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s
+++ b/ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s
@@ -2,5 +2,5 @@
 
 .section .data
 
-glabel D_80240000_CD06C0
-.word 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, D_80240000_CD06C0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011F, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+glabel D_802453B0_CD06C0
+.word 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, D_802453B0_CD06C0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011F, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_flo/flo_16/CD7210.rodata.s b/ver/us/asm/data/world/area_flo/flo_16/CD7210.rodata.s
index a88fa00ae8..6f237cd1d9 100644
--- a/ver/us/asm/data/world/area_flo/flo_16/CD7210.rodata.s
+++ b/ver/us/asm/data/world/area_flo/flo_16/CD7210.rodata.s
@@ -8,11 +8,5 @@ glabel D_802453E0_CD7210
 glabel D_802453F0_CD7220
 .double 32767.0
 
-glabel D_802453F8_CD7228
-.double 0.09
-
-glabel D_80245400_CD7230
-.double 0.09
-
 glabel jtbl_80245408_CD7238
 .word L80242268_CD4098, L80242278_CD40A8, L80242290_CD40C0, L802422A0_CD40D0, L80242320_CD4150, L80242320_CD4150, L80242320_CD4150, L80242320_CD4150, L80242320_CD4150, L80242320_CD4150, L802422B8_CD40E8, L802422C8_CD40F8, L802422E0_CD4110, L802422F8_CD4128, L80242310_CD4140, 0
diff --git a/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s b/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s
index 6769a7cc37..598833f355 100644
--- a/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s
+++ b/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80243FD0_CDB2B0
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_CD7320, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000026, 0x00000044, 0x00000001, D_80243FD0_CDB2B0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000024, 0x00000024, 0x00000002, 0xFE363C85, 0x00000013, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000044, 0x00000001, D_80243FD0_CDB2B0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000025, 0x00000024, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8E, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000028, 0x00000044, 0x00000001, D_80243FD0_CDB2B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
+.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, flo_17_D_80240040_CD7320, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000026, 0x00000044, 0x00000001, D_80243FD0_CDB2B0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000024, 0x00000024, 0x00000002, 0xFE363C85, 0x00000013, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000044, 0x00000001, D_80243FD0_CDB2B0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000025, 0x00000024, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8E, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000028, 0x00000044, 0x00000001, D_80243FD0_CDB2B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
 glabel D_8024440C_CDB6EC
 .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0
diff --git a/ver/us/asm/data/world/area_flo/flo_17/CDC5D0.rodata.s b/ver/us/asm/data/world/area_flo/flo_17/CDC5D0.rodata.s
index f1e0990658..9feb7d90c6 100644
--- a/ver/us/asm/data/world/area_flo/flo_17/CDC5D0.rodata.s
+++ b/ver/us/asm/data/world/area_flo/flo_17/CDC5D0.rodata.s
@@ -8,11 +8,5 @@ glabel D_802452F0_CDC5D0
 glabel D_80245300_CDC5E0
 .double 32767.0
 
-glabel D_80245308_CDC5E8
-.double 0.09
-
-glabel D_80245310_CDC5F0
-.double 0.09
-
 glabel jtbl_80245318_CDC5F8
 .word L80241488_CD8768, L80241498_CD8778, L802414B0_CD8790, L802414C0_CD87A0, L80241540_CD8820, L80241540_CD8820, L80241540_CD8820, L80241540_CD8820, L80241540_CD8820, L80241540_CD8820, L802414D8_CD87B8, L802414E8_CD87C8, L80241500_CD87E0, L80241518_CD87F8, L80241530_CD8810, 0
diff --git a/ver/us/asm/data/world/area_flo/flo_25/CF7AA0.rodata.s b/ver/us/asm/data/world/area_flo/flo_25/CF7AA0.rodata.s
index b1524cafed..a68959c91d 100644
--- a/ver/us/asm/data/world/area_flo/flo_25/CF7AA0.rodata.s
+++ b/ver/us/asm/data/world/area_flo/flo_25/CF7AA0.rodata.s
@@ -8,11 +8,5 @@ glabel D_80244ED0_CF7AA0
 glabel D_80244EE0_CF7AB0
 .double 32767.0
 
-glabel D_80244EE8_CF7AB8
-.double 0.09
-
-glabel D_80244EF0_CF7AC0
-.double 0.09
-
 glabel jtbl_80244EF8_CF7AC8
 .word L80241458_CF4028, L80241468_CF4038, L80241480_CF4050, L80241490_CF4060, L80241510_CF40E0, L80241510_CF40E0, L80241510_CF40E0, L80241510_CF40E0, L80241510_CF40E0, L80241510_CF40E0, L802414A8_CF4078, L802414B8_CF4088, L802414D0_CF40A0, L802414E8_CF40B8, L80241500_CF40D0, 0
diff --git a/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s b/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s
index 96a0336e11..7f8330539c 100644
--- a/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s
+++ b/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_802407C0_E1EC20
-.word 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241748_E1FBA8, D_802407C0_E1EC20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, gv_01_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, gv_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_E1E494, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241030_E1F490, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241748_E1FBA8, D_802407C0_E1EC20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, gv_01_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, gv_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, gv_01_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241030_E1F490, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241030_E1F490
 .word 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, gv_01_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, gv_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, gv_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, gv_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s
index dbcb6b87c8..ec9f372e1c 100644
--- a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s
@@ -21,7 +21,7 @@ glabel D_80241540_A11DC0
 .word 0x00000047, 0x00000005, D_802413BC_A11C3C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000047, 0x00000005, D_80241418_A11C98, 0x00000080, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802415B0_A11E30
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000168, 0x00000043, 0x00000005, MakeLerp, 0x000001F4, 0x000000FA, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE2, 0xFE363C80, 0xFFFFFF60, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE2, 0xFE363C80, 0xFFFFFF56, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000168, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000003, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C82, 0x0000021C, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B4, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000014, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_80240AAC_A1132C, 0xFD050F8A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000061, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_80240768_A10FE8, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241418_A11C98, 0x00000080, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001B, 0x00000043, 0x00000002, SetSpriteShading, 0x00030000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFF96, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80241384_A11C04, 0x00000057, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244FC0, 0x00000046, 0x00000001, 0x80244FE0, 0x00000044, 0x00000001, D_80241D48_A125C8, 0x00000044, 0x00000001, D_8024121C_A11A9C, 0x00000044, 0x00000001, 0x80240E80, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241540_A11DC0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_802415B0_A11E30, 0x00000044, 0x00000001, D_80241540_A11DC0, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000044, 0x00000001, 0x80245050, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000168, 0x00000043, 0x00000005, MakeLerp, 0x000001F4, 0x000000FA, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE2, 0xFE363C80, 0xFFFFFF60, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE2, 0xFE363C80, 0xFFFFFF56, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000168, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000003, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C82, 0x0000021C, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B4, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000014, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_80240AAC_A1132C, 0xFD050F8A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000061, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000002, hos_01_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241418_A11C98, 0x00000080, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001B, 0x00000043, 0x00000002, SetSpriteShading, 0x00030000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFF96, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80241384_A11C04, 0x00000057, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244FC0, 0x00000046, 0x00000001, 0x80244FE0, 0x00000044, 0x00000001, D_80241D48_A125C8, 0x00000044, 0x00000001, D_8024121C_A11A9C, 0x00000044, 0x00000001, 0x80240E80, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241540_A11DC0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_802415B0_A11E30, 0x00000044, 0x00000001, D_80241540_A11DC0, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000044, 0x00000001, 0x80245050, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241B90_A12410
 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_01/A158D0.data.s b/ver/us/asm/data/world/area_hos/hos_01/A158D0.data.s
index c151193261..757ad0b6ff 100644
--- a/ver/us/asm/data/world/area_hos/hos_01/A158D0.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_01/A158D0.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 glabel D_80245050_A158D0
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240DEC_A1166C, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000004, func_802D2884, 0xFFFFFFE2, 0xFFFFFF60, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000A005C, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000A005D, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002B, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x000000F5, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x000000F5, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000258, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x0000000F, PlayEffect, 0x00000075, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000001, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C8F, 0x00000043, 0x00000002, func_80240AAC_A1132C, 0xFD050F8A, 0x00000043, 0x00000005, MakeLerp, 0x00000001, 0x000000FF, 0x00000037, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240B64_A113E4, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000A005E, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000061, 0x00000000, 0x00000008, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240B10_A11390, 0xFD050F8A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE2, 0xFFFFFF60, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002B, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF56, 0x0000000F, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000005, MakeLerp, 0x00000001, 0x0000005A, 0x0000003C, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, hos_01_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000001AE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFF6, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x000002BC, 0x0000005A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C80, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, hos_01_dup_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000004, func_802D2884, 0xFFFFFFE2, 0xFFFFFF60, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000A005C, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000A005D, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002B, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x000000F5, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x000000F5, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000258, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x0000000F, PlayEffect, 0x00000075, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000001, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C8F, 0x00000043, 0x00000002, func_80240AAC_A1132C, 0xFD050F8A, 0x00000043, 0x00000005, MakeLerp, 0x00000001, 0x000000FF, 0x00000037, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240B64_A113E4, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000A005E, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000061, 0x00000000, 0x00000008, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240B10_A11390, 0xFD050F8A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE2, 0xFFFFFF60, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002B, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF56, 0x0000000F, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000005, MakeLerp, 0x00000001, 0x0000005A, 0x0000003C, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, hos_01_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000001AE, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFF6, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x000002BC, 0x0000005A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C80, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_03/A1E790.data.s b/ver/us/asm/data/world/area_hos/hos_03/A1E790.data.s
index e3b705f646..750aaf275a 100644
--- a/ver/us/asm/data/world/area_hos/hos_03/A1E790.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_03/A1E790.data.s
@@ -12,4 +12,4 @@ glabel D_80243748_A1E848
 .word 0x00000047, 0x00000005, D_80243690_A1E790, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802436EC_A1E7EC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243790_A1E890
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240000_A1B100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000C, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000000D, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000001B, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x00000014, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000001C, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000000E, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000083, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000005E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, func_80240000_A1B100, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000083, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000005E, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001D, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005B, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406348, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024BAE4, 0x00000046, 0x00000001, 0x8024BD00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80243748_A1E848, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243748_A1E848, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243BD8, 0x00000043, 0x00000002, func_802D6340, 0x00000006, 0x00000044, 0x00000001, 0x80243630, 0x00000043, 0x00000002, PlaySound, 0x80000063, 0x00000044, 0x00000001, 0x80244650, 0x00000044, 0x00000001, 0x8024BCBC, 0x00000044, 0x00000001, 0x802456C4, 0x00000044, 0x00000001, D_80243790_A1E890, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, hos_03_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000C, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000000D, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000001B, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x00000014, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000001C, 0x00000004, 0x00000001, 0x0000000A, 0x00000016, 0x00000001, 0x0000000E, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000083, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000005E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, hos_03_GetFloorCollider, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000083, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000005E, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001D, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000005A, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005B, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406348, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024BAE4, 0x00000046, 0x00000001, 0x8024BD00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80243748_A1E848, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243748_A1E848, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243BD8, 0x00000043, 0x00000002, func_802D6340, 0x00000006, 0x00000044, 0x00000001, 0x80243630, 0x00000043, 0x00000002, PlaySound, 0x80000063, 0x00000044, 0x00000001, 0x80244650, 0x00000044, 0x00000001, 0x8024BCBC, 0x00000044, 0x00000001, 0x802456C4, 0x00000044, 0x00000001, D_80243790_A1E890, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s
index 700c13a375..00f2770869 100644
--- a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s
@@ -138,7 +138,7 @@ glabel D_80247AA4_A22BA4
 .word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247B1C_A22C1C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, func_802423BC_A1D4BC, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024AAA0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80242368_A1D468, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, hos_03_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247B1C_A22C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x8024A7E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802421F0_A1D2F0, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247AA4_A22BA4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802421F0_A1D2F0, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, 0x8024AA1C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, hos_03_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, hos_03_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024AAA0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, hos_03_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, hos_03_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247B1C_A22C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x8024A7E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, hos_03_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247AA4_A22BA4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, hos_03_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, 0x8024AA1C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, hos_03_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024801C_A2311C
 .word 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
index 90c983b7dc..d764270679 100644
--- a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
@@ -51,10 +51,10 @@ glabel D_802496AC_A247AC
 .word 0x00000045, 0x00000002, D_802494E0_A245E0, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80249520_A24620, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024975C_A2485C
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, hos_03_Set80151310_1, 0x00000043, 0x00000001, hos_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802481C0_A232C0, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802488E8_A239E8, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242C14_A1DD14, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_8024895C_A23A5C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80243508_A1E608, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242B90_A1DC90, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242FAC_A1E0AC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802495FC_A246FC, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802496AC_A247AC, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242FC8_A1E0C8, 0x00000043, 0x00000001, func_80242E2C_A1DF2C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000044, 0x00000001, D_80248458_A23558, 0x00000043, 0x00000001, func_80242A1C_A1DB1C, 0x00000043, 0x00000001, hos_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, hos_03_Set80151310_1, 0x00000043, 0x00000001, hos_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802481C0_A232C0, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802488E8_A239E8, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242C14_A1DD14, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_8024895C_A23A5C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80243508_A1E608, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242B90_A1DC90, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242FAC_A1E0AC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802495FC_A246FC, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802496AC_A247AC, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242FC8_A1E0C8, 0x00000043, 0x00000001, func_80242E2C_A1DF2C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000044, 0x00000001, D_80248458_A23558, 0x00000043, 0x00000001, hos_03_UnkFunc29, 0x00000043, 0x00000001, hos_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A48C_A2558C
-.word 0x00000043, 0x00000001, func_802425E0_A1D6E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80242804_A1D904, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_802425E0_A1D6E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, hos_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A500_A25600
 .word 0x0000003C, 0x00000001, 0x8024BDD8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_8024975C_A2485C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -99,7 +99,7 @@ glabel D_8024A794_A25894
 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0x000A0063, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A7C4_A258C4
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A794_A25894, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x8024365C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, func_8024226C_A1D36C, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2517A80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250E280, 0xF24CD280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000019, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001BA, 0x0000008C, 0xF24A8680, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000CC, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80243630, 0x00000043, 0x00000003, func_8024226C_A1D36C, 0x00000000, 0x00000019, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x000001BD, 0x00000019, 0x000000B9, 0x00000043, 0x00000004, PlayerMoveTo, 0x000001B8, 0x000000D7, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000A0064, 0x00000024, 0x00000002, 0xFE363C88, 0x000A0065, 0x00000024, 0x00000002, 0xFE363C81, 0x000A0066, 0x00000024, 0x00000002, 0xFE363C82, 0x000A0067, 0x00000024, 0x00000002, 0xFE363C83, 0x000A0068, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A794_A25894, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x8024365C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, hos_03_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2517A80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250E280, 0xF24CD280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000019, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001BA, 0x0000008C, 0xF24A8680, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000CC, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80243630, 0x00000043, 0x00000003, hos_03_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x000001BD, 0x00000019, 0x000000B9, 0x00000043, 0x00000004, PlayerMoveTo, 0x000001B8, 0x000000D7, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000A0064, 0x00000024, 0x00000002, 0xFE363C88, 0x000A0065, 0x00000024, 0x00000002, 0xFE363C81, 0x000A0066, 0x00000024, 0x00000002, 0xFE363C82, 0x000A0067, 0x00000024, 0x00000002, 0xFE363C83, 0x000A0068, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024AB00_A25C00
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80247C74, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s b/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s
index 88470bc077..bd6176eb5e 100644
--- a/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s
@@ -24,7 +24,7 @@ glabel D_8024DED8_A38118
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000D, 0x0000008D, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000B, 0x0000008D, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005C, 0x00000044, 0x00000001, D_8024DED8_A38118, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFF92, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000384, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFAB, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_8024DCD4_A37F14, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024DFF0_A38230
-.word 0x00000008, 0x0000000B, 0x0000000C, 0x00000018, 0x00000072, 0x0000008B, 0x0000FFFF, 0x00000043, 0x00000003, EnableGroup, 0x0000006F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000008A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005C, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802C90FC, 0x00000093, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802C94A0, 0x00000000, func_8024564C_A2F88C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000001, 0x00000043, 0x00000002, func_8024569C_A2F8DC, 0x0000007F, 0x00000043, 0x00000003, EnableGroup, 0x00000090, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000079, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, pause_tabs_draw_badges_A2EF00, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, pause_tabs_draw_badges_A2EF00, 0x00000001, D_8024DFF0_A38230, 0x00000003, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x00000066, 0x00000066, 0x00000066, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024DED8_A38118, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000044, 0x00000001, D_8024DCD4_A37F14, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_8024DC30_A37E70, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000091, 0x00000009, 0x00000043, 0x00000006, PlaySoundAt, 0x000000A3, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000002, 0x00000000, 0x000000FA, 0x00000000, 0x0000000A, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802C90FC, 0x00000091, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802C94A0, 0x00000001, func_802456C8_A2F908, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000092, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000C8, 0x0000004B, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80245718_A2F958, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, func_802C90FC, 0x00000093, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802C94A0, 0x00000000, func_8024564C_A2F88C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000007F, 0x0000003C, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_8024569C_A2F8DC, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x000004A3, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x00000002, func_802D7B10, 0xFE363C89, 0x00000043, 0x00000003, EnableGroup, 0x00000090, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x00000000, 0x0000002D, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80245718_A2F958, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000092, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF92, 0x0000005A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFAB, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000008, 0x0000000B, 0x0000000C, 0x00000018, 0x00000072, 0x0000008B, 0x0000FFFF, 0x00000043, 0x00000003, EnableGroup, 0x0000006F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000008A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005C, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802C90FC, 0x00000093, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802C94A0, 0x00000000, func_8024564C_A2F88C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000001, 0x00000043, 0x00000002, func_8024569C_A2F8DC, 0x0000007F, 0x00000043, 0x00000003, EnableGroup, 0x00000090, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000079, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, dup_hos_05_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, dup_hos_05_UnkFunc27, 0x00000001, D_8024DFF0_A38230, 0x00000003, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x00000066, 0x00000066, 0x00000066, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024DED8_A38118, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000044, 0x00000001, D_8024DCD4_A37F14, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_8024DC30_A37E70, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000091, 0x00000009, 0x00000043, 0x00000006, PlaySoundAt, 0x000000A3, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000002, 0x00000000, 0x000000FA, 0x00000000, 0x0000000A, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802C90FC, 0x00000091, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802C94A0, 0x00000001, func_802456C8_A2F908, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000092, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000C8, 0x0000004B, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80245718_A2F958, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, func_802C90FC, 0x00000093, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802C94A0, 0x00000000, func_8024564C_A2F88C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000093, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000007F, 0x0000003C, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_8024569C_A2F8DC, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x000004A3, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x00000002, func_802D7B10, 0xFE363C89, 0x00000043, 0x00000003, EnableGroup, 0x00000090, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x00000000, 0x0000002D, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80245718_A2F958, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000092, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF92, 0x0000005A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFAB, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000008, func_802452C4_A2F504, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024E760_A389A0
 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000008D, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x0000000A, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000045, 0x00000002, D_8024E760_A389A0, 0xFE363C89, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x0000008D, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000043, 0x00000005, PlayerJump2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8080, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0188, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000C, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x0000002D, 0x000000A2, 0x00000019, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0x00000019, 0x000000A2, 0x0000002D, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000062, 0x00000001, 0x00000008, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000001, func_802457C0_A2FA00, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F8B, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005D, 0x00000043, 0x00000003, GotoMap, 0x8024F290, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024F288, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x000000B4, 0xFFFFFFFB, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000B4, 0xFFFFFFFB, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2531280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF249EE80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000045, 0x00000002, D_8024E760_A389A0, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEA2, 0xFFFFFFBA, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x0000017F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000002EE, 0xFFFFFFAB, 0x0000005A, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0x00000019, 0x000000A2, 0x0000002D, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x00000016, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x0000002D, 0x000000A2, 0x00000019, 0x0000000A, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000063, 0x00000000, 0x00000008, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s
index 37c6a8ae55..71ee9ea8c9 100644
--- a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s
+++ b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s
@@ -36,7 +36,7 @@ glabel D_80241164_989CC4
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_988B9C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_UnkFunc22, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_989160, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802412C8_989E28
-.word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_988C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_988F7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000001, isk_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, isk_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_988F7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, isk_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241748_98A2A8
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDBF, 0xFFFFFCF4, 0xFFFFFFB5, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDCF, 0xFFFFFDF8, 0x00000017, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_isk/isk_16/996C40.data.s b/ver/us/asm/data/world/area_isk/isk_16/996C40.data.s
index 01865285d3..17befbc0af 100644
--- a/ver/us/asm/data/world/area_isk/isk_16/996C40.data.s
+++ b/ver/us/asm/data/world/area_isk/isk_16/996C40.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80241A50_996C40
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, func_80240800_9959F0, 0x00000000, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, func_80240800_9959F0, 0x00000002, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_80240924_995B14, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000150, 0xFFFFFC72, 0x000001D3, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000117, 0xFFFFFC72, 0x00000208, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC7D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC72, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000000F3, 0xFE363C81, 0x00000217, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000002D, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000137, 0x000001E7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000157, 0x000001CC, 0x00000000, 0x00000046, 0x00000001, D_80241054_996244, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00E2, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000019A, 0xFFFFFAEC, 0x0000019A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000019A, 0xFFFFFC77, 0x0000019A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00680010, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x00000064, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFC, 0x00000043, 0x0000000B, func_80240924_995B14, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000B, func_80240924_995B14, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF252C280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000006E, 0x00000064, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7C62, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A76BE, 0x0000002E, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C85, 0xFE363C83, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001C9, 0xFFFFFCE0, 0x0000013C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003B, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003EF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000E, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000027, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000D, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000027, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000C, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001C9, 0xFFFFFAEC, 0x0000013C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001B6, 0xFFFFFCE0, 0x0000014C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A5C80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0068000B, 0x00680001, 0x00000000, 0x000D00E3, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, isk_16_UnkFunc27, 0x00000000, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, isk_16_UnkFunc27, 0x00000002, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, isk_16_UnkFunc26, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000150, 0xFFFFFC72, 0x000001D3, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000117, 0xFFFFFC72, 0x00000208, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC7D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC72, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000000F3, 0xFE363C81, 0x00000217, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000002D, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000137, 0x000001E7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000157, 0x000001CC, 0x00000000, 0x00000046, 0x00000001, D_80241054_996244, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00E2, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000019A, 0xFFFFFAEC, 0x0000019A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000019A, 0xFFFFFC77, 0x0000019A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00680010, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x00000064, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFC, 0x00000043, 0x0000000B, isk_16_UnkFunc26, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000B, isk_16_UnkFunc26, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF252C280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000006E, 0x00000064, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7C62, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A76BE, 0x0000002E, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C85, 0xFE363C83, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001C9, 0xFFFFFCE0, 0x0000013C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003B, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003EF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000E, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000027, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000D, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000027, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000C, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001C9, 0xFFFFFAEC, 0x0000013C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001B6, 0xFFFFFCE0, 0x0000014C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A5C80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0068000B, 0x00680001, 0x00000000, 0x000D00E3, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242424_997614
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00002061, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00E8, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680006, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020E3, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000001BA, 0xFFFFFC72, 0x00000189, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E2, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000001A0, 0xFFFFFC72, 0x000001A4, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E2, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000018B, 0xFFFFFC72, 0x000001B8, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001EA, 0xFFFFFC72, 0x00000147, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000000, 0x00000045, 0x00000002, D_80242424_997614, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000204, 0xFFFFFC72, 0x00000107, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001ED, 0x00000124, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680006, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E2, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0068000B, 0x00680001, 0x00000005, 0x000D00E9, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00690003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9A80, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x000001E6, 0xFFFFFC72, 0x00000154, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000130, 0x000001B2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001BC, 0x0000013C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001D9, 0x00000151, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000013E, 0x000001CC, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000103, 0x0000020A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFA24, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, GetDist2D, 0xFE363C86, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C86, 0x00000032, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080022, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000130, 0x000001B2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000001BC, 0x0000013C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000001D9, 0x00000151, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000013E, 0x000001CC, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000103, 0x0000020A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFA24, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00EA, 0x000000A0, 0x00000028, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF8405F06, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s
index 5e45f954f4..b552a50acf 100644
--- a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s
+++ b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s
@@ -18,7 +18,7 @@ glabel D_80245AC4_924034
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, iwa_10_UnkFunc21, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024032C_91E89C, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, iwa_10_UnkFunc22, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408F0_91EE60, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245C28_924198
-.word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240FF8_91F568, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240410_91E980, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024070C_91EC7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024070C_91EC7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802460A8_924618
 .word 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, D_802460A8_924618, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, D_80245C28_924198, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, D_80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s
index 3fa2c8c450..82760a378f 100644
--- a/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s
+++ b/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s
@@ -21,7 +21,7 @@ glabel D_80246E80_9253F0
 .word 0x00000036, 0x00000054, 0x00000040, 0x00000000
 
 glabel D_80246E90_925400
-.word 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE01FA, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E41, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E42, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E43, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xF24A7A80, 0xF24F2A80, 0xF24AC080, 0xF24A5280, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E80_9253F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000046, 0x00000001, D_802463B8_924928, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0012, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0015, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0017, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001C, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0013, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000027, 0x00000002, 0xF5DE01FA, 0x00000001, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0016, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040007, 0x00040001, 0x00000000, 0x000D0018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0019, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001A, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001D, 0x00000043, 0x00000003, func_80241030_91F5A0, 0x00000004, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80241510_91FA80, 0x00000044, 0x00000001, 0x8024187C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018C, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802418B0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x000D001E, 0x00000043, 0x00000002, AddKeyItem, 0x00000036, 0x00000043, 0x00000002, AddKeyItem, 0x00000054, 0x00000043, 0x00000002, AddKeyItem, 0x00000040, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE01FA, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E41, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E42, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E43, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xF24A7A80, 0xF24F2A80, 0xF24AC080, 0xF24A5280, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E80_9253F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000046, 0x00000001, D_802463B8_924928, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0012, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0015, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0017, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001C, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0013, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000027, 0x00000002, 0xF5DE01FA, 0x00000001, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0016, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040007, 0x00040001, 0x00000000, 0x000D0018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0019, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001A, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001D, 0x00000043, 0x00000003, iwa_10_UnkFunc41, 0x00000004, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80241510_91FA80, 0x00000044, 0x00000001, 0x8024187C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018C, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802418B0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x000D001E, 0x00000043, 0x00000002, AddKeyItem, 0x00000036, 0x00000043, 0x00000002, AddKeyItem, 0x00000054, 0x00000043, 0x00000002, AddKeyItem, 0x00000040, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802474F8_925A68
 .word 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFD62, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFE1B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF88, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
index 718032ab6f..938381deb4 100644
--- a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
@@ -75,10 +75,10 @@ glabel D_80244874_B30CE4
 .word 0x00000045, 0x00000002, D_802446A8_B30B18, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802446E8_B30B58, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244924_B30D94
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_02_Set80151310_1, 0x00000043, 0x00000001, jan_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80243388_B2F7F8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243AB0_B2FF20, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241D84_B2E1F4, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243B24_B2FF94, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242678_B2EAE8, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241D00_B2E170, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_8024211C_B2E58C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802447C4_B30C34, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244874_B30CE4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242138_B2E5A8, 0x00000043, 0x00000001, func_80241F9C_B2E40C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000044, 0x00000001, D_80243620_B2FA90, 0x00000043, 0x00000001, func_80241B8C_B2DFFC, 0x00000043, 0x00000001, jan_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_02_Set80151310_1, 0x00000043, 0x00000001, jan_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80243388_B2F7F8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243AB0_B2FF20, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241D84_B2E1F4, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243B24_B2FF94, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242678_B2EAE8, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241D00_B2E170, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_8024211C_B2E58C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802447C4_B30C34, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244874_B30CE4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242138_B2E5A8, 0x00000043, 0x00000001, func_80241F9C_B2E40C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000044, 0x00000001, D_80243620_B2FA90, 0x00000043, 0x00000001, jan_02_UnkFunc29, 0x00000043, 0x00000001, jan_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245654_B31AC4
-.word 0x00000043, 0x00000001, func_80241750_B2DBC0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80241974_B2DDE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_80241750_B2DBC0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802456C8_B31B38
 .word 0x0000003C, 0x00000001, 0x80248928, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80244924_B30D94, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s
index 0108da97f5..1e1a65420e 100644
--- a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s
@@ -9,7 +9,7 @@ glabel D_80243310_B37EE0
 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802433C0_B37F90
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_03_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_B34C04, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243BE0_B387B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_03_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_03_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243BE0_B387B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243BE0_B387B0
 .word 0x00000043, 0x00000001, jan_03_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_03_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_03_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
index 4e992b2249..4432c8b199 100644
--- a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
@@ -120,7 +120,7 @@ glabel D_80246F44_B3BB14
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024709C_B3BC6C
-.word 0x00000043, 0x00000004, func_802416C4_B36294, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024A6B8_B3F288, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80241670_B36240, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, jan_03_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246F44_B3BB14, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A718_B3F2E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802414F8_B360C8, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246ECC_B3BA9C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802414F8_B360C8, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024A9AC_B3F57C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, jan_03_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, jan_03_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024A6B8_B3F288, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, jan_03_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, jan_03_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246F44_B3BB14, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A718_B3F2E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246ECC_B3BA9C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024A9AC_B3F57C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, jan_03_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247444_B3C014
 .word 0x00000000
@@ -192,10 +192,10 @@ glabel D_80248DF4_B3D9C4
 .word 0x00000045, 0x00000002, D_80248C28_B3D7F8, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80248C68_B3D838, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248EA4_B3DA74
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_03_Set80151310_1, 0x00000043, 0x00000001, jan_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_80247908_B3C4D8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80248030_B3CC00, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024230C_B36EDC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802480A4_B3CC74, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242C00_B377D0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242288_B36E58, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802426A4_B37274, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248D44_B3D914, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248DF4_B3D9C4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802426C0_B37290, 0x00000043, 0x00000001, func_80242524_B370F4, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000044, 0x00000001, D_80247BA0_B3C770, 0x00000043, 0x00000001, func_80242114_B36CE4, 0x00000043, 0x00000001, jan_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_03_Set80151310_1, 0x00000043, 0x00000001, jan_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_80247908_B3C4D8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80248030_B3CC00, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024230C_B36EDC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802480A4_B3CC74, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242C00_B377D0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242288_B36E58, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802426A4_B37274, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248D44_B3D914, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248DF4_B3D9C4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802426C0_B37290, 0x00000043, 0x00000001, func_80242524_B370F4, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000044, 0x00000001, D_80247BA0_B3C770, 0x00000043, 0x00000001, jan_03_UnkFunc29, 0x00000043, 0x00000001, jan_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249BD4_B3E7A4
-.word 0x00000043, 0x00000001, func_80241CD8_B368A8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80241EFC_B36ACC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_80241CD8_B368A8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249C48_B3E818
 .word 0x0000003C, 0x00000001, D_8024FEE0_C0D760, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80248EA4_B3DA74, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -249,7 +249,7 @@ glabel D_8024A6B8_B3F288
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00100094, 0x00000024, 0x00000002, 0xFE363C88, 0x00100095, 0x00000024, 0x00000002, 0xFE363C81, 0x00100096, 0x00000024, 0x00000002, 0xFE363C82, 0x00100097, 0x00000024, 0x00000002, 0xFE363C83, 0x00100098, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A718_B3F2E8
-.word 0x00000044, 0x00000001, 0x80243394, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8880, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000142, 0xFFFFFF4E, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, func_80241574_B36144, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000036, 0xFFFFFFE5, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000087, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000196, 0xFFFFFF7E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000169, 0xFFFFFF42, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000169, 0xFFFFFF3E, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000172, 0xFFFFFEFF, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000051, 0x00000043, 0x00000003, func_80241574_B36144, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, 0x80243394, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8880, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000142, 0xFFFFFF4E, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, jan_03_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000036, 0xFFFFFFE5, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000087, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000196, 0xFFFFFF7E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000169, 0xFFFFFF42, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000169, 0xFFFFFF3E, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000172, 0xFFFFFEFF, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000051, 0x00000043, 0x00000003, jan_03_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A9AC_B3F57C
 .word 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000159, 0x00000000, 0xFFFFFF46, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000123, 0xFFFFFF9C, 0x00000000, 0x00000044, 0x00000001, D_80243310_B37EE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s
index 00a6b4a33d..173ce2a85b 100644
--- a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s
@@ -27,7 +27,7 @@ glabel D_802421DC_B4694C
 .word 0x41F00000, 0x00000000, 0xC2DC0000, 0x00000000
 
 glabel D_802421EC_B4695C
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xF8406049, 0x00000024, 0x00000002, 0xFE363C81, 0xF840604A, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80241FD8_B46748, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00100000, D_802421DC_B4694C, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241E58_B465C8, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000014, 0x0000012D, 0xF24ABE80, 0xF24A5E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A5, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A6, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A7, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, func_80240610_B44D80, 0x00000000, 0x00000007, 0x00000043, 0x00000001, func_802409E0_B45150, 0x00000044, 0x00000001, 0x80241244, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018F, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80241268, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000F, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xF8406049, 0x00000024, 0x00000002, 0xFE363C81, 0xF840604A, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80241FD8_B46748, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00100000, D_802421DC_B4694C, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241E58_B465C8, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000014, 0x0000012D, 0xF24ABE80, 0xF24A5E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A5, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A6, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A7, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, jan_04_UnkFunc41, 0x00000000, 0x00000007, 0x00000043, 0x00000001, func_802409E0_B45150, 0x00000044, 0x00000001, 0x80241244, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018F, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80241268, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000F, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242570_B46CE0
 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000A, 0x00000002, 0xF840604A, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000037, 0x00000096, 0xFFFFFFA1, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000005A, 0x0000008C, 0xFFFFFFAB, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFF6, 0x00000070, 0xFFFFFFB0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802421EC_B4695C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s
index fb75d4b9da..55c34e5fd6 100644
--- a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s
@@ -18,4 +18,4 @@ glabel D_80243E64_B62114
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_UnkFunc21, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024069C_B5E94C, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_UnkFunc22, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C60_B5EF10, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243FC8_B62278
-.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241368_B5F618, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_UnkFunc20, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240780_B5EA30, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A7C_B5ED2C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000001, jan_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_UnkFunc20, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A7C_B5ED2C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, jan_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s
index bbacb8765a..67d7f7317d 100644
--- a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s
@@ -9,7 +9,7 @@ glabel D_802419A0_B67450
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_09_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_09_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802420E4_B67B94
-.word 0x00000043, 0x00000001, func_80240034_B65AE4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802421C0_B67C70, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, jan_09_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802421C0_B67C70, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802421C0_B67C70
 .word 0x00000043, 0x00000001, jan_09_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_09_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_09_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_09_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s
index 15754f4c37..b7ed15793a 100644
--- a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80240890_B710F0
-.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_B70860, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_8024018C_B709EC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802410DC_B7193C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_B70860, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802410DC_B7193C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802410DC_B7193C
 .word 0x00000043, 0x00000001, jan_11_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_11_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s
index fa16c5aa4b..53259de75e 100644
--- a/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s
@@ -9,7 +9,7 @@ glabel D_8024207C_B728DC
 .word 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802420F4_B72954
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802407B0_B71010, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407DC_B7103C, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000055, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7E80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFE363C84, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097000B, 0x0097000A, 0x00000000, 0x001000AE, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970004, 0x00970001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000300, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000032, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406052, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80240850, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, jan_11_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407DC_B7103C, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000055, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7E80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFE363C84, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097000B, 0x0097000A, 0x00000000, 0x001000AE, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970004, 0x00970001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000300, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000032, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406052, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80240850, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242544_B72DA4
 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00970006, 0x00970006, 0x00000000, 0x001000AD, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s b/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s
index cc0bd333b1..2b8b4e3cd8 100644
--- a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s
@@ -30,7 +30,7 @@ glabel D_80240B3C_B80B3C
 .word 0x00000044, 0x00000001, D_802409F8_B809F8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000000, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0x00000258, 0x00000154, 0x00000043, 0x00000005, MakeLerp, 0x00000258, 0x00000082, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0xFE363C80, 0x00000154, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x0000014A, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000BE, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000166, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000023, 0x00000082, 0x0000014A, 0x0000000F, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFF6, 0x00000000, 0x0000018B, 0x00000014, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241074_B81074
-.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80242C50_B82C50, 0x00000046, 0x00000001, 0x80242C70, 0x00000044, 0x00000001, D_802412D4_B812D4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80240B3C_B80B3C, 0x00000044, 0x00000001, D_802407D4_B807D4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802407D4_B807D4, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802405D0_B805D0, 0x00000044, 0x00000001, 0x802436D4, 0x00000044, 0x00000001, D_80240838_B80838, 0x00000043, 0x00000004, func_80240000_B80000, 0x00000000, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, func_80240000_B80000, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x0000000B, func_80240124_B80124, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80242C50_B82C50, 0x00000046, 0x00000001, 0x80242C70, 0x00000044, 0x00000001, D_802412D4_B812D4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80240B3C_B80B3C, 0x00000044, 0x00000001, D_802407D4_B807D4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802407D4_B807D4, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802405D0_B805D0, 0x00000044, 0x00000001, 0x802436D4, 0x00000044, 0x00000001, D_80240838_B80838, 0x00000043, 0x00000004, jan_16_UnkFunc27, 0x00000000, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, jan_16_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x0000000B, jan_16_UnkFunc26, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241250_B81250
 .word 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A8080, 0xF24A8080, 0xF24A8080, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s
index 5471a4ee3c..431f3d4e7b 100644
--- a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s
+++ b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s
@@ -27,7 +27,7 @@ glabel D_802422C4_AF9C14
 .word 0x0000000B, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xF70F2E82, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242340_AF9C90
-.word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240BE4_AF8534, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005D, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005E, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000060, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000062, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000063, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000065, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000066, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x0000000A, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, func_80240BE4_AF8534, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E7, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C89, 0xF70F2E82, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C89, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C89, 0x00000000, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E9, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, func_80240BE4_AF8534, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000002, SwitchMessage, 0x001400EA, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E6, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, SwitchMessage, 0x001400E8, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005D, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005E, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000060, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000062, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000063, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000065, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000066, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x0000000A, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E7, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C89, 0xF70F2E82, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C89, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C89, 0x00000000, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E9, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000002, SwitchMessage, 0x001400EA, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E6, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, SwitchMessage, 0x001400E8, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242A18_AFA368
 .word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000001, func_802D6420, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802D6954, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, func_802D6954, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000005D, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000016, 0x00000001, 0x0000005F, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E84, 0x00000043, 0x00000007, MakeItemEntity, 0x00000163, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000065, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000016, 0x00000001, 0x00000062, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000014, 0x00000001, 0xF70F2E83, 0x00000016, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000060, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000061, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000061, 0x0000000A, 0x00000002, 0xF971888F, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000165, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015E, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000164, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000001, func_802D6954, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s
index 170010574b..c1bcf085e8 100644
--- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s
+++ b/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s
@@ -75,7 +75,7 @@ glabel D_80242D14_B00854
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242E6C_B009AC
-.word 0x00000043, 0x00000004, func_802404D4_AFE014, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024385C_B0139C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80240480_AFDFC0, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kkj_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024390C_B0144C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240308_AFDE48, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C9C_B007DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240308_AFDE48, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80243B94_B016D4, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kkj_20_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, kkj_20_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024385C_B0139C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kkj_20_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kkj_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024390C_B0144C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C9C_B007DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80243B94_B016D4, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kkj_20_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243214_B00D54
 .word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001CF, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -93,13 +93,13 @@ glabel D_8024385C_B0139C
 .word 0x0000000A, 0x00000002, 0xF8405D79, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00140187, 0x00000024, 0x00000002, 0xFE363C88, 0x00140188, 0x00000024, 0x00000002, 0xF8405D79, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00140189, 0x00000024, 0x00000002, 0xFE363C88, 0x0014018A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0014018B, 0x00000024, 0x00000002, 0xFE363C82, 0x0014018C, 0x00000024, 0x00000002, 0xFE363C83, 0x0014018D, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024390C_B0144C
-.word 0x00000044, 0x00000001, 0x8024066C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000032, 0xFFFFFFD8, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, func_80240384_AFDEC4, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B9280, 0xF24A0280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2466A80, 0xF24EB280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24AF280, 0xF2492680, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF249B280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005F, 0xFFFFFFA9, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000003, func_80240384_AFDEC4, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, 0x8024066C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000032, 0xFFFFFFD8, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kkj_20_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B9280, 0xF24A0280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2466A80, 0xF24EB280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24AF280, 0xF2492680, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF249B280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005F, 0xFFFFFFA9, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000003, kkj_20_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243B94_B016D4
 .word 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000055, 0x00000000, 0xFFFFFFAB, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000044, 0x00000001, 0x80240640, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243C24_B01764
-.word 0x00000043, 0x00000004, func_802404D4_AFE014, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024385C_B0139C, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80240480_AFDFC0, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kkj_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024390C_B0144C, 0xFE363C89, 0x00000043, 0x00000002, kkj_20_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240308_AFDE48, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C9C_B007DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240308_AFDE48, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80243B94_B016D4, 0xFE363C89, 0x00000043, 0x00000002, kkj_20_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kkj_20_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, kkj_20_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024385C_B0139C, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kkj_20_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kkj_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024390C_B0144C, 0xFE363C89, 0x00000043, 0x00000002, kkj_20_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C9C_B007DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80243B94_B016D4, 0xFE363C89, 0x00000043, 0x00000002, kkj_20_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kkj_20_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243FDC_B01B1C
 .word 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, D_80243214_B00D54, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFD8, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802432E4_B00E24, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000001E, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00830001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000050, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFFCE, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000005, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00140186, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000046, 0x00000001, D_80243C24_B01764, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s
index 9a1e05b2ee..5163f62529 100644
--- a/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s
+++ b/ver/us/asm/data/world/area_kkj/kkj_25/B0B310.data.s
@@ -72,7 +72,7 @@ glabel D_80245784_B0C184
 .word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, kkj_25_GetEntityPosition, 0xFD050F80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF3, 0x00000005, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_802400FC_B06AFC, 0xFD050F80, 0xFE363C87, 0xFE363C80, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, func_802400FC_B06AFC, 0xFD050F80, 0xFE363C87, 0xFFFFFFEC, 0xFE363C89, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00010000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800012, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00800013, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0080000E, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000001, 0xF24A8280, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x0000000B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000208B, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020A0, 0x00000000, 0x00000024, 0x00000002, 0xF971889A, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000016, 0x00000001, 0x00000007, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245AB0_B0C4B0
-.word 0x00000057, 0x00000054, 0x00000051, 0x0000004E, 0x0000004B, 0x00000048, 0x00000045, 0x00000042, 0x0000003F, 0x0000003C, 0x00000039, 0x00000036, 0x00000033, 0x00000030, 0x0000002D, 0x0000002A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240080_B06A80, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C85, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000019, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C81, 0xFE363C85, 0x0000000C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007D, 0x00000046, 0x00000001, D_80245784_B0C184, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AE280, 0xF24A3280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE20, 0xFFFFFE20, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000057, 0x00000054, 0x00000051, 0x0000004E, 0x0000004B, 0x00000048, 0x00000045, 0x00000042, 0x0000003F, 0x0000003C, 0x00000039, 0x00000036, 0x00000033, 0x00000030, 0x0000002D, 0x0000002A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kkj_25_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, WaitForPlayerTouchingFloor, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C85, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000019, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C81, 0xFE363C85, 0x0000000C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000015E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00800006, 0x00800002, 0x00000000, 0x0013007D, 0x00000046, 0x00000001, D_80245784_B0C184, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AE280, 0xF24A3280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE20, 0xFFFFFE20, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245F20_B0C920
 .word 0x00000030, 0x00000001, D_80245AB0_B0C4B0, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000005, 0x00000001, 0x00000010, 0x00000031, 0x00000001, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000008, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7C80, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24A7C80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s
index 4c0da75f9d..512a9d2bcd 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80243CA0_8B3D10
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_02_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, kmr_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_8B00A4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802444C0_8B4530, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_02_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, kmr_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_02_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802444C0_8B4530, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802444C0_8B4530
 .word 0x00000043, 0x00000001, kmr_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_02_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, kmr_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, kmr_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
index 408d94522b..6d4860b124 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
@@ -54,10 +54,10 @@ glabel D_80246C60_8B6CD0
 .word 0x00000045, 0x00000002, D_80246A94_8B6B04, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80246AD4_8B6B44, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246D10_8B6D80
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, kmr_02_Set80151310_1, 0x00000043, 0x00000001, kmr_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245774_8B57E4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245E9C_8B5F0C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240B00_8B0B70, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80245F10_8B5F80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802413F4_8B1464, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240A7C_8B0AEC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240E98_8B0F08, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246BB0_8B6C20, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246C60_8B6CD0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240EB4_8B0F24, 0x00000043, 0x00000001, func_80240D18_8B0D88, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000044, 0x00000001, D_80245A0C_8B5A7C, 0x00000043, 0x00000001, func_80240908_8B0978, 0x00000043, 0x00000001, kmr_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, kmr_02_Set80151310_1, 0x00000043, 0x00000001, kmr_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245774_8B57E4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245E9C_8B5F0C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240B00_8B0B70, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80245F10_8B5F80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802413F4_8B1464, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240A7C_8B0AEC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240E98_8B0F08, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246BB0_8B6C20, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246C60_8B6CD0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240EB4_8B0F24, 0x00000043, 0x00000001, func_80240D18_8B0D88, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000044, 0x00000001, D_80245A0C_8B5A7C, 0x00000043, 0x00000001, kmr_02_UnkFunc29, 0x00000043, 0x00000001, kmr_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247A40_8B7AB0
-.word 0x00000043, 0x00000001, func_802404CC_8B053C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_802406F0_8B0760, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_802404CC_8B053C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, kmr_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247AB4_8B7B24
 .word 0x0000003C, 0x00000001, 0x80257F30, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80246D10_8B6D80, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -210,7 +210,7 @@ glabel D_80249694_8B9704
 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002D, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002E, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002F, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_802427B0_8B2820, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF8405BDE, 0x00000001, 0x00000043, 0x00000001, func_802427CC_8B283C, 0x00000043, 0x00000001, func_802427EC_8B285C, 0x00000024, 0x00000002, 0xF8405BDE, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802497F4_8B9864
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B001D, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFED9, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000269, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001D2, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x000000A7, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000A9, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFFA1, 0x00000000, 0xFFFFFFAA, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFA4, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF93, 0xFFFFFFC3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF72, 0xFFFFFFA1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF12, 0xFFFFFFDF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFF58, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0xFFFFFFFC, 0x000B001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x00000002, 0x000B0020, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFB1, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEA, 0x00000000, 0x0000000C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFB1, 0xFFFFFFF6, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFFD3, 0x00000028, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000001E, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x000B0021, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF6D, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x0000000A, 0x00000002, 0xF8405B9E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2450280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0022, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, FindKeyItem, 0x00000056, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCE, 0xFFFFFFE8, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80248D28_8B8D98, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0x000B0024, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0010, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0025, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0026, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248DC8_8B8E38, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFFE2, 0x00000000, 0xFFFFFFED, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFAB, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0023, 0x00000024, 0x00000002, 0xF8405B9F, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0027, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8280, 0x00000028, 0xF2450280, 0xF24AB680, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000007F, 0x00000000, 0xFFFFFF63, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000020, 0xFFFFFF69, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B002B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC4, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000121, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000003, AddBadge, 0x00000121, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80249694_8B9704, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000001, func_80242734_8B27A4, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0031, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0032, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0033, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0034, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0035, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0036, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000002, 0x000B0037, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B0038, 0x00000043, 0x00000001, func_802439A0_8B3A10, 0x00000044, 0x00000001, 0x80243C0C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0189, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80243C30, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x00000002, 0x000B0039, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF71, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000050, 0xFFFFFF66, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000006F, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000001, func_80242788_8B27F8, 0x00000043, 0x00000001, func_80242710_8B2780, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_80241E90_8B1F00, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000073, 0x00000000, 0xFFFFFECB, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000B8, 0x00000000, 0xFFFFFF6B, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000064, 0x00000043, 0x00000002, RestartNpcAI, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8D, 0x00000048, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B001D, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFED9, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000269, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001D2, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x000000A7, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000A9, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFFA1, 0x00000000, 0xFFFFFFAA, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFA4, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF93, 0xFFFFFFC3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF72, 0xFFFFFFA1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF12, 0xFFFFFFDF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFF58, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0xFFFFFFFC, 0x000B001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x00000002, 0x000B0020, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFB1, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEA, 0x00000000, 0x0000000C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFB1, 0xFFFFFFF6, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFFD3, 0x00000028, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000001E, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x000B0021, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF6D, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x0000000A, 0x00000002, 0xF8405B9E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2450280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0022, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, FindKeyItem, 0x00000056, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCE, 0xFFFFFFE8, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80248D28_8B8D98, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0x000B0024, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0010, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0025, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0026, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248DC8_8B8E38, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFFE2, 0x00000000, 0xFFFFFFED, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFAB, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0023, 0x00000024, 0x00000002, 0xF8405B9F, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0027, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8280, 0x00000028, 0xF2450280, 0xF24AB680, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000007F, 0x00000000, 0xFFFFFF63, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000020, 0xFFFFFF69, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B002B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC4, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000121, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000003, AddBadge, 0x00000121, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80249694_8B9704, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000001, func_80242734_8B27A4, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0031, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0032, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0033, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0034, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0035, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0036, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000002, 0x000B0037, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B0038, 0x00000043, 0x00000001, func_802439A0_8B3A10, 0x00000044, 0x00000001, 0x80243C0C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0189, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80243C30, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x00000002, 0x000B0039, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF71, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000050, 0xFFFFFF66, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000006F, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000001, func_80242788_8B27F8, 0x00000043, 0x00000001, func_80242710_8B2780, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, kmr_02_UnkFunc41, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000073, 0x00000000, 0xFFFFFECB, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000B8, 0x00000000, 0xFFFFFF6B, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000064, 0x00000043, 0x00000002, RestartNpcAI, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8D, 0x00000048, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024B388_8BB3F8
 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -456,13 +456,13 @@ glabel D_8025410C_8C417C
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80254264_8C42D4
-.word 0x00000043, 0x00000004, func_80243284_8B32F4, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025460C_8C467C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80243230_8B32A0, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_02_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8025410C_8C417C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802546BC_8C472C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802430B8_8B3128, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80254094_8C4104, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802430B8_8B3128, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025492C_8C499C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kmr_02_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, kmr_02_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025460C_8C467C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_02_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_02_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8025410C_8C417C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802546BC_8C472C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_02_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80254094_8C4104, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_02_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025492C_8C499C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kmr_02_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8025460C_8C467C
 .word 0x0000000A, 0x00000002, 0xF8405BAA, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000B0013, 0x00000024, 0x00000002, 0xFE363C88, 0x000B0013, 0x00000024, 0x00000002, 0xF8405BAA, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000B0014, 0x00000024, 0x00000002, 0xFE363C88, 0x000B0015, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x000B0016, 0x00000024, 0x00000002, 0xFE363C82, 0x000B0017, 0x00000024, 0x00000002, 0xFE363C83, 0x000B0018, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802546BC_8C472C
-.word 0x00000044, 0x00000001, 0x80243C6C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, func_80243134_8B31A4, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF249C280, 0xF2459E80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24660E7, 0xF245681A, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF2C, 0xFFFFFE88, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF2C, 0x00000015, 0xFFFFFE88, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, func_80243134_8B31A4, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, 0x80243C6C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kmr_02_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF249C280, 0xF2459E80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24660E7, 0xF245681A, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF2C, 0xFFFFFE88, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF2C, 0x00000015, 0xFFFFFE88, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, kmr_02_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8025492C_8C499C
 .word 0x00000044, 0x00000001, 0x80243B74, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF49, 0x00000013, 0xFFFFFEAB, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF7C, 0xFFFFFEBB, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s
index 57a35822f6..3dead1320c 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s
@@ -63,4 +63,4 @@ glabel D_802558C4_8C5934
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x00000295, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8025590C_8C597C
-.word 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, func_802436FC_8B376C, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00A10001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetNpcAux, 0x00000007, D_8024D16C_8BD1DC, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000B0059, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600015, 0x00000056, 0x00000000, 0x00000045, 0x00000002, D_802558C4_8C5934, 0xFD050F84, 0x00000045, 0x00000002, D_8025590C_8C597C, 0xFD050F85, 0x00000043, 0x00000005, LoadPath, 0x00000028, D_802557EC_8C585C, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000A6, 0x000002F4, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000009F, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24C314D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000004C4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000005, LoadPath, 0x00000078, D_80255810_8C5880, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000008, 0xFFFFFFF6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000029, 0x000002D9, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000012C, 0x000000F5, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001B8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x000000DC, 0x00000000, 0x000000D5, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x000000FF, 0x00000000, 0x000000E8, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000BE, 0x00000000, 0x000000D4, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_8025584C_8C58BC, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFD050F84, 0x00000049, 0x00000001, 0xFD050F85, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x0000032B, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600010, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_80255870_8C58E0, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000007, 0xFFFFFFF6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000029, 0x000002D9, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000000DC, 0x000000D5, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000D, 0x009E0003, 0x00000005, 0x000B005B, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF22F6CE7, 0xF259B61A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B680, 0xF24ECEE7, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24B6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00005, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B61A, 0xF24E454D, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24AA280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, 0x80254AE0, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00080012, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000007, func_802D2520, 0x00080012, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080013, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00080013, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000007, func_802D2520, 0x00080013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7DB4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0011, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000100, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8080, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0003, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000003, 0x00000100, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00009, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00005, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF22F6CE7, 0xF259B61A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B680, 0xF24ECEE7, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24B6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005D, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000A6, 0x000002F4, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000009F, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24C314D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000004C4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600015, 0x00000045, 0x00000002, D_8025590C_8C597C, 0xFD050F85, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000045, 0x00000002, D_802558C4_8C5934, 0xFD050F84, 0x00000043, 0x00000005, LoadPath, 0x0000005A, D_80255894_8C5904, 0x00000004, 0x00000001, 0x00000003, 0x00000001, 0x00000046, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000046, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFD050F84, 0x00000049, 0x00000001, 0xFD050F85, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, 0x80243B74, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000A6, 0x00000000, 0x000000BC, 0x00000043, 0x00000004, SetPlayerPos, 0x000000E7, 0x00000000, 0x000000C4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0xF245CA80, 0xF24AAA80, 0xF24A5880, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00008, 0x00A00007, 0x00000000, 0x000B005F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0060, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0061, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0062, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF85, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000004, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0x00000004, D_802557CC_8C583C, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000002, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_802557CC_8C583C, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000001, 0x00000003, 0x00000043, 0x00000003, BindNpcAI, 0x00000001, D_802557CC_8C583C, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, kmr_02_UnkFunc42, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00A10001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetNpcAux, 0x00000007, D_8024D16C_8BD1DC, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000B0059, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600015, 0x00000056, 0x00000000, 0x00000045, 0x00000002, D_802558C4_8C5934, 0xFD050F84, 0x00000045, 0x00000002, D_8025590C_8C597C, 0xFD050F85, 0x00000043, 0x00000005, LoadPath, 0x00000028, D_802557EC_8C585C, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000A6, 0x000002F4, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000009F, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24C314D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000004C4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000005, LoadPath, 0x00000078, D_80255810_8C5880, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000008, 0xFFFFFFF6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000029, 0x000002D9, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000012C, 0x000000F5, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001B8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x000000DC, 0x00000000, 0x000000D5, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x000000FF, 0x00000000, 0x000000E8, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000BE, 0x00000000, 0x000000D4, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_8025584C_8C58BC, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFD050F84, 0x00000049, 0x00000001, 0xFD050F85, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x0000032B, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600010, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_80255870_8C58E0, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000007, 0xFFFFFFF6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000029, 0x000002D9, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000000DC, 0x000000D5, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000D, 0x009E0003, 0x00000005, 0x000B005B, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF22F6CE7, 0xF259B61A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B680, 0xF24ECEE7, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24B6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00005, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B61A, 0xF24E454D, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24AA280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, 0x80254AE0, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00080012, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000007, func_802D2520, 0x00080012, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080013, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00080013, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000007, func_802D2520, 0x00080013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7DB4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0011, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000100, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8080, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0003, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000003, 0x00000100, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00009, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00005, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF22F6CE7, 0xF259B61A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B680, 0xF24ECEE7, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24B6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005D, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000A6, 0x000002F4, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000009F, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24C314D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000004C4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600015, 0x00000045, 0x00000002, D_8025590C_8C597C, 0xFD050F85, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000045, 0x00000002, D_802558C4_8C5934, 0xFD050F84, 0x00000043, 0x00000005, LoadPath, 0x0000005A, D_80255894_8C5904, 0x00000004, 0x00000001, 0x00000003, 0x00000001, 0x00000046, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000046, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFD050F84, 0x00000049, 0x00000001, 0xFD050F85, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, 0x80243B74, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000A6, 0x00000000, 0x000000BC, 0x00000043, 0x00000004, SetPlayerPos, 0x000000E7, 0x00000000, 0x000000C4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0xF245CA80, 0xF24AAA80, 0xF24A5880, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00008, 0x00A00007, 0x00000000, 0x000B005F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0060, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0061, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0062, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF85, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000004, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0x00000004, D_802557CC_8C583C, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000002, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_802557CC_8C583C, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000001, 0x00000003, 0x00000043, 0x00000003, BindNpcAI, 0x00000001, D_802557CC_8C583C, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s
index 1226a5fa54..52d0cb6bff 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_04/8CC4F0.data.s
@@ -21,7 +21,7 @@ glabel D_80242A58_8CD358
 .word 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C86, 0x00000028, 0x00000043, 0x00000007, MakeItemEntity, 0x00000004, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C86, 0x00000010, 0x00000043, 0x0000000F, PlayEffect, 0x0000001B, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xF24A7E80, 0xFE363C88, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000009, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0x802405B8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x00000032, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF0, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B592, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802D7B44, 0xFE363C88, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242CE4_8CD5E4
-.word 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0xF24F2A80, 0xF24AC680, 0xF24A5680, 0x00000024, 0x00000002, 0xFAA2B592, 0x00000000, 0x00000044, 0x00000001, D_80242A58_8CD358, 0x00000043, 0x00000001, func_80240434_8CAD34, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802403E0_8CACE0, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0164, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFAA2B592, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00AA, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF89, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0xF24F2A80, 0xF24AC680, 0xF24A5680, 0x00000024, 0x00000002, 0xFAA2B592, 0x00000000, 0x00000044, 0x00000001, D_80242A58_8CD358, 0x00000043, 0x00000001, kmr_04_func_80240434_8CAD34, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802403E0_8CACE0, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0164, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFAA2B592, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B00AA, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF89, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242E20_8CD720
 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80242CE4_8CD5E4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s
index c83705d154..32f74abe85 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s
@@ -6,7 +6,7 @@ glabel D_80242DA0_8EEBC0
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, kmr_20_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_20_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802434E4_8EF304
-.word 0x00000043, 0x00000001, func_80240064_8EBE84, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802435C0_8EF3E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, kmr_20_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802435C0_8EF3E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802435C0_8EF3E0
 .word 0x00000043, 0x00000001, kmr_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_20_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, kmr_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s
index 7677c59ce4..e6b3f444e0 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s
@@ -69,16 +69,16 @@ glabel D_80249484_8F52A4
 .word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802494FC_8F531C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, func_802414B4_8ED2D4, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80241460_8ED280, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80249A5C_8F587C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802412E8_8ED108, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802412E8_8ED108, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249EFC_8F5D1C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kmr_20_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, kmr_20_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_20_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80249A5C_8F587C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249EFC_8F5D1C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kmr_20_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802499FC_8F581C
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x000B0106, 0x00000024, 0x00000002, 0xFE363C88, 0x000B0107, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249A5C_8F587C
-.word 0x00000044, 0x00000001, 0x80242D4C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE4, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000012C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, func_80241364_8ED184, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000023, 0xFFFFFFF6, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000087, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFF93, 0xFFFFFFB4, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000078, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000099, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009B, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009E, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A0, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A1, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A2, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A3, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0x00000055, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C84, 0xFE363C80, 0xFE363C86, 0x00000006, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024159C_8ED3BC, 0x00000008, 0x00000001, 0x0000004B, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000003, func_80241364_8ED184, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000099, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009A, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009B, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009C, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009D, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009E, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009F, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A0, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A1, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A2, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A3, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, 0x80242D4C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE4, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000012C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, kmr_20_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000023, 0xFFFFFFF6, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000087, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFF93, 0xFFFFFFB4, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000078, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000099, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009B, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009E, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A0, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A1, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A2, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A3, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0x00000055, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C84, 0xFE363C80, 0xFE363C86, 0x00000006, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024159C_8ED3BC, 0x00000008, 0x00000001, 0x0000004B, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000003, kmr_20_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000099, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009A, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009B, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009C, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009D, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009E, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009F, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A0, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A1, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A2, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A3, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249EFC_8F5D1C
 .word 0x00000043, 0x00000001, func_802415C4_8ED3E4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFD3, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFB5, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80242C40, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249FE4_8F5E04
-.word 0x00000043, 0x00000001, func_802415EC_8ED40C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, func_802414B4_8ED2D4, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80241460_8ED280, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C88, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E0007, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, kmr_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80249A5C_8F587C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802412E8_8ED108, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_802412E8_8ED108, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80249EFC_8F5D1C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, kmr_20_Call800E98C4SyncStatusMenu, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80249FE4_8F5E04, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000001, kmr_20_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, kmr_20_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_20_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C88, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E0007, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, kmr_20_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80249A5C_8F587C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80249EFC_8F5D1C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, kmr_20_Call800E98C4SyncStatusMenu, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80249FE4_8F5E04, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s
index 83edcec53f..1fbf284a2b 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_8024DF10_8F9D30
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup_kmr_20_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup_kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802417B4_8ED5D4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024E730_8FA550, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup_kmr_20_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup_kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup_kmr_20_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024E730_8FA550, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024E730_8FA550
 .word 0x00000043, 0x00000001, dup_kmr_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup_kmr_20_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup_kmr_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup_kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, dup3_kmr_20_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, dup3_kmr_20_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, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 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, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup3_kmr_20_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -30,7 +30,7 @@ glabel D_8024FD28_8FBB48
 .word 0x00000003, 0x00000022, 0x00000023, 0x00000024
 
 glabel D_8024FD38_8FBB58
-.word 0x00000003, 0x000001A6, 0x00000025, 0xFFFFFF3D, 0x000001A6, 0x00000030, 0xFFFFFF3D, 0x000001A6, 0x0000000C, 0xFFFFFF3D, D_8024FD28_8FBB48, 0x00000000, D_8024FD38_8FBB58, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003E, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFCE, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002D0, 0x000000DC, 0xFFFFFF6A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, EnableGroup, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000006B, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x0000005C, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000062, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000064, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000066, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x000001AE, 0x00000014, 0xFFFFFF5B, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000DC, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00040006, 0x00040001, 0x00000005, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x00000168, 0x00000104, 0x0000003C, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001AE, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000B, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000122, 0xFFFFFFBA, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000001, 0x00000043, 0x00000001, func_80241C9C_8EDABC, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80241D1C_8EDB3C, 0x00000044, 0x00000001, D_8024FB88_8FB9A8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x0000001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024FAAC_8FB8CC, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000E6, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000006E, 0xFFFFFF92, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFFB0, 0xF24A8280, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFF92, 0xF24A8280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00000020, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820018, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820006, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820016, 0x00820006, 0x00000000, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000004, GotoMapSpecial, 0x80253008, 0x00000003, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F6BC_8FB4DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F840_8FB660, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253010, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup2_kmr_20_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup2_kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241D84_8EDBA4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802517E0_8FD600, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x000001A6, 0x00000025, 0xFFFFFF3D, 0x000001A6, 0x00000030, 0xFFFFFF3D, 0x000001A6, 0x0000000C, 0xFFFFFF3D, D_8024FD28_8FBB48, 0x00000000, D_8024FD38_8FBB58, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003E, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFCE, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002D0, 0x000000DC, 0xFFFFFF6A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, EnableGroup, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000006B, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x0000005C, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000062, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000064, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000066, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x000001AE, 0x00000014, 0xFFFFFF5B, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000DC, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00040006, 0x00040001, 0x00000005, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x00000168, 0x00000104, 0x0000003C, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001AE, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000B, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000122, 0xFFFFFFBA, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000001, 0x00000043, 0x00000001, func_80241C9C_8EDABC, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80241D1C_8EDB3C, 0x00000044, 0x00000001, D_8024FB88_8FB9A8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x0000001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024FAAC_8FB8CC, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000E6, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000006E, 0xFFFFFF92, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFFB0, 0xF24A8280, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFF92, 0xF24A8280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00000020, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820018, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820006, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820016, 0x00820006, 0x00000000, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000004, GotoMapSpecial, 0x80253008, 0x00000003, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F6BC_8FB4DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F840_8FB660, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253010, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup2_kmr_20_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup2_kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup2_kmr_20_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802517E0_8FD600, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802517E0_8FD600
 .word 0x00000043, 0x00000001, dup2_kmr_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup2_kmr_20_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup2_kmr_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup2_kmr_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s b/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s
index 0660204cf1..22365c74d1 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80240CD0_A55620
-.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240350_A54CA0, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240350_A54CA0, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240EA8_A557F8
 .word 0x00000024, 0x00000002, 0xFE363C81, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000015, 0x00000046, 0x00000001, D_80240CD0_A55620, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -24,4 +24,4 @@ glabel D_802410CC_A55A1C
 .word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005E, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000061, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802411A0_A55AF0
-.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000065, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, func_80240444_A54D94, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000051, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, func_80240444_A54D94, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000050, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000015, 0x0000005A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x0000005D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000063, 0x00000047, 0x00000005, D_80240EA8_A557F8, 0x00000080, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EE4_A55834, 0x00000080, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F20_A55870, 0x00000080, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F5C_A558AC, 0x00000080, 0x0000001B, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802410CC_A55A1C, 0x00000044, 0x00000001, D_802411A0_A55AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000065, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, func_80240444_A54D94, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000051, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, func_80240444_A54D94, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000050, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000015, 0x0000005A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x0000005D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000063, 0x00000047, 0x00000005, D_80240EA8_A557F8, 0x00000080, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EE4_A55834, 0x00000080, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F20_A55870, 0x00000080, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F5C_A558AC, 0x00000080, 0x0000001B, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802410CC_A55A1C, 0x00000044, 0x00000001, D_802411A0_A55AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s
index a83bfef48d..9269962645 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 glabel D_80240D80_A56CA0
-.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000070, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x0000007D, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618E, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000073, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0x0000004B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000003, 0x00000001, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618F, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000070, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x0000007D, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618E, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000073, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0x0000004B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000003, 0x00000001, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618F, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, func_80240444_A56364, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s
index 5a87d113e2..b5272dca4c 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_14/A59060.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 glabel D_80241BB0_A59060
-.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000005E, 0x00000067, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x000000AF, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000091, 0x00000043, 0x00000001, func_80240840_A57CF0, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000065, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, func_80240840_A57CF0, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000005E, 0x00000067, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x000000AF, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000091, 0x00000043, 0x00000001, func_80240840_A57CF0, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000065, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0x000000AF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_8024073C_A57BEC, 0xFE363C84, 0x0000005E, 0xFD050F8B, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, func_80240840_A57CF0, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_14_func_80240710_A57BC0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_16/A5B180.data.s b/ver/us/asm/data/world/area_kpa/kpa_16/A5B180.data.s
index 866b0d38a5..d05ef93f8c 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_16/A5B180.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_16/A5B180.data.s
@@ -12,7 +12,7 @@ glabel D_802417F8_A5B828
 .word 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000028A, 0xFFFFFF6F, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8880, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000028A, 0xFFFFFF5B, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000028A, 0xFFFFFF88, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802418DC_A5B90C
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240370_A5A3A0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000027, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000000E6, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002C6, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000022B, 0x000000E6, 0xFFFFFF6A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000022B, 0x000000E6, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x000002A8, 0xFFFFFF6F, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000226, 0xFFFFFF5B, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001FE, 0xFFFFFF5B, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000217, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00580006, 0x00580006, 0x00000001, 0x00130017, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00580006, 0x00580006, 0x00000000, 0x00130018, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00560002, 0x00560001, 0x00000000, 0x00130019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x0013001A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000044, 0x00000001, D_802417F8_A5B828, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406195, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kpa_16_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000027, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000000E6, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002C6, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000022B, 0x000000E6, 0xFFFFFF6A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000022B, 0x000000E6, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x000002A8, 0xFFFFFF6F, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000226, 0xFFFFFF5B, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001FE, 0xFFFFFF5B, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000217, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00580006, 0x00580006, 0x00000001, 0x00130017, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00580006, 0x00580006, 0x00000000, 0x00130018, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00560002, 0x00560001, 0x00000000, 0x00130019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00580008, 0x00580001, 0x00000000, 0x0013001A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00580006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00580006, 0x00000044, 0x00000001, D_802417F8_A5B828, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406195, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802420B4_A5C0E4
 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8406195, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x7FFFFE00, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s
index 68f113fe36..ff28e48157 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s
@@ -87,16 +87,16 @@ glabel D_80244004_A8AA54
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024415C_A8ABAC
-.word 0x00000043, 0x00000004, func_8024173C_A8818C, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80244504_A8AF54, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_802416E8_A88138, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_91_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244004_A8AA54, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80244564_A8AFB4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80241570_A87FC0, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243F8C_A8A9DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80241570_A87FC0, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80244800_A8B250, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kpa_91_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, kpa_91_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80244504_A8AF54, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kpa_91_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_91_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244004_A8AA54, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80244564_A8AFB4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_91_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243F8C_A8A9DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_91_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80244800_A8B250, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kpa_91_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244504_A8AF54
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00130044, 0x00000024, 0x00000002, 0xFE363C88, 0x00130045, 0x00000024, 0x00000002, 0xFE363C81, 0x00130046, 0x00000024, 0x00000002, 0xFE363C82, 0x00130047, 0x00000024, 0x00000002, 0xFE363C83, 0x00130048, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244564_A8AFB4
-.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, func_802415EC_A8803C, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A6E80, 0xF246BA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2482280, 0xF2499A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF4C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF60, 0x00000016, 0xFFFFFF85, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00002800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kpa_91_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A6E80, 0xF246BA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2482280, 0xF2499A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF4C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF60, 0x00000016, 0xFFFFFF85, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00002800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244800_A8B250
-.word 0x00000043, 0x00000003, func_802415EC_A8803C, 0x00000000, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF75, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF9A, 0xFFFFFF7E, 0x00000014, 0x00000044, 0x00000001, 0x80241960, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, kpa_91_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF75, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF9A, 0xFFFFFF7E, 0x00000014, 0x00000044, 0x00000001, 0x80241960, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802448E0_A8B330
 .word 0x00000043, 0x00000004, GetPlayerPos, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000046, 0x00000001, D_8024415C_A8ABAC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s b/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s
index 3eee9cd268..fa58cc0461 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s
@@ -87,16 +87,16 @@ glabel D_80244214_A90C94
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024436C_A90DEC
-.word 0x00000043, 0x00000004, func_8024181C_A8E29C, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80244714_A91194, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_802417C8_A8E248, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_95_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244214_A90C94, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80244774_A911F4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80241650_A8E0D0, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024419C_A90C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80241650_A8E0D0, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80244A10_A91490, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kpa_95_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, kpa_95_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80244714_A91194, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kpa_95_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_95_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244214_A90C94, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80244774_A911F4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_95_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024419C_A90C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_95_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80244A10_A91490, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kpa_95_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244714_A91194
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00130064, 0x00000024, 0x00000002, 0xFE363C88, 0x00130065, 0x00000024, 0x00000002, 0xFE363C81, 0x00130066, 0x00000024, 0x00000002, 0xFE363C82, 0x00130067, 0x00000024, 0x00000002, 0xFE363C83, 0x00130068, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244774_A911F4
-.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, func_802416CC_A8E14C, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A6E80, 0xF246BA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2482280, 0xF2499A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF4C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF60, 0x00000016, 0xFFFFFF85, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00002800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kpa_95_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A6E80, 0xF246BA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2482280, 0xF2499A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF4C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF60, 0x00000016, 0xFFFFFF85, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00002800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244A10_A91490
-.word 0x00000043, 0x00000003, func_802416CC_A8E14C, 0x00000000, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF75, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF9A, 0xFFFFFF7E, 0x00000014, 0x00000044, 0x00000001, 0x80241960, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, kpa_95_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF75, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF9A, 0xFFFFFF7E, 0x00000014, 0x00000044, 0x00000001, 0x80241960, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244AF0_A91570
 .word 0x00000043, 0x00000004, GetPlayerPos, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000046, 0x00000001, D_8024436C_A90DEC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s
index 995f3e8eee..2732fd0061 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s
@@ -6,7 +6,7 @@ glabel D_80243270_C5D9B0
 .word 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000009, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7D4D, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFFEA, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7EE7, 0x00000043, 0x00000005, TranslateModel, 0x00000009, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243430_C5DB70
-.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, func_80240384_C5AAC4, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C85, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7CE7, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240384_C5AAC4, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C84, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C85, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8D, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7EE7, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7EE7, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C85, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240384_C5AAC4, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C8D, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000008, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8D, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C84, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C85, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, kzn_02_GetFloorCollider, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C85, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7CE7, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kzn_02_GetFloorCollider, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C84, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C85, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8D, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7EE7, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7EE7, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C85, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kzn_02_GetFloorCollider, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C8D, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000008, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8D, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C84, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C85, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243834_C5DF74
 .word 0x0000003C, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xF4ACD481, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C85, 0x00000020, 0x00000024, 0x00000002, 0xFE363C86, 0x00000021, 0x00000043, 0x00000002, func_80240310_C5AA50, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000032, 0x00000046, 0x00000001, D_80243430_C5DB70, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -48,7 +48,7 @@ glabel D_802440D0_C5E810
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000046, 0x00000001, D_80243D74_C5E4B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244128_C5E868
-.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002B, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002C, 0x00000021, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000023, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF97, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000006E, 0x000000D7, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_802403DC_C5AB1C, 0xFE363C84, 0x0000002B, 0x0000002C, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000043, 0x00000002, func_80240384_C5AAC4, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000056, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF97, 0x000000D7, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_802403DC_C5AB1C, 0xFE363C84, 0x0000002B, 0x0000002C, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000043, 0x00000002, func_80240384_C5AAC4, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000055, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x00000024, 0x00000002, 0xF4ACD480, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD483, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD485, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x00000009, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243834_C5DF74, 0x00000080, 0x0000001F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243834_C5DF74, 0x00000080, 0x00000020, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x0000000D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x0000000F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243914_C5E054, 0x00000080, 0x00000023, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243914_C5E054, 0x00000080, 0x00000024, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x00000011, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000028, 0x00000013, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_802439F4_C5E134, 0x00000080, 0x00000027, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_802439F4_C5E134, 0x00000080, 0x00000028, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002F, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000030, 0x0000001D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000031, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243AD4_C5E214, 0x00000080, 0x0000002F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243AD4_C5E214, 0x00000080, 0x00000030, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000033, 0x0000001A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000034, 0x00000019, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243BB4_C5E2F4, 0x00000080, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243BB4_C5E2F4, 0x00000080, 0x00000034, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000037, 0x00000016, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000038, 0x00000015, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243C94_C5E3D4, 0x00000080, 0x00000037, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243C94_C5E3D4, 0x00000080, 0x00000038, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80243F18_C5E658, 0x00000044, 0x00000001, D_80243F70_C5E6B0, 0x00000044, 0x00000001, D_80243FC8_C5E708, 0x00000044, 0x00000001, D_80244020_C5E760, 0x00000044, 0x00000001, D_80244078_C5E7B8, 0x00000044, 0x00000001, D_802440D0_C5E810, 0x00000044, 0x00000001, D_80244128_C5E868, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002B, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002C, 0x00000021, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000023, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF97, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000006E, 0x000000D7, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_802403DC_C5AB1C, 0xFE363C84, 0x0000002B, 0x0000002C, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000043, 0x00000002, kzn_02_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000056, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF97, 0x000000D7, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_802403DC_C5AB1C, 0xFE363C84, 0x0000002B, 0x0000002C, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000043, 0x00000002, kzn_02_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000055, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x00000024, 0x00000002, 0xF4ACD480, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD483, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD485, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x00000009, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243834_C5DF74, 0x00000080, 0x0000001F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243834_C5DF74, 0x00000080, 0x00000020, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x0000000D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x0000000F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243914_C5E054, 0x00000080, 0x00000023, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243914_C5E054, 0x00000080, 0x00000024, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x00000011, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000028, 0x00000013, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_802439F4_C5E134, 0x00000080, 0x00000027, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_802439F4_C5E134, 0x00000080, 0x00000028, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002F, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000030, 0x0000001D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000031, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243AD4_C5E214, 0x00000080, 0x0000002F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243AD4_C5E214, 0x00000080, 0x00000030, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000033, 0x0000001A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000034, 0x00000019, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243BB4_C5E2F4, 0x00000080, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243BB4_C5E2F4, 0x00000080, 0x00000034, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000037, 0x00000016, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000038, 0x00000015, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243C94_C5E3D4, 0x00000080, 0x00000037, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243C94_C5E3D4, 0x00000080, 0x00000038, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80243F18_C5E658, 0x00000044, 0x00000001, D_80243F70_C5E6B0, 0x00000044, 0x00000001, D_80243FC8_C5E708, 0x00000044, 0x00000001, D_80244020_C5E760, 0x00000044, 0x00000001, D_80244078_C5E7B8, 0x00000044, 0x00000001, D_802440D0_C5E810, 0x00000044, 0x00000001, D_80244128_C5E868, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244900_C5F040
 .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0
diff --git a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s
index 918a9c51b4..2bfbc08772 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s
@@ -18,4 +18,4 @@ glabel D_80241CA4_C69DD4
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024034C_C6847C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_UnkFunc22, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240910_C68A40, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241E08_C69F38
-.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241018_C69148, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240430_C68560, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024072C_C6885C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024072C_C6885C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s
index df8b2f0a8d..b6db865c7a 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s
@@ -18,4 +18,4 @@ glabel D_80243D64_C7AA44
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_C76D1C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_UnkFunc22, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_C772E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243EC8_C7ABA8
-.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_C779E8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_C76E00, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_C770FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, D_80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_C770FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, D_80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s b/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s
index 27e7f387cb..fd2adc82ea 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_11/C83180.data.s
@@ -3,4 +3,4 @@
 .section .data
 
 glabel D_80242FE0_C83180
-.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000019, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000017, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000018, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240408_C805A8, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000003C, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240408_C805A8, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240408_C805A8, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000087, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, func_80240408_C805A8, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000019, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000017, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000018, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000003C, 0x00000078, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001A, 0x00000019, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFC4, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000087, 0x000000C3, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_C804B0, 0xFE363C84, 0x0000001E, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000001, func_80240434_C805D4, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kzn_11_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s
index f3dda7d552..c9af853d60 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s
@@ -45,7 +45,7 @@ glabel D_80240DEC_C8CE8C
 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
 glabel D_80240E44_C8CEE4
-.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000021, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF83, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000021, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFEE8, 0x000000FA, 0xFFFFFE98, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFEAC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE98, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24AA280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000B9, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B9, 0x000000FA, 0xFFFFFEAC, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240388_C8C428, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000020, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x001000FD, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000FE, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001A4, 0x000000FA, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000212, 0xFFFFFE98, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000022, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000021, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF83, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000021, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFEE8, 0x000000FA, 0xFFFFFE98, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFEAC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE98, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24AA280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000B9, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000B9, 0x000000FA, 0xFFFFFEAC, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kzn_18_GetFloorCollider, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000020, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x001000FD, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000FE, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001A4, 0x000000FA, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000212, 0xFFFFFE98, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000022, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241360_C8D400
 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000022, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240E44_C8CEE4, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s b/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s
index ef730ef3a7..bf11764143 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s
@@ -75,7 +75,7 @@ glabel D_80243468_C99398
 .word 0x43110000, 0x43430000, 0xC1200000, 0x42C80000, 0x433E0000, 0xC2B40000, 0x42A00000, 0x43340000, 0xC2700000, 0x42E60000, 0x432F0000, 0xC2200000, 0x43250000, 0x432A0000, 0xC1200000, 0x43660000, 0x432A0000, 0xC1A00000, 0x43870000, 0x432F0000, 0xC1F00000
 
 glabel D_802434BC_C993EC
-.word 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF88, 0x00000046, 0x0000002D, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80243420_C99350, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240A8C_C969BC, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000013, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003C, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000000F, 0x00000003, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000019, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x00000016, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000001F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000005, 0x0010010E, 0x00000003, 0x00000001, 0x0000001E, 0x0000000A, 0x00000002, 0xFD050F8D, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000023, 0x00000016, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100111, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000002D, 0x00000016, 0x00000001, 0x00000032, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000091, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160007, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000AA, 0x000000AA, 0x00000032, 0x00000014, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000091, 0x000000AA, 0xFFFFFFF6, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0x00000091, 0x000000A0, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100112, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x0000005A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000131, 0x00000000, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000091, 0x000000C3, 0xFFFFFFF6, 0x00000005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160005, 0x00160008, 0x00000000, 0x00100115, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80243468_C99398, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000005B, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000005B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF88, 0x00000046, 0x0000002D, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80243420_C99350, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kzn_20_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000013, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003C, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000000F, 0x00000003, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000019, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x00000016, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000001F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000005, 0x0010010E, 0x00000003, 0x00000001, 0x0000001E, 0x0000000A, 0x00000002, 0xFD050F8D, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000023, 0x00000016, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100111, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000002D, 0x00000016, 0x00000001, 0x00000032, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000091, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160007, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000AA, 0x000000AA, 0x00000032, 0x00000014, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000091, 0x000000AA, 0xFFFFFFF6, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0x00000091, 0x000000A0, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100112, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x0000005A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000131, 0x00000000, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000091, 0x000000C3, 0xFFFFFFF6, 0x00000005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160005, 0x00160008, 0x00000000, 0x00100115, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80243468_C99398, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000005B, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000005B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243E08_C99D38
 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100114, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s b/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s
index c87aa1e525..7aaac9a2c9 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s
@@ -27,7 +27,7 @@ glabel D_80240958_C9AB58
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x00000029, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000017, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240A34_C9AC34
-.word 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, SetTexPanner, 0x0000002B, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000029, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000013, 0x00000029, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000013, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024030C_C9A50C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_80240958_C9AB58, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000002B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A8080, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000011D, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A85B4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0x00000029, 0x00000000, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, SetTexPanner, 0x0000002B, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000029, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000013, 0x00000029, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000013, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, kzn_22_GetFloorCollider, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_80240958_C9AB58, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000002B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A8080, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000011D, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A85B4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0x00000029, 0x00000000, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240D30_C9AF30
 .word 0x00000007, 0x43480000, 0x43160000, 0x43340000, 0x00000009, 0x43480000, 0x43160000, 0x43340000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, SetSpriteShading, 0x000A000F, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802420C0, 0x00000046, 0x00000001, D_80240EE0_C9B0E0, 0x00000024, 0x00000002, 0xFE363C80, D_80240790_C9A990, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802403E0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80240D30_C9AF30, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_802407BC_C9A9BC, 0x00000044, 0x00000001, D_802408A8_C9AAA8, 0x00000044, 0x00000001, D_80240A34_C9AC34, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, D_802404EC_C9A6EC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, D_80240608_C9A808, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kzn/kzn_22/C9B120.data.s b/ver/us/asm/data/world/area_kzn/kzn_22/C9B120.data.s
index ad40fba5da..b3f1722c86 100644
--- a/ver/us/asm/data/world/area_kzn/kzn_22/C9B120.data.s
+++ b/ver/us/asm/data/world/area_kzn/kzn_22/C9B120.data.s
@@ -12,7 +12,7 @@ glabel D_80240FD0_C9B1D0
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241010_C9B210
-.word 0x00000044, 0x00000001, D_80240FD0_C9B1D0, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240340_C9A540, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPlayerAnimation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0008001A, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x0000000A, 0x00000002, 0xF971888E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF251FA80, 0xF24F28E7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000FA, 0x000000D2, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00100116, 0x000001B8, 0x000000F0, 0x000000A5, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, D_80240FD0_C9B1D0, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, dup_kzn_22_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPlayerAnimation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0008001A, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x0000000A, 0x00000002, 0xF971888E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF251FA80, 0xF24F28E7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000FA, 0x000000D2, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00100116, 0x000001B8, 0x000000F0, 0x000000A5, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024131C_C9B51C
 .word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241010_C9B210, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s
index f55790179f..a535f88d2d 100644
--- a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s
@@ -12,7 +12,7 @@ glabel D_80243D40_7EEA50
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mac_00_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_00_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244484_7EF194
-.word 0x00000043, 0x00000001, func_80240034_7EAD44, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80244560_7EF270, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_00_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80244560_7EF270, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244560_7EF270
 .word 0x00000043, 0x00000001, mac_00_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_00_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_00_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_00_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
index 3dbfd1e38b..5c6796a8f4 100644
--- a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
@@ -63,10 +63,10 @@ glabel D_80247450_7F2160
 .word 0x00000045, 0x00000002, D_80247284_7F1F94, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802472C4_7F1FD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247500_7F2210
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_00_Set80151310_1, 0x00000043, 0x00000001, mac_00_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245F64_7F0C74, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024668C_7F139C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240DA0_7EBAB0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246700_7F1410, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241694_7EC3A4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240D1C_7EBA2C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241138_7EBE48, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802473A0_7F20B0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247450_7F2160, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241154_7EBE64, 0x00000043, 0x00000001, func_80240FB8_7EBCC8, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000044, 0x00000001, D_802461FC_7F0F0C, 0x00000043, 0x00000001, func_80240BA8_7EB8B8, 0x00000043, 0x00000001, mac_00_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_00_Set80151310_1, 0x00000043, 0x00000001, mac_00_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245F64_7F0C74, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024668C_7F139C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240DA0_7EBAB0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246700_7F1410, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241694_7EC3A4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240D1C_7EBA2C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241138_7EBE48, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802473A0_7F20B0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247450_7F2160, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241154_7EBE64, 0x00000043, 0x00000001, func_80240FB8_7EBCC8, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000044, 0x00000001, D_802461FC_7F0F0C, 0x00000043, 0x00000001, mac_00_UnkFunc29, 0x00000043, 0x00000001, mac_00_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248230_7F2F40
-.word 0x00000043, 0x00000001, func_8024076C_7EB47C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80240990_7EB6A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_8024076C_7EB47C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_00_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802482A4_7F2FB4
 .word 0x0000003C, 0x00000001, 0x80255B78, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247500_7F2210, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
index da7c16c15c..cb8d44576e 100644
--- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
@@ -96,10 +96,10 @@ glabel D_8024A2C0_80AB40
 .word 0x00000045, 0x00000002, D_8024A0F4_80A974, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_8024A134_80A9B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A370_80ABF0
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_01_Set80151310_1, 0x00000043, 0x00000001, mac_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_80248DD4_809654, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802494FC_809D7C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242680_802F00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80249570_809DF0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242980_803200, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242F74_8037F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_802425FC_802E7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242A18_803298, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024A210_80AA90, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_8024A2C0_80AB40, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242980_803200, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242A34_8032B4, 0x00000043, 0x00000001, func_80242898_803118, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000044, 0x00000001, D_8024906C_8098EC, 0x00000043, 0x00000001, func_80242488_802D08, 0x00000043, 0x00000001, mac_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_01_Set80151310_1, 0x00000043, 0x00000001, mac_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_80248DD4_809654, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802494FC_809D7C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242680_802F00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80249570_809DF0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242980_803200, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242F74_8037F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_802425FC_802E7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242A18_803298, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024A210_80AA90, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_8024A2C0_80AB40, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242980_803200, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242A34_8032B4, 0x00000043, 0x00000001, func_80242898_803118, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000044, 0x00000001, D_8024906C_8098EC, 0x00000043, 0x00000001, mac_01_UnkFunc29, 0x00000043, 0x00000001, mac_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024B0A0_80B920
-.word 0x00000043, 0x00000001, func_8024204C_8028CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80242270_802AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_8024204C_8028CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024B114_80B994
 .word 0x0000003C, 0x00000001, 0x80262A48, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_8024A370_80ABF0, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -186,7 +186,7 @@ glabel D_8024D444_80DCC4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024D59C_80DE1C
-.word 0x00000043, 0x00000004, func_802439C0_804240, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025BAE0_81C360, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_8024396C_8041EC, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mac_01_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D444_80DCC4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8025BB80_81C400, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, pause_tutorial_draw_contents_804074, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D3CC_80DC4C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, pause_tutorial_draw_contents_804074, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025BDDC_81C65C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, mac_01_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, mac_01_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025BAE0_81C360, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, mac_01_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mac_01_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D444_80DCC4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8025BB80_81C400, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D3CC_80DC4C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025BDDC_81C65C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, mac_01_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024D944_80E1C4
 .word 0x00000000
@@ -558,7 +558,7 @@ glabel D_8025BAE0_81C360
 .word 0x0000000A, 0x00000002, 0xF97188C3, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00030015, 0x00000024, 0x00000002, 0xFE363C88, 0x00030016, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0003001B, 0x00000024, 0x00000002, 0xFE363C88, 0x0003001B, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00030017, 0x00000024, 0x00000002, 0xFE363C82, 0x00030018, 0x00000024, 0x00000002, 0xFE363C83, 0x00030019, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8025BB80_81C400
-.word 0x00000044, 0x00000001, 0x80246924, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000217, 0xFFFFFF65, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_80243870_8040F0, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000074, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000063, 0xFFFFFFC6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001EF, 0x00000082, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000001FB, 0xFFFFFFED, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000244, 0xFFFFFF2E, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000107, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000003, func_80243870_8040F0, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, 0x80246924, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000217, 0xFFFFFF65, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, mac_01_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000074, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000063, 0xFFFFFFC6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001EF, 0x00000082, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000001FB, 0xFFFFFFED, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000244, 0xFFFFFF2E, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000107, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000003, mac_01_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8025BDDC_81C65C
 .word 0x00000044, 0x00000001, D_80246770_806FF0, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, SetPlayerPos, 0x00000238, 0x00000014, 0xFFFFFF46, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000020D, 0xFFFFFF58, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s b/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s
index 45888ab8d4..75048286a4 100644
--- a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s
@@ -6,7 +6,7 @@ glabel D_80243630_8268F0
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mac_02_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243D74_827034
-.word 0x00000043, 0x00000001, func_80240034_8232F4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E50_827110, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_02_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E50_827110, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243E50_827110
 .word 0x00000043, 0x00000001, mac_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_02_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
index b7243daeb0..6cdaeb4f9f 100644
--- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
@@ -93,10 +93,10 @@ glabel D_802477E0_82AAA0
 .word 0x00000045, 0x00000002, D_80247614_82A8D4, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247654_82A914, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247890_82AB50
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246244_829504, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_02_Set80151310_1, 0x00000043, 0x00000001, mac_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_802462F4_8295B4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246A1C_829CDC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241F30_8251F0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246A90_829D50, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242824_825AE4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241EAC_82516C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802422C8_825588, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247730_82A9F0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802477E0_82AAA0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802422E4_8255A4, 0x00000043, 0x00000001, func_80242148_825408, 0x00000046, 0x00000001, D_80246244_829504, 0x00000044, 0x00000001, D_8024658C_82984C, 0x00000043, 0x00000001, func_80241D38_824FF8, 0x00000043, 0x00000001, mac_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246244_829504, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_02_Set80151310_1, 0x00000043, 0x00000001, mac_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_802462F4_8295B4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246A1C_829CDC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241F30_8251F0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246A90_829D50, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242824_825AE4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241EAC_82516C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802422C8_825588, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247730_82A9F0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802477E0_82AAA0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802422E4_8255A4, 0x00000043, 0x00000001, func_80242148_825408, 0x00000046, 0x00000001, D_80246244_829504, 0x00000044, 0x00000001, D_8024658C_82984C, 0x00000043, 0x00000001, mac_02_UnkFunc29, 0x00000043, 0x00000001, mac_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802485C0_82B880
-.word 0x00000043, 0x00000001, func_802418FC_824BBC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80241B20_824DE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_802418FC_824BBC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248634_82B8F4
 .word 0x0000003C, 0x00000001, 0x8024E548, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247890_82AB50, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_03/834170.data.s b/ver/us/asm/data/world/area_mac/mac_03/834170.data.s
index 355f80c8c3..d214508e1d 100644
--- a/ver/us/asm/data/world/area_mac/mac_03/834170.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_03/834170.data.s
@@ -6,7 +6,7 @@ glabel D_80242970_834170
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_03_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mac_03_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802430B4_8348B4
-.word 0x00000043, 0x00000001, func_80240034_831834, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243190_834990, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mac_03_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243190_834990, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243190_834990
 .word 0x00000043, 0x00000001, mac_03_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_03_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_03_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
index 3d4dccb314..8ad0cfafaa 100644
--- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
@@ -81,10 +81,10 @@ glabel D_80247CD4_8394D4
 .word 0x00000045, 0x00000002, D_80247B08_839308, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247B48_839348, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247D84_839584
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_03_Set80151310_1, 0x00000043, 0x00000001, mac_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802467E8_837FE8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246F10_838710, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240C20_832420, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246F84_838784, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240F20_832720, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241514_832D14, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B9C_83239C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240FB8_8327B8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247C24_839424, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247CD4_8394D4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240F20_832720, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240FD4_8327D4, 0x00000043, 0x00000001, func_80240E38_832638, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000044, 0x00000001, D_80246A80_838280, 0x00000043, 0x00000001, func_80240A28_832228, 0x00000043, 0x00000001, mac_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_03_Set80151310_1, 0x00000043, 0x00000001, mac_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802467E8_837FE8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246F10_838710, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240C20_832420, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246F84_838784, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240F20_832720, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241514_832D14, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B9C_83239C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240FB8_8327B8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247C24_839424, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247CD4_8394D4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240F20_832720, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240FD4_8327D4, 0x00000043, 0x00000001, func_80240E38_832638, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000044, 0x00000001, D_80246A80_838280, 0x00000043, 0x00000001, mac_03_UnkFunc29, 0x00000043, 0x00000001, mac_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248AB4_83A2B4
-.word 0x00000043, 0x00000001, func_802405EC_831DEC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80240810_832010, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_802405EC_831DEC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248B28_83A328
 .word 0x0000003C, 0x00000001, 0x802513D8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247D84_839584, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s b/ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s
index 586ab15c5c..555556fc5e 100644
--- a/ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s
@@ -9,7 +9,7 @@ glabel D_8024F4F8_840CF8
 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000A, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830003, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x0000009D, 0xFFFFFECA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00830004, 0x00830001, 0x00000000, 0x00050053, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050056, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050055, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000A, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFAA2B588, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830003, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x000000DC, 0xFFFFFF60, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024F668_840E68
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B588, 0x00000000, 0x00000044, 0x00000001, D_8024F4F8_840CF8, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005F, 0xFFFFFE93, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFAA2B588, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80241F40_833740, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000003B, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241F80_833780, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B588, 0x00000000, 0x00000044, 0x00000001, D_8024F4F8_840CF8, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005F, 0xFFFFFE93, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFAA2B588, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, mac_03_GetFloorCollider, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000003B, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241F80_833780, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024F800_841000
 .word 0x0000008D, 0x00000001, 0x00000064, 0x0000008C, 0x00000001, 0x00000064, 0x00000080, 0x00000001, 0x00000064, 0x00000082, 0x00000001, 0x00000064, 0x00000095, 0x00000001, 0x00000064, 0x000000A3, 0x00000001, 0x00000064, 0x00000083, 0x00000001, 0x00000064, 0x00000097, 0x00000001, 0x00000064, 0x000000A2, 0x00000001, 0x00000064, 0x0000008E, 0x00000001, 0x00000064
@@ -18,7 +18,7 @@ glabel D_8024F878_841078
 .word 0x00000043, 0x00000004, func_802427D0_833FD0, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C87, 0x0000000D, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C84, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024F934_841134
-.word 0x00000043, 0x00000002, func_80241F40_833740, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7A9F, 0x00000043, 0x00000005, ScaleModel, 0x00000082, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7A9F, 0x00000043, 0x00000005, ScaleModel, 0x00000082, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE01AD, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0x00000016, 0x0000005A, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000016, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C83, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000009, 0x00000018, 0x00000001, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000008, 0x00000018, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000018, 0x00000001, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000018, 0x00000001, 0x00000021, 0x00000024, 0x00000002, 0xFE363C83, 0x00000006, 0x00000018, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000018, 0x00000001, 0x00000037, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000018, 0x00000001, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000018, 0x00000001, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000023, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x00000147, 0x00000000, 0x00000043, 0x00000007, func_802421E8_8339E8, 0x0000000A, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000005A, 0x00000008, 0x00000001, 0x0000000A, 0x0000000F, 0x00000002, 0xF5DE019D, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000C, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x0000000C, 0x00000016, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000044, 0x00000001, D_8024F878_841078, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x0000015E, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0x00000004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000244, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0x0000026C, 0x00000014, 0xFFFFFF56, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000C, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000C, 0x00000001, 0x00000043, 0x00000001, func_80242694_833E94, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C86, 0xF5DE019D, 0x00000005, 0x00000001, 0xFE363C86, 0x00000043, 0x00000006, func_802424A0_833CA0, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcYaw, 0xFE363C81, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000168, 0x00000014, 0xFFFFFF5B, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000168, 0x00000014, 0xFFFFFF5B, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, func_80242608_833E08, 0x0000000A, 0x00000002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000016, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0x0000014A, 0x00000014, 0xFFFFFF24, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000016, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000016, 0x00000168, 0xFFFFFF4C, 0x00000000, 0x00000024, 0x00000002, 0xF5DE01AD, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000016, 0x00000000, 0x00000043, 0x00000006, func_802424A0_833CA0, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C84, 0x00000043, 0x00000002, func_802425A8_833DA8, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C85, 0xF5DE019D, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C85, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C85, 0x00000001, 0x00000043, 0x00000007, func_802421E8_8339E8, 0xF5DE019D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C84, 0x00000027, 0x00000002, 0xF5DE019D, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, mac_03_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7A9F, 0x00000043, 0x00000005, ScaleModel, 0x00000082, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7A9F, 0x00000043, 0x00000005, ScaleModel, 0x00000082, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE01AD, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0x00000016, 0x0000005A, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000016, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C83, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000009, 0x00000018, 0x00000001, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000008, 0x00000018, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000018, 0x00000001, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000018, 0x00000001, 0x00000021, 0x00000024, 0x00000002, 0xFE363C83, 0x00000006, 0x00000018, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000018, 0x00000001, 0x00000037, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000018, 0x00000001, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000018, 0x00000001, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000023, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x00000147, 0x00000000, 0x00000043, 0x00000007, func_802421E8_8339E8, 0x0000000A, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000005A, 0x00000008, 0x00000001, 0x0000000A, 0x0000000F, 0x00000002, 0xF5DE019D, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000C, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x0000000C, 0x00000016, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000044, 0x00000001, D_8024F878_841078, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x0000015E, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0x00000004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000244, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0x0000026C, 0x00000014, 0xFFFFFF56, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000C, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000C, 0x00000001, 0x00000043, 0x00000001, func_80242694_833E94, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C86, 0xF5DE019D, 0x00000005, 0x00000001, 0xFE363C86, 0x00000043, 0x00000006, func_802424A0_833CA0, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcYaw, 0xFE363C81, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000168, 0x00000014, 0xFFFFFF5B, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000168, 0x00000014, 0xFFFFFF5B, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, func_80242608_833E08, 0x0000000A, 0x00000002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000016, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0x0000014A, 0x00000014, 0xFFFFFF24, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000016, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000016, 0x00000168, 0xFFFFFF4C, 0x00000000, 0x00000024, 0x00000002, 0xF5DE01AD, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000016, 0x00000000, 0x00000043, 0x00000006, func_802424A0_833CA0, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C84, 0x00000043, 0x00000002, func_802425A8_833DA8, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C85, 0xF5DE019D, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C85, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C85, 0x00000001, 0x00000043, 0x00000007, func_802421E8_8339E8, 0xF5DE019D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C84, 0x00000027, 0x00000002, 0xF5DE019D, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802501D4_8419D4
 .word 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000003, EnableNpcAI, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, NpcJump0, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C81, 0x0000015E, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C81, 0x00000008, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C81, 0x00000244, 0xFE363C84, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C81, 0x0000026C, 0x00000014, 0xFE363C84, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, func_802425A8_833DA8, 0xFE363C80, 0x00000028, 0x00000002, 0xF5DE019D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
index 208230baa1..643d59c92e 100644
--- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
@@ -78,10 +78,10 @@ glabel D_80245678_848248
 .word 0x00000045, 0x00000002, D_802454AC_84807C, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802454EC_8480BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245728_8482F8
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_04_Set80151310_1, 0x00000043, 0x00000001, mac_04_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024418C_846D5C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802448B4_847484, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240BD0_8437A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80244928_8474F8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802414C4_844094, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B4C_84371C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240F68_843B38, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802455C8_848198, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80245678_848248, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240F84_843B54, 0x00000043, 0x00000001, func_80240DE8_8439B8, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000044, 0x00000001, D_80244424_846FF4, 0x00000043, 0x00000001, func_802409D8_8435A8, 0x00000043, 0x00000001, mac_04_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_04_Set80151310_1, 0x00000043, 0x00000001, mac_04_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024418C_846D5C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802448B4_847484, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240BD0_8437A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80244928_8474F8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802414C4_844094, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B4C_84371C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240F68_843B38, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802455C8_848198, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80245678_848248, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240F84_843B54, 0x00000043, 0x00000001, func_80240DE8_8439B8, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000044, 0x00000001, D_80244424_846FF4, 0x00000043, 0x00000001, mac_04_UnkFunc29, 0x00000043, 0x00000001, mac_04_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246458_849028
-.word 0x00000043, 0x00000001, func_8024059C_84316C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_802407C0_843390, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_8024059C_84316C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_04_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802464CC_84909C
 .word 0x0000003C, 0x00000001, 0x8024F5A8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80245728_8482F8, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -162,7 +162,7 @@ glabel D_80248624_84B1F4
 .word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000E, 0x0000203E, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000E, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x0000000E, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000E, 0x003B0311, 0x003B0301, 0x00000000, 0x000600B2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x000000B4, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0303, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0304, 0x00000008, 0x00000001, 0x00000004, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000045, 0x00000002, D_802480E0_84ACB0, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE0B, 0x000000DF, 0x0000000F, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248798_84B368
-.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFF5, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802419AC_84457C, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0xFFFFFE0B, 0x00000014, 0x000000DF, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE06, 0x000000A8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0300, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x00000046, 0x00000001, D_802483B8_84AF88, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80248624_84B1F4, 0x00000043, 0x00000002, func_80241980_844550, 0xFE363C80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248798_84B368, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFF5, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802419AC_84457C, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0xFFFFFE0B, 0x00000014, 0x000000DF, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE06, 0x000000A8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0300, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x00000046, 0x00000001, D_802483B8_84AF88, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80248624_84B1F4, 0x00000043, 0x00000002, mac_04_GetFloorCollider, 0xFE363C80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248798_84B368, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248A14_84B5E4
 .word 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x00010020, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE0180, 0xFFFFFFF8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x000000FA, 0x00000014, 0xFFFFFE6E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x003B0004, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000024, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000017, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000039, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF8, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000039, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80248A14_84B5E4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000045, 0x00000002, D_802480E0_84ACB0, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000000FE, 0xFFFFFFBE, 0x0000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF8405CA2, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
index 5f79fb16b4..f7a167fe62 100644
--- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
@@ -72,10 +72,10 @@ glabel D_80246740_8588B0
 .word 0x00000045, 0x00000002, D_80246574_8586E4, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802465B4_858724, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802467F0_858960
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_05_Set80151310_1, 0x00000043, 0x00000001, mac_05_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245254_8573C4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024597C_857AEC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241A90_853C00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802459F0_857B60, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242384_8544F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241A0C_853B7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241E28_853F98, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246690_858800, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246740_8588B0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241E44_853FB4, 0x00000043, 0x00000001, func_80241CA8_853E18, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000044, 0x00000001, D_802454EC_85765C, 0x00000043, 0x00000001, func_80241898_853A08, 0x00000043, 0x00000001, mac_05_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_05_Set80151310_1, 0x00000043, 0x00000001, mac_05_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245254_8573C4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024597C_857AEC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241A90_853C00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802459F0_857B60, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242384_8544F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241A0C_853B7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241E28_853F98, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246690_858800, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246740_8588B0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241E44_853FB4, 0x00000043, 0x00000001, func_80241CA8_853E18, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000044, 0x00000001, D_802454EC_85765C, 0x00000043, 0x00000001, mac_05_UnkFunc29, 0x00000043, 0x00000001, mac_05_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247520_859690
-.word 0x00000043, 0x00000001, func_8024145C_8535CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80241680_8537F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_8024145C_8535CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_05_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247594_859704
 .word 0x0000003C, 0x00000001, 0x802529D8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_802467F0_858960, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -165,7 +165,7 @@ glabel D_80249D80_85BEF0
 .word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEE3, 0x000001E5, 0x00000028, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFECA, 0x00000174, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEA7, 0x00000174, 0x0000001E, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249E84_85BFF4
-.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80243088_8551F8, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000012, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFC4, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000041, 0x00000000, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802430B4_855224, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000001D, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mac_05_GetFloorCollider, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000012, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFC4, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000041, 0x00000000, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802430B4_855224, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000001D, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A1F8_85C368
 .word 0x00000046, 0x00000001, D_80249E84_85BFF4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x00000041, 0x00000000, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000045, 0x00000002, D_802486EC_85A85C, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000044, 0x00000001, D_80249C34_85BDA4, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60006, 0x00B60006, 0x00000005, 0x00070090, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000044, 0x00000001, D_80249D80_85BEF0, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60005, 0x00000043, 0x00000005, MakeLerp, 0x000001E0, 0x00000174, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFB7, 0xFFFFFFCB, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFB7, 0xFFFFFF24, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFFFFFFCB, 0x00000174, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCB, 0x0000000A, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF24, 0xFE363C80, 0x00000174, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B6000C, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60008, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x00070091, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001DB, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497C80, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A6680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80244314, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60008, 0x00000005, 0x00070092, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x00070093, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001DB, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497C80, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A6680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x00070094, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60002, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s b/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s
index 75ec4d898c..c7fe57b7cf 100644
--- a/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s
+++ b/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s
@@ -15,7 +15,7 @@ glabel D_80241BB4_E10354
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mgm_00_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mgm_00_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241FA4_E10744
-.word 0x00000043, 0x00000001, func_80240034_E0E7D4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242080_E10820, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, mgm_00_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242080_E10820, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242080_E10820
 .word 0x00000043, 0x00000001, mgm_00_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mgm_00_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s b/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s
index bc0552923d..dfc2539bb8 100644
--- a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s
+++ b/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s
@@ -36,7 +36,7 @@ glabel D_802416B0_B992B0
 .word 0x00000000
 
 glabel D_802416B4_B992B4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D6420, 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, mim_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_80241104_B98D04, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024113C_B98D3C, 0xFE363C80, 0x0000004E, 0x00000006, D_802416B4_B992B4, 0x00000010, 0x00000000, dro_01_foliage_setup_shear_mtx, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802410B0_B98CB0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D6420, 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, mim_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_80241104_B98D04, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024113C_B98D3C, 0xFE363C80, 0x0000004E, 0x00000006, D_802416B4_B992B4, 0x00000010, 0x00000000, func_80243880_95EA80, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802410B0_B98CB0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241848_B99448
 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFCE, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE56, 0x0000003A, 0xFFFFFFBA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFE56, 0x0000003A, 0xFFFFFFBA, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0008, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFEB3, 0x00000000, 0xFFFFFFAF, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFF56, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF1E, 0x00000000, 0xFFFFFF0B, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF60, 0x00000000, 0xFFFFFED8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFCF, 0x00000046, 0x00000001, 0x80243620, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s b/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s
index 95b2aa4ca5..09d580e8f3 100644
--- a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s
+++ b/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s
@@ -9,7 +9,7 @@ glabel D_80240C60_BB7CD0
 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFD0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240CE0_BB7D50
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mim_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mim_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_BB70A4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_BB8570, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mim_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mim_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mim_11_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_BB8570, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241500_BB8570
 .word 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mim_11_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mim_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mim_11_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mim_11_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
index 37372c2c8a..1cde03687c 100644
--- a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
@@ -81,7 +81,7 @@ glabel D_802459CC_9CADAC
 .word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245A44_9CAE24
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, func_80240C80_9C6060, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80249810, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80240C2C_9C600C, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, nok_01_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80245A44_9CAE24, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802498E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240AB4_9C5E94, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802459CC_9CADAC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240AB4_9C5E94, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, 0x80249B68, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, nok_01_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, nok_01_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80249810, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, nok_01_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, nok_01_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80245A44_9CAE24, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, 0x802498E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802459CC_9CADAC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, 0x80249B68, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, nok_01_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245F44_9CB324
 .word 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_01/9CB328.data.s b/ver/us/asm/data/world/area_nok/nok_01/9CB328.data.s
index c9f217b846..5c20fba63e 100644
--- a/ver/us/asm/data/world/area_nok/nok_01/9CB328.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_01/9CB328.data.s
@@ -51,10 +51,10 @@ glabel D_802475D4_9CC9B4
 .word 0x00000045, 0x00000002, D_80247408_9CC7E8, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247448_9CC828, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247684_9CCA64
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_01_Set80151310_1, 0x00000043, 0x00000001, nok_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_802460E8_9CB4C8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246810_9CBBF0, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802414D8_9C68B8, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246884_9CBC64, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241DCC_9C71AC, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241454_9C6834, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241870_9C6C50, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247524_9CC904, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802475D4_9CC9B4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024188C_9C6C6C, 0x00000043, 0x00000001, func_802416F0_9C6AD0, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000044, 0x00000001, D_80246380_9CB760, 0x00000043, 0x00000001, func_802412E0_9C66C0, 0x00000043, 0x00000001, nok_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_01_Set80151310_1, 0x00000043, 0x00000001, nok_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_802460E8_9CB4C8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246810_9CBBF0, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802414D8_9C68B8, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246884_9CBC64, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241DCC_9C71AC, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241454_9C6834, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241870_9C6C50, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247524_9CC904, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802475D4_9CC9B4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024188C_9C6C6C, 0x00000043, 0x00000001, func_802416F0_9C6AD0, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000044, 0x00000001, D_80246380_9CB760, 0x00000043, 0x00000001, nok_01_UnkFunc29, 0x00000043, 0x00000001, nok_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802483B4_9CD794
-.word 0x00000043, 0x00000001, func_80240EA4_9C6284, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_802410C8_9C64A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_80240EA4_9C6284, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248428_9CD808
 .word 0x0000003C, 0x00000001, 0x80251C48, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247684_9CCA64, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -144,7 +144,7 @@ glabel D_802497D0_9CEBB0
 .word 0x00000046, 0x00000001, 0x80284054, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802497EC_9CEBCC
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802497D0_9CEBB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x000C0035, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000C0033, 0x00000024, 0x00000002, 0xFE363C88, 0x000C0034, 0x00000024, 0x00000002, 0xFE363C81, 0x000C0036, 0x00000024, 0x00000002, 0xFE363C82, 0x000C0037, 0x00000024, 0x00000002, 0xFE363C83, 0x000C0038, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80242F38, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFEC9, 0x00000055, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_80240B30_9C5F10, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF38, 0x00000035, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFE6F, 0x00000032, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFEB2, 0x00000046, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFE7F, 0xFFFFFFFA, 0xF24A8680, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000A0, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000003, func_80240B30_9C5F10, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE84, 0x00000000, 0x00000005, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEBB, 0x0000004F, 0x00000000, 0x00000044, 0x00000001, 0x80242BD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802497D0_9CEBB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x000C0035, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000C0033, 0x00000024, 0x00000002, 0xFE363C88, 0x000C0034, 0x00000024, 0x00000002, 0xFE363C81, 0x000C0036, 0x00000024, 0x00000002, 0xFE363C82, 0x000C0037, 0x00000024, 0x00000002, 0xFE363C83, 0x000C0038, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80242F38, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFEC9, 0x00000055, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, nok_01_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF38, 0x00000035, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFE6F, 0x00000032, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFEB2, 0x00000046, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFE7F, 0xFFFFFFFA, 0xF24A8680, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000A0, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000003, nok_01_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE84, 0x00000000, 0x00000005, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEBB, 0x0000004F, 0x00000000, 0x00000044, 0x00000001, 0x80242BD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249BF8_9CEFD8
 .word 0x00000046, 0x00000001, D_80248ECC_9CE2AC, 0x00000046, 0x00000001, D_80248F1C_9CE2FC, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80245B9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s
index b8f54d3984..e9c9bb0e67 100644
--- a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_802446A0_9DB6C0
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_02_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_9D7054, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80244EC0_9DBEE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_02_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_02_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80244EC0_9DBEE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244EC0_9DBEE0
 .word 0x00000043, 0x00000001, nok_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_02_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, nok_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
index 825af73806..13ee1ce550 100644
--- a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
@@ -90,10 +90,10 @@ glabel D_80248758_9DF778
 .word 0x00000045, 0x00000002, D_8024858C_9DF5AC, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802485CC_9DF5EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248808_9DF828
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_02_Set80151310_1, 0x00000043, 0x00000001, nok_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024726C_9DE28C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80247994_9DE9B4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242080_9D90A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80247A08_9DEA28, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242974_9D9994, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241FFC_9D901C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242418_9D9438, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802486A8_9DF6C8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248758_9DF778, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242434_9D9454, 0x00000043, 0x00000001, func_80242298_9D92B8, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000044, 0x00000001, D_80247504_9DE524, 0x00000043, 0x00000001, func_80241E88_9D8EA8, 0x00000043, 0x00000001, nok_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_02_Set80151310_1, 0x00000043, 0x00000001, nok_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024726C_9DE28C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80247994_9DE9B4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242080_9D90A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80247A08_9DEA28, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242974_9D9994, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241FFC_9D901C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242418_9D9438, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802486A8_9DF6C8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248758_9DF778, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242434_9D9454, 0x00000043, 0x00000001, func_80242298_9D92B8, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000044, 0x00000001, D_80247504_9DE524, 0x00000043, 0x00000001, nok_02_UnkFunc29, 0x00000043, 0x00000001, nok_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249538_9E0558
-.word 0x00000043, 0x00000001, func_80241A4C_9D8A6C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80241C70_9D8C90, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_80241A4C_9D8A6C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802495AC_9E05CC
 .word 0x0000003C, 0x00000001, 0x802549A8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80248808_9DF828, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_04/9EF338.data.s b/ver/us/asm/data/world/area_nok/nok_04/9EF338.data.s
index b175fa7fb0..fa50f104b3 100644
--- a/ver/us/asm/data/world/area_nok/nok_04/9EF338.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_04/9EF338.data.s
@@ -54,7 +54,7 @@ glabel D_8024337C_9F0F6C
 .word 0x0000004E, 0x00000006, D_80243258_9F0E48, 0x00000010, 0x00000000, D_80243374_9F0F64, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80240E4C_9EEA3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802433B8_9F0FA8
-.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFFFFFF98, 0x00000028, 0x00000002, 0xFE363C82, 0x000000F1, 0x00000029, 0x00000002, 0xFE363C80, 0xFFFFFF9B, 0x00000029, 0x00000002, 0xFE363C82, 0x00000023, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEA2, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7D50, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF33, 0x0000010B, 0x00000028, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF0A, 0x00000122, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0011000A, 0x00110004, 0x00000000, 0x000C00C3, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000046, 0x00000001, D_8024337C_9F0F6C, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF31, 0x0000010C, 0x00000007, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x000C00C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0011000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000006, 0x00000044, 0x00000001, 0x80241328, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00C9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00CA, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00CC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CD, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_80240000_9EDBF0, 0x00000006, 0x00000002, 0x00000043, 0x00000001, func_80240E90_9EEA80, 0x00000044, 0x00000001, 0x80240FE8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018A, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x8024100C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFE70, 0x00000190, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00CF, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFF06, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000014, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D0, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000000, D_8024317C_9F0D6C, 0x00000043, 0x00000003, BindNpcAI, 0x00000000, D_80243110_9F0D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF2C, 0x00000000, 0x000000ED, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000025, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000003, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF01, 0x00000000, 0x0000011F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF3B, 0x00000000, 0x000000E3, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF17, 0x00000000, 0x0000011D, 0x0000000A, 0x00000003, 0x00000001, 0x00000016, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF2E, 0x00000000, 0x000000F4, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000020, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF86, 0x00000000, 0x000000DB, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF4F, 0x00000000, 0x000000F2, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF2B, 0x00000000, 0x0000012C, 0x0000000F, 0x00000003, 0x00000001, 0x00000017, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFF2E, 0x00000000, 0x0000010A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000021, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF9C, 0x00000000, 0x0000010D, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF27, 0x00000000, 0x000000D4, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF03, 0x00000000, 0x0000010E, 0x0000000A, 0x00000003, 0x00000001, 0x00000018, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF49, 0x00000000, 0x00000101, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000022, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000022, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFECF, 0x00000000, 0x00000149, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000032, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEB1, 0x00000000, 0x00000163, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000032, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D1, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFFFFFF98, 0x00000028, 0x00000002, 0xFE363C82, 0x000000F1, 0x00000029, 0x00000002, 0xFE363C80, 0xFFFFFF9B, 0x00000029, 0x00000002, 0xFE363C82, 0x00000023, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEA2, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7D50, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF33, 0x0000010B, 0x00000028, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF0A, 0x00000122, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0011000A, 0x00110004, 0x00000000, 0x000C00C3, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000046, 0x00000001, D_8024337C_9F0F6C, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF31, 0x0000010C, 0x00000007, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x000C00C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0011000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000006, 0x00000044, 0x00000001, 0x80241328, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00C9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00CA, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00CC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CD, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, nok_04_UnkFunc41, 0x00000006, 0x00000002, 0x00000043, 0x00000001, func_80240E90_9EEA80, 0x00000044, 0x00000001, 0x80240FE8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018A, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x8024100C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFE70, 0x00000190, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00CF, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFF06, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000014, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D0, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000000, D_8024317C_9F0D6C, 0x00000043, 0x00000003, BindNpcAI, 0x00000000, D_80243110_9F0D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF2C, 0x00000000, 0x000000ED, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000025, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000003, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF01, 0x00000000, 0x0000011F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF3B, 0x00000000, 0x000000E3, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF17, 0x00000000, 0x0000011D, 0x0000000A, 0x00000003, 0x00000001, 0x00000016, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF2E, 0x00000000, 0x000000F4, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000020, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF86, 0x00000000, 0x000000DB, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF4F, 0x00000000, 0x000000F2, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF2B, 0x00000000, 0x0000012C, 0x0000000F, 0x00000003, 0x00000001, 0x00000017, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFF2E, 0x00000000, 0x0000010A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000021, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF9C, 0x00000000, 0x0000010D, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF27, 0x00000000, 0x000000D4, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF03, 0x00000000, 0x0000010E, 0x0000000A, 0x00000003, 0x00000001, 0x00000018, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF49, 0x00000000, 0x00000101, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000022, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000022, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFECF, 0x00000000, 0x00000149, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000032, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEB1, 0x00000000, 0x00000163, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000032, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D1, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244D0C_9F28FC
 .word 0x00000056, 0x00000000, 0x00000043, 0x00000005, func_80240574_9EE164, 0xFE363C80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x0000002A, 0x00000002, 0xFE363C8A, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFF5, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, func_80240574_9EE164, 0xFE363C80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcPointer, 0x00000000, 0xFE363C8E, 0x00000043, 0x00000003, GetNpcPointer, 0x00000001, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C84, 0x00000004, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C84, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000044, 0x00000001, D_8024303C_9F0C2C, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C83, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8D, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00BF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C89, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000044, 0x00000001, D_802417F8_9EF3E8, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C84, 0x00000004, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C84, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x00000029, 0x00000002, 0xFE363C83, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000044, 0x00000001, D_80242F9C_9F0B8C, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C83, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8D, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C0, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C89, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000044, 0x00000001, D_802417F8_9EF3E8, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000043, 0x00000002, func_80240548_9EE138, 0xFE363C8E, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C1, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000028, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7CE7, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010024, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x00000032, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF0, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000D2, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0006, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, AddKeyItem, 0x00000019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C2, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000044, 0x00000001, D_802433B8_9F0FA8, 0x00000023, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s b/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s
index 1855484b6f..d3b1e2360b 100644
--- a/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_15/A09750.data.s
@@ -6,7 +6,7 @@ glabel D_80242850_A09750
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_15_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, nok_15_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, nok_15_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_15_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242F94_A09E94
-.word 0x00000043, 0x00000001, func_80240034_A06F34, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243070_A09F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, nok_15_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243070_A09F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243070_A09F70
 .word 0x00000043, 0x00000001, nok_15_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, nok_15_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, nok_15_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, nok_15_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, nok_15_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s
index 57669e95a8..7c4f8292ef 100644
--- a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s
+++ b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s
@@ -30,7 +30,7 @@ glabel D_80244158_BC12F8
 .word 0x00000000
 
 glabel D_8024415C_BC12FC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D6420, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_8024415C_BC12FC, 0x00000010, 0x00000000, D_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D6420, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_8024415C_BC12FC, 0x00000010, 0x00000000, obk_01_bss_sym, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802442F0_BC1490
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -39,7 +39,7 @@ glabel D_80244370_BC1510
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D6420, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802442F0_BC1490, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244694_BC1834
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_80244370_BC1510, 0x00000010, 0x00000000, D_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_80244370_BC1510, 0x00000010, 0x00000000, obk_01_bss_sym, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244704_BC18A4
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240EC8_BBE068, 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_80244694_BC1834, 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_802440F4_BC1294, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240F0C_BBE0AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_obk/obk_07/BD1C80.data.s b/ver/us/asm/data/world/area_obk/obk_07/BD1C80.data.s
index f8fe9914a8..020b8e5335 100644
--- a/ver/us/asm/data/world/area_obk/obk_07/BD1C80.data.s
+++ b/ver/us/asm/data/world/area_obk/obk_07/BD1C80.data.s
@@ -60,7 +60,7 @@ glabel D_80244380_BD2F70
 .word 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58D, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFD050F81, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80243F70_BD2B60, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, func_802418E0_BD04D0, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000001, func_802418E0_BD04D0, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000063, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000018, 0x00000001, 0x0000003C, 0x00000018, 0x00000001, 0x00000050, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80243F60_BD2B50, 0x00000024, 0x00000002, 0xFAA2B58D, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFAA2B58D, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80243E94_BD2A84, 0x00000018, 0x00000001, 0x00000063, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80243F60_BD2B50, 0x00000024, 0x00000002, 0xFAA2B58D, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000002D0, 0x00000014, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58D, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80243E94_BD2A84, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802446EC_BD32DC
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241788_BD0378, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, obk_07_UnkFunc36, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244728_BD3318
 .word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000047, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00950008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000002, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s b/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s
index 4c23601a47..57dffcfea9 100644
--- a/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s
+++ b/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80240990_BDB140
-.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001C, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF4C, 0x00000000, 0x00000158, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF4C, 0x00000014, 0x00000158, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x000000BE, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8E80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x00000118, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x0000006E, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E0042, 0x000000A0, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000028, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x01010002, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFF6, 0x00000050, 0xFFFFFFDD, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000001E, 0x00000046, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0043, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0044, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0045, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000E1, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0046, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0047, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB880, 0xF24A5480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000050, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0048, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0049, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004B, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A4A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000028A, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEE8, 0xFFFFFE20, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000028A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000009B, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7B4D, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A3280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00140005, 0x00140009, 0x00000000, 0x000E004C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000026C, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE20, 0xFFFFFEE8, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000280, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E004D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0006, 0x00BF0005, 0x00000000, 0x000E004E, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x00000001, 0x000E004F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF000B, 0x00BF0008, 0x00000000, 0x000E0050, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050008, 0x00050001, 0x00000000, 0x000E0051, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0052, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000028, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0053, 0x00000043, 0x00000003, func_80240000_BDA7B0, 0x00000000, 0x00000009, 0x00000043, 0x00000001, func_80240350_BDAB00, 0x00000044, 0x00000001, 0x80240508, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018D, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240534, 0x00000008, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0005000B, 0x0005000B, 0x00000000, 0x000E0054, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001C, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF4C, 0x00000000, 0x00000158, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF4C, 0x00000014, 0x00000158, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x000000BE, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8E80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x00000118, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x0000006E, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E0042, 0x000000A0, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000028, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x01010002, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFF6, 0x00000050, 0xFFFFFFDD, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000001E, 0x00000046, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0043, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0044, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0045, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000E1, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0046, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0047, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB880, 0xF24A5480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000050, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0048, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0049, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004B, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A4A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000028A, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEE8, 0xFFFFFE20, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000028A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000009B, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7B4D, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A3280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00140005, 0x00140009, 0x00000000, 0x000E004C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000026C, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE20, 0xFFFFFEE8, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000280, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E004D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0006, 0x00BF0005, 0x00000000, 0x000E004E, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x00000001, 0x000E004F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF000B, 0x00BF0008, 0x00000000, 0x000E0050, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050008, 0x00050001, 0x00000000, 0x000E0051, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0052, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000028, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0053, 0x00000043, 0x00000003, obk_09_UnkFunc41, 0x00000000, 0x00000009, 0x00000043, 0x00000001, func_80240350_BDAB00, 0x00000044, 0x00000001, 0x80240508, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018D, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240534, 0x00000008, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0005000B, 0x0005000B, 0x00000000, 0x000E0054, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241830_BDBFE0
 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s
index 5965f5aedc..d5a60a36df 100644
--- a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s
@@ -60,7 +60,7 @@ glabel D_80241EA4_DDE6D4
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802407CC_DDCFFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_UnkFunc22, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240D90_DDD5C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242008_DDE838
-.word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241498_DDDCC8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802408B0_DDD0E0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240BAC_DDD3DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000001, omo_11_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240BAC_DDD3DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, omo_11_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242488_DDECB8
 .word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, D_80242008_DDE838, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, 0x802EA5D0, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s
index 1c5a6ff014..439ad346f1 100644
--- a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s
@@ -24,7 +24,7 @@ glabel D_80241018_DE0328
 .word 0x00000000, 0x00000000, 0x00000000, 0xC1C80000, 0xC0A00000, 0x00000000, 0xC2700000, 0x41F00000, 0x00000000, 0x00000000, 0x00000000, 0x41A00000, 0x00000000
 
 glabel D_8024104C_DE035C
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802402DC_DDF5EC, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF2518280, 0xF24AB680, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060007, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, GetEncounterTriggerHitTier, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001F5, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x006D0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x006D0004, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000006, 0xFE363C82, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000048, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x000F0058, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060006, 0x00060001, 0x00000000, 0x000F0057, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F0059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240FF4_DE0304, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80241018_DE0328, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFF4, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F005A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80240000_DDF310, 0x00000001, 0x00000006, 0x00000043, 0x00000001, func_80240420_DDF730, 0x00000044, 0x00000001, 0x802405E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018E, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240608, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x000000FF, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, CloseMessage, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000F005B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, D_80240F38_DE0248, 0x00000043, 0x00000001, func_802402F8_DDF608, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802402DC_DDF5EC, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF2518280, 0xF24AB680, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060007, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, GetEncounterTriggerHitTier, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001F5, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x006D0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x006D0004, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000006, 0xFE363C82, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000048, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x000F0058, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060006, 0x00060001, 0x00000000, 0x000F0057, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F0059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240FF4_DE0304, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80241018_DE0328, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFF4, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F005A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, omo_12_UnkFunc41, 0x00000001, 0x00000006, 0x00000043, 0x00000001, func_80240420_DDF730, 0x00000044, 0x00000001, 0x802405E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018E, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240608, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x000000FF, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, CloseMessage, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000F005B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, D_80240F38_DE0248, 0x00000043, 0x00000001, func_802402F8_DDF608, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241E60_DE1170
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s
index 2f448baf74..fc41c51e23 100644
--- a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s
@@ -33,7 +33,7 @@ glabel D_80241C0C_DE409C
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D663C, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240F54_DE33E4, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241D40_DE41D0
-.word 0x00000043, 0x00000002, func_80240F8C_DE341C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C0C_DE409C, 0x00000010, 0x00000000, func_80243220_DC04D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F00_DE3390, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80240F8C_DE341C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C0C_DE409C, 0x00000010, 0x00000000, flo_10_npcSettings_80243220, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F00_DE3390, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241D90_DE4220
 .word 0x000000D0, 0xFFFFFFFF
diff --git a/ver/us/asm/data/world/area_osr/osr_00/AAD790.data.s b/ver/us/asm/data/world/area_osr/osr_00/AAD790.data.s
index e98c3420d9..b0bfda5bed 100644
--- a/ver/us/asm/data/world/area_osr/osr_00/AAD790.data.s
+++ b/ver/us/asm/data/world/area_osr/osr_00/AAD790.data.s
@@ -159,4 +159,4 @@ glabel D_80242E48_AAF678
 .word 0x00870000, 0x00870001, 0x00870004, 0xFFFFFFFF
 
 glabel D_80242E58_AAF688
-.word 0x0000000C, D_80241250_AADA80, 0xC1C80000, 0x00000000, 0x43480000, 0x00002D09, D_802416CC_AADEFC, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, D_80242E38_AAF668, 0x00000000, 0x0000000D, D_80241250_AADA80, 0xC2480000, 0x00000000, 0xC3480000, 0x00002D09, D_80241720_AADF50, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, D_80242E48_AAF678, 0x00000000, 0x0000000E, D_80241250_AADA80, 0x440C0000, 0x41A00000, 0x42C80000, 0x00002D09, D_80241818_AAE048, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00000000, 0x00000000, D_80242E48_AAF678, 0x00000000, 0x00000003, D_80241888_AAE0B8, 0x00000000, 0x00000004, D_80241E88_AAE6B8, 0x00000000, 0x00000002, D_80242668_AAEE98, 0x00000000, 0x00000002, D_80242A58_AAF288, 0x00000000, 0x00000003, D_80242E58_AAF688, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000307, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000014, 0xFFFFFFED, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, func_80240380_AACBB0, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, func_80240380_AACBB0, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000007, func_80240678_AACEA8, 0x000000C8, 0x000000C8, 0x000000C8, 0x00000028, 0x00000028, 0x00000028, 0x00000043, 0x00000001, func_802406E0_AACF10, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000022, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000023, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x802437B0, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2550680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8880, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24B6A80, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF06, 0x00000096, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0082001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFF38, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0082001C, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, GotoMap, 0x802437B8, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x0000000C, D_80241250_AADA80, 0xC1C80000, 0x00000000, 0x43480000, 0x00002D09, D_802416CC_AADEFC, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, D_80242E38_AAF668, 0x00000000, 0x0000000D, D_80241250_AADA80, 0xC2480000, 0x00000000, 0xC3480000, 0x00002D09, D_80241720_AADF50, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, D_80242E48_AAF678, 0x00000000, 0x0000000E, D_80241250_AADA80, 0x440C0000, 0x41A00000, 0x42C80000, 0x00002D09, D_80241818_AAE048, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00000000, 0x00000000, D_80242E48_AAF678, 0x00000000, 0x00000003, D_80241888_AAE0B8, 0x00000000, 0x00000004, D_80241E88_AAE6B8, 0x00000000, 0x00000002, D_80242668_AAEE98, 0x00000000, 0x00000002, D_80242A58_AAF288, 0x00000000, 0x00000003, D_80242E58_AAF688, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000307, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000014, 0xFFFFFFED, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, osr_00_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, osr_00_UnkFunc27, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000007, func_80240678_AACEA8, 0x000000C8, 0x000000C8, 0x000000C8, 0x00000028, 0x00000028, 0x00000028, 0x00000043, 0x00000001, func_802406E0_AACF10, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000022, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00000023, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x802437B0, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2550680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8880, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24B6A80, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF06, 0x00000096, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0082001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0xFFFFFF38, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0082001C, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, GotoMap, 0x802437B8, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s b/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s
index 7e8af2e32e..ada31ddda9 100644
--- a/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s
@@ -12,7 +12,7 @@ glabel D_80242E00_D52DF0
 .word 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000031, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242ED0_D52EC0
-.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003E, 0x0000208B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000031, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241478_D51468, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8406153, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF06, 0x000000FA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000029, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406153, 0x00000001, 0x00000044, 0x00000001, D_80242ED0_D52EC0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF06, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000020, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406153, 0x00000000, 0x00000044, 0x00000001, D_80242ED0_D52EC0, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x0000003C, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x00000078, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x000000B4, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFFC4, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFF88, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFF4C, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000003F, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000FA, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8080, 0x00000043, 0x00000002, PlaySound, 0x00000040, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000046, 0x00000001, D_802419EC_D519DC, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406153, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000031, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000038, 0x00000001, 0x00000046, 0x00000001, D_80242E00_D52DF0, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000031, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000038, 0x00000000, 0x00000046, 0x00000001, D_80242E00_D52DF0, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003E, 0x0000208B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000031, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_02_UnkFunc44, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8406153, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF06, 0x000000FA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000029, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406153, 0x00000001, 0x00000044, 0x00000001, D_80242ED0_D52EC0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF06, 0x00000000, 0x000000FA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000020, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406153, 0x00000000, 0x00000044, 0x00000001, D_80242ED0_D52EC0, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x0000003C, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x00000078, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0x000000B4, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFFC4, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFF88, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x000003E8, 0x000000FA, 0xFFFFFF4C, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000003F, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000FA, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8080, 0x00000043, 0x00000002, PlaySound, 0x00000040, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000046, 0x00000001, D_802419EC_D519DC, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406153, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000031, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000038, 0x00000001, 0x00000046, 0x00000001, D_80242E00_D52DF0, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000031, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000038, 0x00000000, 0x00000046, 0x00000001, D_80242E00_D52DF0, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024346C_D5345C
 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
index 1aa1448289..bca1153bca 100644
--- a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
@@ -39,7 +39,7 @@ glabel D_80241D9C_D5A62C
 .word 0x00000000
 
 glabel D_80241DA0_D5A630
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D6420, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D59A30, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, D_80246A20, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D6420, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D59A30, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, pra_09_bss_sym, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241F34_D5A7C4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D663C, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D59A30, 0xFE363C8A, 0x00000043, 0x00000001, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D59B04, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F34_D5A7C4, 0x00000010, 0x00000000, D_80246BE8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
index a4f69a250a..3741e211d4 100644
--- a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
@@ -159,10 +159,10 @@ glabel D_80244D28_CFC898
 .word 0x00000045, 0x00000002, D_80244B5C_CFC6CC, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80244B9C_CFC70C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244DD8_CFC948
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_01_Set80151310_1, 0x00000043, 0x00000001, sam_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024383C_CFB3AC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243F64_CFBAD4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240E70_CF89E0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243FD8_CFBB48, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241764_CF92D4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240DEC_CF895C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241208_CF8D78, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80244C78_CFC7E8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244D28_CFC898, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241224_CF8D94, 0x00000043, 0x00000001, func_80241088_CF8BF8, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000044, 0x00000001, D_80243AD4_CFB644, 0x00000043, 0x00000001, func_80240C78_CF87E8, 0x00000043, 0x00000001, sam_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_01_Set80151310_1, 0x00000043, 0x00000001, sam_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024383C_CFB3AC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243F64_CFBAD4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240E70_CF89E0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243FD8_CFBB48, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241764_CF92D4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240DEC_CF895C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241208_CF8D78, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80244C78_CFC7E8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244D28_CFC898, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241224_CF8D94, 0x00000043, 0x00000001, func_80241088_CF8BF8, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000044, 0x00000001, D_80243AD4_CFB644, 0x00000043, 0x00000001, sam_01_UnkFunc29, 0x00000043, 0x00000001, sam_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245B08_CFD678
-.word 0x00000043, 0x00000001, func_8024083C_CF83AC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80240A60_CF85D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_8024083C_CF83AC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245B7C_CFD6EC
 .word 0x0000003C, 0x00000001, 0x8024DF00, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80244DD8_CFC948, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s b/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s
index ce8dd78322..841dba411d 100644
--- a/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s
@@ -6,7 +6,7 @@ glabel D_80241D10_D07440
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, sam_02_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, sam_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242454_D07B84
-.word 0x00000043, 0x00000001, func_80240034_D05764, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242530_D07C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, sam_02_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242530_D07C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242530_D07C60
 .word 0x00000043, 0x00000001, sam_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, sam_02_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, sam_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, sam_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
index 309e05192d..2aab4633cc 100644
--- a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
@@ -72,7 +72,7 @@ glabel D_8024658C_D0BCBC
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802466E4_D0BE14
-.word 0x00000043, 0x00000004, func_80240A44_D06174, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249218_D0E948, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_802409F0_D06120, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, sam_02_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024658C_D0BCBC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_02_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802492D0_D0EA00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240878_D05FA8, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246514_D0BC44, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_02_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80240878_D05FA8, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024953C_D0EC6C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, sam_02_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, sam_02_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249218_D0E948, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, sam_02_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, sam_02_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024658C_D0BCBC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_02_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802492D0_D0EA00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_02_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246514_D0BC44, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_02_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_02_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024953C_D0EC6C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, sam_02_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246A8C_D0C1BC
 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001
@@ -141,10 +141,10 @@ glabel D_802481F0_D0D920
 .word 0x00000045, 0x00000002, D_80248024_D0D754, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80248064_D0D794, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802482A0_D0D9D0
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_02_Set80151310_1, 0x00000043, 0x00000001, sam_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80246D04_D0C434, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024742C_D0CB5C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024129C_D069CC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802474A0_D0CBD0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241B90_D072C0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, begin_battle_D06948, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241634_D06D64, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248140_D0D870, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802481F0_D0D920, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241650_D06D80, 0x00000043, 0x00000001, func_802414B4_D06BE4, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000044, 0x00000001, D_80246F9C_D0C6CC, 0x00000043, 0x00000001, func_802410A4_D067D4, 0x00000043, 0x00000001, sam_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_02_Set80151310_1, 0x00000043, 0x00000001, sam_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80246D04_D0C434, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024742C_D0CB5C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024129C_D069CC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802474A0_D0CBD0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241B90_D072C0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, begin_battle_D06948, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241634_D06D64, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248140_D0D870, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802481F0_D0D920, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241650_D06D80, 0x00000043, 0x00000001, func_802414B4_D06BE4, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000044, 0x00000001, D_80246F9C_D0C6CC, 0x00000043, 0x00000001, sam_02_UnkFunc29, 0x00000043, 0x00000001, sam_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248FD0_D0E700
-.word 0x00000043, 0x00000001, func_80240C68_D06398, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80240E8C_D065BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_80240C68_D06398, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249044_D0E774
 .word 0x0000003C, 0x00000001, 0x8024B998, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_802482A0_D0D9D0, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -171,7 +171,7 @@ glabel D_80249218_D0E948
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x0012006B, 0x00000024, 0x00000002, 0xFE363C88, 0x0012006C, 0x00000024, 0x00000002, 0xFE363C81, 0x0012006D, 0x00000024, 0x00000002, 0xFE363C82, 0x0012006E, 0x00000024, 0x00000002, 0xFE363C83, 0x0012006F, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005A, 0x0000000A, 0x00000002, 0xF840611F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00120070, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802492D0_D0EA00
-.word 0x00000044, 0x00000001, 0x80241CDC, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000126, 0xFFFFFF2B, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, func_802408F4_D06024, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000041, 0xFFFFFFDC, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000006F, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000225, 0xFFFFFFFB, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000013B, 0xFFFFFF55, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000017, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000112, 0xFFFFFEF2, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000051, 0x00000043, 0x00000003, func_802408F4_D06024, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, 0x80241CDC, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000126, 0xFFFFFF2B, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, sam_02_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000041, 0xFFFFFFDC, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000006F, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000225, 0xFFFFFFFB, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000013B, 0xFFFFFF55, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000017, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000112, 0xFFFFFEF2, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000051, 0x00000043, 0x00000003, sam_02_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024953C_D0EC6C
 .word 0x0000000A, 0x00000002, 0xF840611E, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000024, 0x00000002, 0xF840611E, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x000000AF, 0x0000015D, 0x00000019, 0xFFFFFEE8, 0x00000011, 0xF840611E, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005A, 0x0000000A, 0x00000002, 0xF840611F, 0x00000000, 0x00000024, 0x00000002, 0xF840611F, 0x00000001, 0x00000044, 0x00000001, D_8024B550_D10C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000115, 0x00000000, 0xFFFFFF00, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000150, 0xFFFFFF39, 0x00000000, 0x00000044, 0x00000001, 0x80241C40, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s
index f5861de5c5..09bc153407 100644
--- a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s
@@ -138,7 +138,7 @@ glabel D_8024693C_D267CC
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246A94_D26924
-.word 0x00000043, 0x00000004, func_80242164_D21FF4, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249A50_D298E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, func_80242110_D21FA0, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, sam_06_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024693C_D267CC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80249AB0_D29940, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80241F98_D21E28, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802468C4_D26754, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_80241F98_D21E28, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249D1C_D29BAC, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, sam_06_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, sam_06_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249A50_D298E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, sam_06_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, sam_06_Call800E9894, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024693C_D267CC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_GetPartnerCall800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80249AB0_D29940, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_06_UnkFunc32, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802468C4_D26754, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_Call800EB168, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_06_UnkFunc32, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249D1C_D29BAC, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, sam_06_Call800E98C4SyncStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246E3C_D26CCC
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -222,7 +222,7 @@ glabel D_80249A50_D298E0
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00120116, 0x00000024, 0x00000002, 0xFE363C88, 0x00120117, 0x00000024, 0x00000002, 0xFE363C81, 0x00120118, 0x00000024, 0x00000002, 0xFE363C82, 0x00120119, 0x00000024, 0x00000002, 0xFE363C83, 0x0012011A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249AB0_D29940
-.word 0x00000044, 0x00000001, 0x8024269C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEB0, 0xFFFFFFD0, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, func_80242014_D21EA4, 0x00000000, 0xF24B1A80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B4280, 0xF24A3A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24C3680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2490A80, 0xF24BF280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF245821A, 0xF249EC80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF2407680, 0xF24C6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEA5, 0xFFFFFF8E, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000051, 0x00000043, 0x00000003, func_80242014_D21EA4, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000044, 0x00000001, 0x8024269C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEB0, 0xFFFFFFD0, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, sam_06_CamSetFOV, 0x00000000, 0xF24B1A80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B4280, 0xF24A3A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24C3680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2490A80, 0xF24BF280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF245821A, 0xF249EC80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF2407680, 0xF24C6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEA5, 0xFFFFFF8E, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E5, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000051, 0x00000043, 0x00000003, sam_06_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249D1C_D29BAC
 .word 0x00000044, 0x00000001, 0x80242670, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEA5, 0xFFFFFF8E, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFECB, 0xFFFFFFF0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s
index a207425749..0d60d96d50 100644
--- a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s
@@ -27,7 +27,7 @@ glabel D_80241B44_D317C4
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sam_08_UnkFunc21, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_D2FCBC, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sam_08_UnkFunc22, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_D30280, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241CA8_D31928
-.word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_D30988, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_D2FDA0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_D3009C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_D3009C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242128_D31DA8
 .word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, D_80241CA8_D31928, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
index 18a369cc60..fd1b5c7edf 100644
--- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
@@ -168,10 +168,10 @@ glabel D_80246608_D40BD8
 .word 0x00000045, 0x00000002, D_8024643C_D40A0C, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_8024647C_D40A4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802466B8_D40C88
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, dup_sam_11_Set80151310_1, 0x00000043, 0x00000001, sam_11_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024511C_D3F6EC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245844_D3FE14, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240F40_D3B510, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802458B8_D3FE88, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241834_D3BE04, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240EBC_D3B48C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802412D8_D3B8A8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246558_D40B28, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246608_D40BD8, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802412F4_D3B8C4, 0x00000043, 0x00000001, func_80241158_D3B728, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000044, 0x00000001, D_802453B4_D3F984, 0x00000043, 0x00000001, func_80240D48_D3B318, 0x00000043, 0x00000001, dup_sam_11_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, dup_sam_11_Set80151310_1, 0x00000043, 0x00000001, sam_11_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024511C_D3F6EC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245844_D3FE14, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240F40_D3B510, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802458B8_D3FE88, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241834_D3BE04, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240EBC_D3B48C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802412D8_D3B8A8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246558_D40B28, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246608_D40BD8, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802412F4_D3B8C4, 0x00000043, 0x00000001, func_80241158_D3B728, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000044, 0x00000001, D_802453B4_D3F984, 0x00000043, 0x00000001, sam_11_UnkFunc29, 0x00000043, 0x00000001, dup_sam_11_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802473E8_D419B8
-.word 0x00000043, 0x00000001, func_8024090C_D3AEDC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, func_80240B30_D3B100, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, func_8024090C_D3AEDC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_11_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024745C_D41A2C
 .word 0x0000003C, 0x00000001, 0x80251458, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_802466B8_D40C88, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s
index 2389bb5dec..4e573c380b 100644
--- a/ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s
+++ b/ver/us/asm/data/world/area_sbk/sbk_02/92B500.data.s
@@ -15,7 +15,7 @@ glabel D_80241424_92B6D4
 .word 0x0000007E, 0x00000080, 0x0000FFFF
 
 glabel D_80241430_92B6E0
-.word 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000001, D_80241418_92B6C8, 0x00000000, 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000000, D_80241424_92B6D4, 0x00000000, 0x00000043, 0x00000008, func_80240364_92A614, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_80240364_92A614, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, D_80241418_92B6C8, 0x00000000, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000000, D_80241424_92B6D4, 0x00000000, 0x00000043, 0x00000008, func_80240364_92A614, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_80240364_92A614, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802414FC_92B7AC
 .word 0x00000043, 0x00000003, SetRenderMode, 0x00000080, 0x00000016, 0x00000043, 0x00000003, EnableTexPanning, 0x00000080, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00002710, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000001, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00001770, 0x00000027, 0x00000002, 0xFE363C81, 0x00001388, 0x00000027, 0x00000002, 0xFE363C82, 0x00000FA0, 0x0000000D, 0x00000002, 0xFE363C80, 0x00020000, 0x00000028, 0x00000002, 0xFE363C80, 0x00020000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C81, 0x00020000, 0x00000028, 0x00000002, 0xFE363C81, 0x00020000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x00020000, 0x00000028, 0x00000002, 0xFE363C82, 0x00020000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -63,4 +63,4 @@ glabel D_80243310_92D5C0
 .word 0x00000043, 0x00000006, PlaySoundAt, 0x0000005E, 0x00000000, 0x00000000, 0x00000027, 0xFFFFFFB0, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF4C, 0x000000B4, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000078, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000079, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0x0000003D, 0x00000002, 0xFFFFFFAD, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0x0000003D, 0x00000002, 0xFFFFFFAD, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFFFFFFC3, 0x00000002, 0xFFFFFFAD, 0x00000014, 0x0000000A, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000002, 0xFFFFFFC3, 0x00000002, 0xFFFFFFAD, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024358C_92D83C
-.word 0x00000043, 0x00000002, DisablePulseStone, 0x00000001, 0x00000043, 0x00000001, func_802D6420, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D6954, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, func_802D6954, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC2, 0x00000043, 0x00000001, func_80240338_92A5E8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000083, 0x00000001, 0x00000008, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000000, 0x00000089, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24CD280, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2437280, 0xF242AA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000046, 0x00000001, D_802427F4_92CAA4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000078, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241258_92B508, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000050, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0x00000050, 0x00000000, 0x00000043, 0x00000004, func_802D2884, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241430_92B6E0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, CloneModel, 0x00000080, 0x00002710, 0x00000044, 0x00000001, D_802414FC_92B7AC, 0x00000044, 0x00000001, D_80241678_92B928, 0x00000044, 0x00000001, D_80241790_92BA40, 0x00000008, 0x00000001, 0x00000064, 0x00000044, 0x00000001, D_80241B38_92BDE8, 0x00000008, 0x00000001, 0x00000096, 0x00000044, 0x00000001, D_80241DE0_92C090, 0x00000044, 0x00000001, D_802431C0_92D470, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000050, 0x00000044, 0x00000001, D_802428A4_92CB54, 0x00000008, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000032, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802455F0, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802455F0, 0x00000005, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC1, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000018, 0x00000001, 0xFFFFFFC2, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x0000004E, 0x00000006, D_8024358C_92D83C, 0x00000100, 0x0000000D, D_80241250_92B500, 0x00000000, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000007D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000005C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000043, 0x00000004, func_802D2884, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000190, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000000, 0x00000089, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24CD280, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2437280, 0xF242AA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000001, D_80241418_92B6C8, 0x00000000, 0x00000043, 0x00000004, func_80240040_92A2F0, 0x00000000, D_80241424_92B6D4, 0x00000000, 0x00000043, 0x00000008, func_80240364_92A614, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802422F0_92C5A0, 0x00000044, 0x00000001, D_80243268_92D518, 0x00000043, 0x00000003, CloneModel, 0x00000080, 0x00002710, 0x00000044, 0x00000001, D_802414FC_92B7AC, 0x00000044, 0x00000001, D_802418B4_92BB64, 0x00000044, 0x00000001, D_802419F0_92BCA0, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_80241C90_92BF40, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A6080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF256D280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000044, 0x00000001, D_80242928_92CBD8, 0x00000008, 0x00000001, 0x00000064, 0x00000046, 0x00000001, D_80243310_92D5C0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000002, DisablePulseStone, 0x00000001, 0x00000043, 0x00000001, func_802D6420, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D6954, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, func_802D6954, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC2, 0x00000043, 0x00000001, func_80240338_92A5E8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000083, 0x00000001, 0x00000008, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000000, 0x00000089, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24CD280, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2437280, 0xF242AA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000046, 0x00000001, D_802427F4_92CAA4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000078, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241258_92B508, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000050, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0x00000050, 0x00000000, 0x00000043, 0x00000004, func_802D2884, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241430_92B6E0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, CloneModel, 0x00000080, 0x00002710, 0x00000044, 0x00000001, D_802414FC_92B7AC, 0x00000044, 0x00000001, D_80241678_92B928, 0x00000044, 0x00000001, D_80241790_92BA40, 0x00000008, 0x00000001, 0x00000064, 0x00000044, 0x00000001, D_80241B38_92BDE8, 0x00000008, 0x00000001, 0x00000096, 0x00000044, 0x00000001, D_80241DE0_92C090, 0x00000044, 0x00000001, D_802431C0_92D470, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000050, 0x00000044, 0x00000001, D_802428A4_92CB54, 0x00000008, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000032, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802455F0, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802455F0, 0x00000005, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC1, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000018, 0x00000001, 0xFFFFFFC2, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x0000004E, 0x00000006, D_8024358C_92D83C, 0x00000100, 0x0000000D, D_80241250_92B500, 0x00000000, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000007D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000007E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000005C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802CF56C, 0x00000001, 0x00000043, 0x00000004, func_802D2884, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000190, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000000, 0x00000089, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24CD280, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2437280, 0xF242AA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000001, D_80241418_92B6C8, 0x00000000, 0x00000043, 0x00000004, sbk_02_UnkFunc27, 0x00000000, D_80241424_92B6D4, 0x00000000, 0x00000043, 0x00000008, func_80240364_92A614, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802422F0_92C5A0, 0x00000044, 0x00000001, D_80243268_92D518, 0x00000043, 0x00000003, CloneModel, 0x00000080, 0x00002710, 0x00000044, 0x00000001, D_802414FC_92B7AC, 0x00000044, 0x00000001, D_802418B4_92BB64, 0x00000044, 0x00000001, D_802419F0_92BCA0, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_80241C90_92BF40, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A6080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF256D280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000044, 0x00000001, D_80242928_92CBD8, 0x00000008, 0x00000001, 0x00000064, 0x00000046, 0x00000001, D_80243310_92D5C0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s
index 06b61a4493..0ff9395fe0 100644
--- a/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s
+++ b/ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s
@@ -18,7 +18,7 @@ glabel D_80244054_92E304
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, func_802D663C, 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, func_802D6954, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel 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, dro_01_80245630, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024091C_92ABCC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802441D8_92E488
 .word 0x00000000
diff --git a/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s b/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s
index 67da9c4978..f735c5c382 100644
--- a/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s
+++ b/ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s
@@ -27,7 +27,7 @@ glabel D_80241B20_9410D0
 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EBE, 0x00000000, 0x00000024, 0x00000002, 0xF8405EBE, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBB, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241AA0_941050, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241BEC_94119C
-.word 0x00000043, 0x00000002, PlaySound, 0x80000060, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000C1, 0x00000000, 0xFFFFFF13, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000C1, 0x00000000, 0xFFFFFF13, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, func_80240040_93F5F0, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, func_80240040_93F5F0, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x0000000B, func_80240164_93F714, 0x00000003, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7B80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, GotoMap, 0x80244890, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244890, 0x00000004, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, PlaySound, 0x80000060, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000C1, 0x00000000, 0xFFFFFF13, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000C1, 0x00000000, 0xFFFFFF13, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, sbk_30_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x00000004, sbk_30_UnkFunc27, 0x00000001, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x0000000B, sbk_30_UnkFunc26, 0x00000003, 0x0000002C, 0x00000020, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000012C, 0xF24A7B80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, GotoMap, 0x80244890, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244890, 0x00000004, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241D90_941340
 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFCC, 0x00000043, 0x00000003, EnableGroup, 0x0000002C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80243DF8_9433A8, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000002A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802418B0_940E60, 0x00000044, 0x00000001, D_80241B20_9410D0, 0x00000044, 0x00000001, D_802447DC_943D8C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_80241BEC_94119C, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, sbk_30_SpawnSunEffect, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s
index d85d294e5b..9c75c91ca0 100644
--- a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s
+++ b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s
@@ -18,7 +18,7 @@ glabel D_80241494_955454
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802400BC_95407C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_UnkFunc22, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240680_954640, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802415F8_9555B8
-.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D88_954D48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802401A0_954160, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024049C_95445C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, sbk_56_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, sbk_56_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
+.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024049C_95445C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, sbk_56_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, sbk_56_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
 
 glabel D_80241E60_955E20
 .word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 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, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s b/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s
index adaabadd57..f659a7a627 100644
--- a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s
@@ -6,7 +6,7 @@ glabel D_80240B80_86A030
 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240C1C_86A0CC
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_01_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240340_8697F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024143C_86A8EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_01_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_01_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024143C_86A8EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024143C_86A8EC
 .word 0x00000043, 0x00000001, tik_01_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_01_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_01_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s b/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s
index 2f49a28dc7..da21ffc187 100644
--- a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s
@@ -6,7 +6,7 @@ glabel D_80240B70_86F670
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_03_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240EC4_86F9C4
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_86EB34, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241390_86FE90, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_03_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241390_86FE90, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241390_86FE90
 .word 0x00000043, 0x00000001, tik_03_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_03_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s b/ver/us/asm/data/world/area_tik/tik_04/872750.data.s
index 2513bc43fb..286cd23097 100644
--- a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_04/872750.data.s
@@ -12,7 +12,7 @@ glabel D_80241110_872B40
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_04_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_04_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241500_872F30
-.word 0x00000043, 0x00000001, func_80240340_871D70, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802415DC_87300C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, tik_04_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802415DC_87300C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802415DC_87300C
 .word 0x00000043, 0x00000001, tik_04_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_04_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s b/ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s
index 2d143020a4..2c6e55c17f 100644
--- a/ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80242890_8742C0
-.word 0x00000043, 0x00000002, func_80240BF4_872624, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240C20_872650, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7680, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24AF280, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFFFFFFF6, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x0000000C, 0x00000002, 0xFE363C80, 0xF2489A80, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240BF4_872624, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240C20_872650, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7680, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24AF280, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFFFFFFF6, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240BF4_872624, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, tik_04_GetFloorCollider, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240C20_872650, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7680, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24AF280, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFFFFFFF6, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x0000000C, 0x00000002, 0xFE363C80, 0xF2489A80, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_04_GetFloorCollider, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240C20_872650, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7680, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24AF280, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFFFFFFF6, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_04_GetFloorCollider, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242B6C_87459C
 .word 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000009, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000B, 0x00000046, 0x00000001, D_80242890_8742C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000009, 0x00000012, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000B, 0x00000014, 0x00000043, 0x00000005, TranslateModel, 0x00000012, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000014, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000009, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000047, 0x00000005, D_80242B6C_87459C, 0x00000080, 0x00000009, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000002, 0xFD050F80, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240960_872390, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s b/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s
index 15b6486f24..f6554de930 100644
--- a/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s
@@ -9,7 +9,7 @@ glabel D_80240D64_877C44
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_06_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_06_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241154_878034
-.word 0x00000043, 0x00000001, func_80240034_876F14, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241230_878110, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, tik_06_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241230_878110, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241230_878110
 .word 0x00000043, 0x00000001, tik_06_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_06_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s b/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s
index c6e4a00d47..302b73f206 100644
--- a/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s
@@ -6,7 +6,7 @@ glabel D_80242990_87C570
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_07_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_07_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_07_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_07_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802430D4_87CCB4
-.word 0x00000043, 0x00000001, func_80240034_879C14, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802431B0_87CD90, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, tik_07_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802431B0_87CD90, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802431B0_87CD90
 .word 0x00000043, 0x00000001, tik_07_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_07_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_07_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_07_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s
index 8ae0f9f44d..aecc51bd90 100644
--- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s
@@ -18,7 +18,7 @@ glabel D_80243A54_87D634
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024031C_879EFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_UnkFunc22, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408E0_87A4C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243BB8_87D798
-.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240FE8_87ABC8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240400_879FE0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802406FC_87A2DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000001, tik_07_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802406FC_87A2DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_07_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802440C0_87DCA0
 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s
index 73facf6144..be11ecddd8 100644
--- a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s
@@ -6,7 +6,7 @@ glabel D_80240BB0_87F9A0
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_08_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240F04_87FCF4
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_08_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_87EE24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413D0_8801C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_08_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_08_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413D0_8801C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802413D0_8801C0
 .word 0x00000043, 0x00000001, tik_08_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_08_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s b/ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s
index 201726b3d5..e5fcae5a6d 100644
--- a/ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s
@@ -9,7 +9,7 @@ glabel D_80242C0E_8819FE
 .short 0x1B00, 0x0000, 0x1B01, 0x0000, 0x1B02
 
 glabel D_80242C18_881A08
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80240A30_87F820, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240B7C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080000, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DC, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF06, 0xFFFFFFC4, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFC7, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFC4, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_08_GetFloorCollider, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240B7C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080000, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DC, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF06, 0xFFFFFFC4, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFC7, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFC4, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242EC0_881CB0
 .word 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00500004, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000870, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DD, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFF06, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80242980_881770, 0x0000000A, 0x00000002, 0xF8405D2B, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2B, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2C, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2F, 0x00000001, 0x00000044, 0x00000001, 0x80240B50, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s
index d157ecd00d..c66e65a1ee 100644
--- a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel D_80241340_883500
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_09_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_09_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_8821F4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B60_883D20, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_09_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_09_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_09_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B60_883D20, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241B60_883D20
 .word 0x00000043, 0x00000001, tik_09_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_09_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_09_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_09_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s
index e40757f2f4..67e0a0a792 100644
--- a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s
@@ -18,4 +18,4 @@ glabel D_80242094_888454
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406BC_886A7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_UnkFunc22, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C80_887040, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802421F8_8885B8
-.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241388_887748, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802407A0_886B60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A9C_886E5C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000001, tik_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A9C_886E5C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s b/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s
index bbe9727508..7f82304b66 100644
--- a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s
@@ -6,7 +6,7 @@ glabel D_802422D0_88AEA0
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_12_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242624_88B1F4
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_12_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_888C04, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242AF0_88B6C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_12_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_12_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242AF0_88B6C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242AF0_88B6C0
 .word 0x00000043, 0x00000001, tik_12_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_12_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s
index cdc8d42085..6fd8bd2f16 100644
--- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s
@@ -21,7 +21,7 @@ glabel D_80243D10_88C8E0
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C58_889828, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_UnkFunc22, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024121C_889DEC, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243E74_88CA44
-.word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241924_88A4F4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240D3C_88990C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80241038_889C08, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000001, tik_12_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_12_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80241038_889C08, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_12_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802442F4_88CEC4
 .word 0x00000024, 0x00000002, 0xF8405D0B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s b/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s
index 3e4fa8cc47..f53907281b 100644
--- a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s
@@ -6,7 +6,7 @@ glabel D_802409F0_88DFF0
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_14_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240D44_88E344
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_14_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_88D634, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241210_88E810, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_14_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_14_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241210_88E810, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241210_88E810
 .word 0x00000043, 0x00000001, tik_14_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_14_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s b/ver/us/asm/data/world/area_tik/tik_15/890740.data.s
index b91a4a297b..701feb6748 100644
--- a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_15/890740.data.s
@@ -6,7 +6,7 @@ glabel D_80240BA0_890740
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_15_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240EF4_890A94
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_15_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_88FBD4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413C0_890F60, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_15_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_15_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413C0_890F60, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802413C0_890F60
 .word 0x00000043, 0x00000001, tik_15_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_15_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s
index 55c6efe738..ab246841f6 100644
--- a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s
@@ -18,4 +18,4 @@ glabel D_80241484_893EA4
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024006C_892A8C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_UnkFunc22, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240630_893050, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802415E8_894008
-.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D38_893758, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240150_892B70, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024044C_892E6C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000001, tik_17_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024044C_892E6C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_17_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s b/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s
index a1a32c4ed6..07243a356e 100644
--- a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s
@@ -9,7 +9,7 @@ glabel D_80241E24_894844
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_17_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_17_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242214_894C34
-.word 0x00000043, 0x00000001, func_80240DA4_8937C4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422F0_894D10, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, tik_17_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422F0_894D10, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802422F0_894D10
 .word 0x00000043, 0x00000001, tik_17_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_17_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s b/ver/us/asm/data/world/area_tik/tik_19/898990.data.s
index 629b8216a8..737610dcf0 100644
--- a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_19/898990.data.s
@@ -6,7 +6,7 @@ glabel D_802413B0_898990
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_19_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241704_898CE4
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_19_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_897614, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241BD0_8991B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_19_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_19_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241BD0_8991B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241BD0_8991B0
 .word 0x00000043, 0x00000001, tik_19_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_19_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s
index a26d20504e..5d4b12d451 100644
--- a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s
@@ -18,4 +18,4 @@ glabel D_80242714_899CF4
 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024062C_897C0C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_UnkFunc22, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240BF0_8981D0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242878_899E58
-.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802412F8_8988D8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240710_897CF0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A0C_897FEC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000001, tik_19_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A0C_897FEC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_19_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s
index 9c4b9fa076..c342649b95 100644
--- a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s
@@ -9,7 +9,7 @@ glabel D_8024127C_89B5CC
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_20_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802419C0_89BD10
-.word 0x00000043, 0x00000001, func_80240340_89A690, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241A9C_89BDEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, tik_20_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241A9C_89BDEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241A9C_89BDEC
 .word 0x00000043, 0x00000001, tik_20_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_20_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_20_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s
index 1ed15dbce8..58f8eb32de 100644
--- a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s
@@ -9,7 +9,7 @@ glabel D_80240A9C_89E23C
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_21_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_21_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802411E0_89E980
-.word 0x00000043, 0x00000001, func_80240340_89DAE0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802412BC_89EA5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, tik_21_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802412BC_89EA5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802412BC_89EA5C
 .word 0x00000043, 0x00000001, tik_21_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_21_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_21_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_21_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s
index efd8d37ea8..8280cfe69e 100644
--- a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s
@@ -9,7 +9,7 @@ glabel D_80240B0C_8A09CC
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_22_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_22_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241250_8A1110
-.word 0x00000043, 0x00000001, func_80240370_8A0230, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024132C_8A11EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000001, tik_22_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024132C_8A11EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024132C_8A11EC
 .word 0x00000043, 0x00000001, tik_22_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_22_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_22_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_22_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s
index bd17956d23..dad7cf4a71 100644
--- a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s
+++ b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s
@@ -6,7 +6,7 @@ glabel D_802411D0_8A35A0
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_23_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241524_8A38F4
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_23_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240034_8A2404, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802419F0_8A3DC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_23_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_23_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802419F0_8A3DC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802419F0_8A3DC0
 .word 0x00000043, 0x00000001, tik_23_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_23_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s b/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s
index 850a3e13c5..96fc859d14 100644
--- a/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s
+++ b/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s
@@ -42,7 +42,7 @@ glabel D_80242678_9B3E08
 .word 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000060, 0x00000000, 0x00000081, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00030005, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000007C, 0x00000081, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000005, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000060, 0x00000081, 0x00000000, 0x00000043, 0x00000003, GetAngleToNPC, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00E1, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802427F0_9B3F80
-.word 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF24F2A80, 0xF24AC280, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000029, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C82, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xF8405E14, 0x00000000, 0x00000024, 0x00000002, 0xF8405E14, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DB, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DC, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DE, 0x00000043, 0x00000003, func_80240AF0_9B2280, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAD, 0x00000043, 0x00000001, func_80240C80_9B2410, 0x00000044, 0x00000001, 0x80240E14, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018B, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240E38, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00E0, 0x00000046, 0x00000001, D_80242678_9B3E08, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF24F2A80, 0xF24AC280, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000029, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C82, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xF8405E14, 0x00000000, 0x00000024, 0x00000002, 0xF8405E14, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DB, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DC, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DE, 0x00000043, 0x00000003, trd_06_UnkFunc41, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAD, 0x00000043, 0x00000001, func_80240C80_9B2410, 0x00000044, 0x00000001, 0x80240E14, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018B, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240E38, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00E0, 0x00000046, 0x00000001, D_80242678_9B3E08, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242CEC_9B447C
 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFAD, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802427F0_9B3F80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802424A4_C389D4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802424A4_C389D4.s
deleted file mode 100644
index eb184873c2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802424A4_C389D4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel dgb_04_func_802424A4_C389D4
-/* C389D4 802424A4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* C389D8 802424A8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* C389DC 802424AC 000420C0 */  sll       $a0, $a0, 3
-/* C389E0 802424B0 00822021 */  addu      $a0, $a0, $v0
-/* C389E4 802424B4 90820014 */  lbu       $v0, 0x14($a0)
-/* C389E8 802424B8 10400009 */  beqz      $v0, .L802424E0
-/* C389EC 802424BC 00000000 */   nop
-/* C389F0 802424C0 90820015 */  lbu       $v0, 0x15($a0)
-/* C389F4 802424C4 00022600 */  sll       $a0, $v0, 0x18
-/* C389F8 802424C8 00041E03 */  sra       $v1, $a0, 0x18
-/* C389FC 802424CC 00051400 */  sll       $v0, $a1, 0x10
-/* C38A00 802424D0 00021403 */  sra       $v0, $v0, 0x10
-/* C38A04 802424D4 0043102A */  slt       $v0, $v0, $v1
-/* C38A08 802424D8 10400003 */  beqz      $v0, .L802424E8
-/* C38A0C 802424DC 00000000 */   nop
-.L802424E0:
-/* C38A10 802424E0 03E00008 */  jr        $ra
-/* C38A14 802424E4 2402FFFF */   addiu    $v0, $zero, -1
-.L802424E8:
-/* C38A18 802424E8 03E00008 */  jr        $ra
-/* C38A1C 802424EC 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s
index 1b6872be22..09e7f47e5c 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s
@@ -49,7 +49,7 @@ glabel dgb_04_func_8024259C_C38ACC
 /* C38B78 80242648 AE300108 */  sw        $s0, 0x108($s1)
 /* C38B7C 8024264C 8C420000 */  lw        $v0, ($v0)
 /* C38B80 80242650 02E0282D */  daddu     $a1, $s7, $zero
-/* C38B84 80242654 0C090929 */  jal       dgb_04_func_802424A4_C389D4
+/* C38B84 80242654 0C090929 */  jal       dgb_04_UnkFunc37
 /* C38B88 80242658 AE220084 */   sw       $v0, 0x84($s1)
 /* C38B8C 8024265C 0040202D */  daddu     $a0, $v0, $zero
 /* C38B90 80242660 04800011 */  bltz      $a0, .L802426A8
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240034_95B234.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240034_95B234.s
deleted file mode 100644
index 4456baeb55..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240034_95B234.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_95B234
-/* 95B234 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 95B238 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 95B23C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95B240 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95B244 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 95B248 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 95B24C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 95B250 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 95B254 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 95B258 80240058 08090038 */  j         .L802400E0
-/* 95B25C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 95B260 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 95B264 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 95B268 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 95B26C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 95B270 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 95B274 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 95B278 80240078 14400003 */  bnez      $v0, .L80240088
-/* 95B27C 8024007C 00000000 */   nop
-/* 95B280 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 95B284 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 95B288 80240088 44822000 */  mtc1      $v0, $f4
-/* 95B28C 8024008C 00000000 */  nop
-/* 95B290 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 95B294 80240094 44062000 */  mfc1      $a2, $f4
-/* 95B298 80240098 44872000 */  mtc1      $a3, $f4
-/* 95B29C 8024009C 00000000 */  nop
-/* 95B2A0 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 95B2A4 802400A4 44806000 */  mtc1      $zero, $f12
-/* 95B2A8 802400A8 44072000 */  mfc1      $a3, $f4
-/* 95B2AC 802400AC 0C00A720 */  jal       atan2
-/* 95B2B0 802400B0 46006386 */   mov.s    $f14, $f12
-/* 95B2B4 802400B4 3C014270 */  lui       $at, 0x4270
-/* 95B2B8 802400B8 44811000 */  mtc1      $at, $f2
-/* 95B2BC 802400BC 00000000 */  nop
-/* 95B2C0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 95B2C4 802400C4 00000000 */  nop
-/* 95B2C8 802400C8 45000004 */  bc1f      .L802400DC
-/* 95B2CC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 95B2D0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 95B2D4 802400D4 08090038 */  j         .L802400E0
-/* 95B2D8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 95B2DC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 95B2E0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 95B2E4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95B2E8 802400E8 03E00008 */  jr        $ra
-/* 95B2EC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s
deleted file mode 100644
index e2fcee11f8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402E0_95B4E0
-/* 95B4E0 802402E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95B4E4 802402E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95B4E8 802402E8 0080882D */  daddu     $s1, $a0, $zero
-/* 95B4EC 802402EC AFBF001C */  sw        $ra, 0x1c($sp)
-/* 95B4F0 802402F0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 95B4F4 802402F4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95B4F8 802402F8 8E30000C */  lw        $s0, 0xc($s1)
-/* 95B4FC 802402FC 8E050000 */  lw        $a1, ($s0)
-/* 95B500 80240300 0C0B1EAF */  jal       get_variable
-/* 95B504 80240304 26100004 */   addiu    $s0, $s0, 4
-/* 95B508 80240308 8E050000 */  lw        $a1, ($s0)
-/* 95B50C 8024030C 26100004 */  addiu     $s0, $s0, 4
-/* 95B510 80240310 0220202D */  daddu     $a0, $s1, $zero
-/* 95B514 80240314 0C0B1EAF */  jal       get_variable
-/* 95B518 80240318 0040902D */   daddu    $s2, $v0, $zero
-/* 95B51C 8024031C 0220202D */  daddu     $a0, $s1, $zero
-/* 95B520 80240320 8E050000 */  lw        $a1, ($s0)
-/* 95B524 80240324 0C0B1EAF */  jal       get_variable
-/* 95B528 80240328 0040802D */   daddu    $s0, $v0, $zero
-/* 95B52C 8024032C 0040882D */  daddu     $s1, $v0, $zero
-/* 95B530 80240330 2402FFFF */  addiu     $v0, $zero, -1
-/* 95B534 80240334 16020005 */  bne       $s0, $v0, .L8024034C
-/* 95B538 80240338 24020001 */   addiu    $v0, $zero, 1
-/* 95B53C 8024033C 0C04760B */  jal       func_8011D82C
-/* 95B540 80240340 0220202D */   daddu    $a0, $s1, $zero
-/* 95B544 80240344 080900FB */  j         .L802403EC
-/* 95B548 80240348 24020002 */   addiu    $v0, $zero, 2
-.L8024034C:
-/* 95B54C 8024034C 12420018 */  beq       $s2, $v0, .L802403B0
-/* 95B550 80240350 2A420002 */   slti     $v0, $s2, 2
-/* 95B554 80240354 10400005 */  beqz      $v0, .L8024036C
-/* 95B558 80240358 24020002 */   addiu    $v0, $zero, 2
-/* 95B55C 8024035C 12400007 */  beqz      $s2, .L8024037C
-/* 95B560 80240360 3412FFFF */   ori      $s2, $zero, 0xffff
-/* 95B564 80240364 080900FB */  j         .L802403EC
-/* 95B568 80240368 00000000 */   nop
-.L8024036C:
-/* 95B56C 8024036C 1242001B */  beq       $s2, $v0, .L802403DC
-/* 95B570 80240370 24020002 */   addiu    $v0, $zero, 2
-/* 95B574 80240374 080900FB */  j         .L802403EC
-/* 95B578 80240378 00000000 */   nop
-.L8024037C:
-/* 95B57C 8024037C 8E040000 */  lw        $a0, ($s0)
-/* 95B580 80240380 1092001A */  beq       $a0, $s2, .L802403EC
-/* 95B584 80240384 24020002 */   addiu    $v0, $zero, 2
-/* 95B588 80240388 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 95B58C 8024038C 26100004 */   addiu    $s0, $s0, 4
-/* 95B590 80240390 0C046B4C */  jal       get_model_from_list_index
-/* 95B594 80240394 0040202D */   daddu    $a0, $v0, $zero
-/* 95B598 80240398 0040202D */  daddu     $a0, $v0, $zero
-/* 95B59C 8024039C 2405FFFF */  addiu     $a1, $zero, -1
-/* 95B5A0 802403A0 0C046F1F */  jal       func_8011BC7C
-/* 95B5A4 802403A4 0220302D */   daddu    $a2, $s1, $zero
-/* 95B5A8 802403A8 080900DF */  j         .L8024037C
-/* 95B5AC 802403AC 00000000 */   nop
-.L802403B0:
-/* 95B5B0 802403B0 3412FFFF */  ori       $s2, $zero, 0xffff
-.L802403B4:
-/* 95B5B4 802403B4 8E020000 */  lw        $v0, ($s0)
-/* 95B5B8 802403B8 1052000B */  beq       $v0, $s2, .L802403E8
-/* 95B5BC 802403BC 2405FFFF */   addiu    $a1, $zero, -1
-/* 95B5C0 802403C0 96040002 */  lhu       $a0, 2($s0)
-/* 95B5C4 802403C4 0220302D */  daddu     $a2, $s1, $zero
-/* 95B5C8 802403C8 26100004 */  addiu     $s0, $s0, 4
-/* 95B5CC 802403CC 0C046E54 */  jal       func_8011B950
-/* 95B5D0 802403D0 0000382D */   daddu    $a3, $zero, $zero
-/* 95B5D4 802403D4 080900ED */  j         .L802403B4
-/* 95B5D8 802403D8 00000000 */   nop
-.L802403DC:
-/* 95B5DC 802403DC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 95B5E0 802403E0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 95B5E4 802403E4 A0510000 */  sb        $s1, ($v0)
-.L802403E8:
-/* 95B5E8 802403E8 24020002 */  addiu     $v0, $zero, 2
-.L802403EC:
-/* 95B5EC 802403EC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 95B5F0 802403F0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95B5F4 802403F4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95B5F8 802403F8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95B5FC 802403FC 03E00008 */  jr        $ra
-/* 95B600 80240400 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240404_95B604.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240404_95B604.s
deleted file mode 100644
index 99b679934b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240404_95B604.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240404_95B604
-/* 95B604 80240404 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 95B608 80240408 AFB10034 */  sw        $s1, 0x34($sp)
-/* 95B60C 8024040C 0080882D */  daddu     $s1, $a0, $zero
-/* 95B610 80240410 AFBF0054 */  sw        $ra, 0x54($sp)
-/* 95B614 80240414 AFBE0050 */  sw        $fp, 0x50($sp)
-/* 95B618 80240418 AFB7004C */  sw        $s7, 0x4c($sp)
-/* 95B61C 8024041C AFB60048 */  sw        $s6, 0x48($sp)
-/* 95B620 80240420 AFB50044 */  sw        $s5, 0x44($sp)
-/* 95B624 80240424 AFB40040 */  sw        $s4, 0x40($sp)
-/* 95B628 80240428 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 95B62C 8024042C AFB20038 */  sw        $s2, 0x38($sp)
-/* 95B630 80240430 AFB00030 */  sw        $s0, 0x30($sp)
-/* 95B634 80240434 8E30000C */  lw        $s0, 0xc($s1)
-/* 95B638 80240438 8E050000 */  lw        $a1, ($s0)
-/* 95B63C 8024043C 0C0B1EAF */  jal       get_variable
-/* 95B640 80240440 26100004 */   addiu    $s0, $s0, 4
-/* 95B644 80240444 8E050000 */  lw        $a1, ($s0)
-/* 95B648 80240448 26100004 */  addiu     $s0, $s0, 4
-/* 95B64C 8024044C 0220202D */  daddu     $a0, $s1, $zero
-/* 95B650 80240450 0C0B1EAF */  jal       get_variable
-/* 95B654 80240454 0040982D */   daddu    $s3, $v0, $zero
-/* 95B658 80240458 8E050000 */  lw        $a1, ($s0)
-/* 95B65C 8024045C 26100004 */  addiu     $s0, $s0, 4
-/* 95B660 80240460 0220202D */  daddu     $a0, $s1, $zero
-/* 95B664 80240464 0C0B1EAF */  jal       get_variable
-/* 95B668 80240468 0040B02D */   daddu    $s6, $v0, $zero
-/* 95B66C 8024046C 8E050000 */  lw        $a1, ($s0)
-/* 95B670 80240470 26100004 */  addiu     $s0, $s0, 4
-/* 95B674 80240474 0220202D */  daddu     $a0, $s1, $zero
-/* 95B678 80240478 0C0B1EAF */  jal       get_variable
-/* 95B67C 8024047C 0040A82D */   daddu    $s5, $v0, $zero
-/* 95B680 80240480 8E050000 */  lw        $a1, ($s0)
-/* 95B684 80240484 26100004 */  addiu     $s0, $s0, 4
-/* 95B688 80240488 0220202D */  daddu     $a0, $s1, $zero
-/* 95B68C 8024048C 0C0B1EAF */  jal       get_variable
-/* 95B690 80240490 0040A02D */   daddu    $s4, $v0, $zero
-/* 95B694 80240494 8E050000 */  lw        $a1, ($s0)
-/* 95B698 80240498 26100004 */  addiu     $s0, $s0, 4
-/* 95B69C 8024049C 0220202D */  daddu     $a0, $s1, $zero
-/* 95B6A0 802404A0 0C0B1EAF */  jal       get_variable
-/* 95B6A4 802404A4 0040902D */   daddu    $s2, $v0, $zero
-/* 95B6A8 802404A8 8E050000 */  lw        $a1, ($s0)
-/* 95B6AC 802404AC 26100004 */  addiu     $s0, $s0, 4
-/* 95B6B0 802404B0 0220202D */  daddu     $a0, $s1, $zero
-/* 95B6B4 802404B4 0C0B1EAF */  jal       get_variable
-/* 95B6B8 802404B8 AFA20028 */   sw       $v0, 0x28($sp)
-/* 95B6BC 802404BC 8E050000 */  lw        $a1, ($s0)
-/* 95B6C0 802404C0 26100004 */  addiu     $s0, $s0, 4
-/* 95B6C4 802404C4 0220202D */  daddu     $a0, $s1, $zero
-/* 95B6C8 802404C8 0C0B1EAF */  jal       get_variable
-/* 95B6CC 802404CC 0040F02D */   daddu    $fp, $v0, $zero
-/* 95B6D0 802404D0 8E050000 */  lw        $a1, ($s0)
-/* 95B6D4 802404D4 26100004 */  addiu     $s0, $s0, 4
-/* 95B6D8 802404D8 0220202D */  daddu     $a0, $s1, $zero
-/* 95B6DC 802404DC 0C0B1EAF */  jal       get_variable
-/* 95B6E0 802404E0 0040B82D */   daddu    $s7, $v0, $zero
-/* 95B6E4 802404E4 0220202D */  daddu     $a0, $s1, $zero
-/* 95B6E8 802404E8 8E050000 */  lw        $a1, ($s0)
-/* 95B6EC 802404EC 0C0B1EAF */  jal       get_variable
-/* 95B6F0 802404F0 0040802D */   daddu    $s0, $v0, $zero
-/* 95B6F4 802404F4 0040182D */  daddu     $v1, $v0, $zero
-/* 95B6F8 802404F8 24020002 */  addiu     $v0, $zero, 2
-/* 95B6FC 802404FC 12620012 */  beq       $s3, $v0, .L80240548
-/* 95B700 80240500 2A620003 */   slti     $v0, $s3, 3
-/* 95B704 80240504 10400005 */  beqz      $v0, .L8024051C
-/* 95B708 80240508 24020001 */   addiu    $v0, $zero, 1
-/* 95B70C 8024050C 12620008 */  beq       $s3, $v0, .L80240530
-/* 95B710 80240510 32C400FF */   andi     $a0, $s6, 0xff
-/* 95B714 80240514 08090169 */  j         .L802405A4
-/* 95B718 80240518 00000000 */   nop
-.L8024051C:
-/* 95B71C 8024051C 24020003 */  addiu     $v0, $zero, 3
-/* 95B720 80240520 12620018 */  beq       $s3, $v0, .L80240584
-/* 95B724 80240524 32C400FF */   andi     $a0, $s6, 0xff
-/* 95B728 80240528 08090169 */  j         .L802405A4
-/* 95B72C 8024052C 00000000 */   nop
-.L80240530:
-/* 95B730 80240530 32A500FF */  andi      $a1, $s5, 0xff
-/* 95B734 80240534 328600FF */  andi      $a2, $s4, 0xff
-/* 95B738 80240538 0C046F97 */  jal       set_background_color_blend
-/* 95B73C 8024053C 324700FF */   andi     $a3, $s2, 0xff
-/* 95B740 80240540 08090169 */  j         .L802405A4
-/* 95B744 80240544 00000000 */   nop
-.L80240548:
-/* 95B748 80240548 32C400FF */  andi      $a0, $s6, 0xff
-/* 95B74C 8024054C 32A500FF */  andi      $a1, $s5, 0xff
-/* 95B750 80240550 328600FF */  andi      $a2, $s4, 0xff
-/* 95B754 80240554 324700FF */  andi      $a3, $s2, 0xff
-/* 95B758 80240558 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 95B75C 8024055C AFB0001C */  sw        $s0, 0x1c($sp)
-/* 95B760 80240560 AFA30020 */  sw        $v1, 0x20($sp)
-/* 95B764 80240564 AFA20010 */  sw        $v0, 0x10($sp)
-/* 95B768 80240568 33C200FF */  andi      $v0, $fp, 0xff
-/* 95B76C 8024056C AFA20014 */  sw        $v0, 0x14($sp)
-/* 95B770 80240570 32E200FF */  andi      $v0, $s7, 0xff
-/* 95B774 80240574 0C046FAD */  jal       func_8011BEB4
-/* 95B778 80240578 AFA20018 */   sw       $v0, 0x18($sp)
-/* 95B77C 8024057C 08090169 */  j         .L802405A4
-/* 95B780 80240580 00000000 */   nop
-.L80240584:
-/* 95B784 80240584 32A500FF */  andi      $a1, $s5, 0xff
-/* 95B788 80240588 328600FF */  andi      $a2, $s4, 0xff
-/* 95B78C 8024058C 324700FF */  andi      $a3, $s2, 0xff
-/* 95B790 80240590 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 95B794 80240594 AFA20010 */  sw        $v0, 0x10($sp)
-/* 95B798 80240598 33C200FF */  andi      $v0, $fp, 0xff
-/* 95B79C 8024059C 0C046FE6 */  jal       func_8011BF98
-/* 95B7A0 802405A0 AFA20014 */   sw       $v0, 0x14($sp)
-.L802405A4:
-/* 95B7A4 802405A4 8FBF0054 */  lw        $ra, 0x54($sp)
-/* 95B7A8 802405A8 8FBE0050 */  lw        $fp, 0x50($sp)
-/* 95B7AC 802405AC 8FB7004C */  lw        $s7, 0x4c($sp)
-/* 95B7B0 802405B0 8FB60048 */  lw        $s6, 0x48($sp)
-/* 95B7B4 802405B4 8FB50044 */  lw        $s5, 0x44($sp)
-/* 95B7B8 802405B8 8FB40040 */  lw        $s4, 0x40($sp)
-/* 95B7BC 802405BC 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 95B7C0 802405C0 8FB20038 */  lw        $s2, 0x38($sp)
-/* 95B7C4 802405C4 8FB10034 */  lw        $s1, 0x34($sp)
-/* 95B7C8 802405C8 8FB00030 */  lw        $s0, 0x30($sp)
-/* 95B7CC 802405CC 24020002 */  addiu     $v0, $zero, 2
-/* 95B7D0 802405D0 03E00008 */  jr        $ra
-/* 95B7D4 802405D4 27BD0058 */   addiu    $sp, $sp, 0x58
-/* 95B7D8 802405D8 00000000 */  nop
-/* 95B7DC 802405DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s
deleted file mode 100644
index da6bf8eab2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s
+++ /dev/null
@@ -1,95 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405E0_95B7E0
-/* 95B7E0 802405E0 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 95B7E4 802405E4 AFB50024 */  sw        $s5, 0x24($sp)
-/* 95B7E8 802405E8 0080A82D */  daddu     $s5, $a0, $zero
-/* 95B7EC 802405EC AFBF002C */  sw        $ra, 0x2c($sp)
-/* 95B7F0 802405F0 AFB60028 */  sw        $s6, 0x28($sp)
-/* 95B7F4 802405F4 AFB40020 */  sw        $s4, 0x20($sp)
-/* 95B7F8 802405F8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 95B7FC 802405FC AFB20018 */  sw        $s2, 0x18($sp)
-/* 95B800 80240600 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95B804 80240604 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95B808 80240608 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* 95B80C 8024060C F7B60038 */  sdc1      $f22, 0x38($sp)
-/* 95B810 80240610 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* 95B814 80240614 8EB30148 */  lw        $s3, 0x148($s5)
-/* 95B818 80240618 86640008 */  lh        $a0, 8($s3)
-/* 95B81C 8024061C 0C00EABB */  jal       get_npc_unsafe
-/* 95B820 80240620 00A0B02D */   daddu    $s6, $a1, $zero
-/* 95B824 80240624 0040A02D */  daddu     $s4, $v0, $zero
-/* 95B828 80240628 AEA00074 */  sw        $zero, 0x74($s5)
-/* 95B82C 8024062C C6980038 */  lwc1      $f24, 0x38($s4)
-/* 95B830 80240630 C6960040 */  lwc1      $f22, 0x40($s4)
-/* 95B834 80240634 0000902D */  daddu     $s2, $zero, $zero
-/* 95B838 80240638 AEA00078 */  sw        $zero, 0x78($s5)
-/* 95B83C 8024063C 8E6300D0 */  lw        $v1, 0xd0($s3)
-/* 95B840 80240640 8C620000 */  lw        $v0, ($v1)
-/* 95B844 80240644 3C0146FF */  lui       $at, 0x46ff
-/* 95B848 80240648 3421FE00 */  ori       $at, $at, 0xfe00
-/* 95B84C 8024064C 4481A000 */  mtc1      $at, $f20
-/* 95B850 80240650 18400018 */  blez      $v0, .L802406B4
-/* 95B854 80240654 0240802D */   daddu    $s0, $s2, $zero
-/* 95B858 80240658 0240882D */  daddu     $s1, $s2, $zero
-.L8024065C:
-/* 95B85C 8024065C 02231021 */  addu      $v0, $s1, $v1
-/* 95B860 80240660 4600C306 */  mov.s     $f12, $f24
-/* 95B864 80240664 C4440004 */  lwc1      $f4, 4($v0)
-/* 95B868 80240668 46802120 */  cvt.s.w   $f4, $f4
-/* 95B86C 8024066C 44062000 */  mfc1      $a2, $f4
-/* 95B870 80240670 C444000C */  lwc1      $f4, 0xc($v0)
-/* 95B874 80240674 46802120 */  cvt.s.w   $f4, $f4
-/* 95B878 80240678 44072000 */  mfc1      $a3, $f4
-/* 95B87C 8024067C 0C00A7B5 */  jal       dist2D
-/* 95B880 80240680 4600B386 */   mov.s    $f14, $f22
-/* 95B884 80240684 4614003C */  c.lt.s    $f0, $f20
-/* 95B888 80240688 00000000 */  nop
-/* 95B88C 8024068C 45000003 */  bc1f      .L8024069C
-/* 95B890 80240690 2631000C */   addiu    $s1, $s1, 0xc
-/* 95B894 80240694 46000506 */  mov.s     $f20, $f0
-/* 95B898 80240698 AEB20078 */  sw        $s2, 0x78($s5)
-.L8024069C:
-/* 95B89C 8024069C 8E6300D0 */  lw        $v1, 0xd0($s3)
-/* 95B8A0 802406A0 26100001 */  addiu     $s0, $s0, 1
-/* 95B8A4 802406A4 8C620000 */  lw        $v0, ($v1)
-/* 95B8A8 802406A8 0202102A */  slt       $v0, $s0, $v0
-/* 95B8AC 802406AC 1440FFEB */  bnez      $v0, .L8024065C
-/* 95B8B0 802406B0 26520001 */   addiu    $s2, $s2, 1
-.L802406B4:
-/* 95B8B4 802406B4 8E6200CC */  lw        $v0, 0xcc($s3)
-/* 95B8B8 802406B8 8C420004 */  lw        $v0, 4($v0)
-/* 95B8BC 802406BC AE820028 */  sw        $v0, 0x28($s4)
-/* 95B8C0 802406C0 8E6200D0 */  lw        $v0, 0xd0($s3)
-/* 95B8C4 802406C4 8C42007C */  lw        $v0, 0x7c($v0)
-/* 95B8C8 802406C8 04410004 */  bgez      $v0, .L802406DC
-/* 95B8CC 802406CC 00000000 */   nop
-/* 95B8D0 802406D0 C6C00000 */  lwc1      $f0, ($s6)
-/* 95B8D4 802406D4 080901BF */  j         .L802406FC
-/* 95B8D8 802406D8 E6800018 */   swc1     $f0, 0x18($s4)
-.L802406DC:
-/* 95B8DC 802406DC 3C018025 */  lui       $at, %hi(D_8024DDE0_968FE0)
-/* 95B8E0 802406E0 D422DDE0 */  ldc1      $f2, %lo(D_8024DDE0_968FE0)($at)
-/* 95B8E4 802406E4 44820000 */  mtc1      $v0, $f0
-/* 95B8E8 802406E8 00000000 */  nop
-/* 95B8EC 802406EC 46800021 */  cvt.d.w   $f0, $f0
-/* 95B8F0 802406F0 46220003 */  div.d     $f0, $f0, $f2
-/* 95B8F4 802406F4 46200020 */  cvt.s.d   $f0, $f0
-/* 95B8F8 802406F8 E6800018 */  swc1      $f0, 0x18($s4)
-.L802406FC:
-/* 95B8FC 802406FC 24020001 */  addiu     $v0, $zero, 1
-/* 95B900 80240700 AEA20070 */  sw        $v0, 0x70($s5)
-/* 95B904 80240704 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 95B908 80240708 8FB60028 */  lw        $s6, 0x28($sp)
-/* 95B90C 8024070C 8FB50024 */  lw        $s5, 0x24($sp)
-/* 95B910 80240710 8FB40020 */  lw        $s4, 0x20($sp)
-/* 95B914 80240714 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 95B918 80240718 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95B91C 8024071C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95B920 80240720 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95B924 80240724 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* 95B928 80240728 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* 95B92C 8024072C D7B40030 */  ldc1      $f20, 0x30($sp)
-/* 95B930 80240730 03E00008 */  jr        $ra
-/* 95B934 80240734 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s
deleted file mode 100644
index e593e8453d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C5C_95BE5C
-/* 95BE5C 80240C5C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95BE60 80240C60 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95BE64 80240C64 0080882D */  daddu     $s1, $a0, $zero
-/* 95BE68 80240C68 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 95BE6C 80240C6C AFB20018 */  sw        $s2, 0x18($sp)
-/* 95BE70 80240C70 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95BE74 80240C74 8E300148 */  lw        $s0, 0x148($s1)
-/* 95BE78 80240C78 86040008 */  lh        $a0, 8($s0)
-/* 95BE7C 80240C7C 0C00EABB */  jal       get_npc_unsafe
-/* 95BE80 80240C80 00A0902D */   daddu    $s2, $a1, $zero
-/* 95BE84 80240C84 8E230078 */  lw        $v1, 0x78($s1)
-/* 95BE88 80240C88 24630001 */  addiu     $v1, $v1, 1
-/* 95BE8C 80240C8C AE230078 */  sw        $v1, 0x78($s1)
-/* 95BE90 80240C90 8E0400D0 */  lw        $a0, 0xd0($s0)
-/* 95BE94 80240C94 8C840000 */  lw        $a0, ($a0)
-/* 95BE98 80240C98 0064182A */  slt       $v1, $v1, $a0
-/* 95BE9C 80240C9C 14600002 */  bnez      $v1, .L80240CA8
-/* 95BEA0 80240CA0 0040282D */   daddu    $a1, $v0, $zero
-/* 95BEA4 80240CA4 AE200078 */  sw        $zero, 0x78($s1)
-.L80240CA8:
-/* 95BEA8 80240CA8 8E0200CC */  lw        $v0, 0xcc($s0)
-/* 95BEAC 80240CAC 8C420004 */  lw        $v0, 4($v0)
-/* 95BEB0 80240CB0 ACA20028 */  sw        $v0, 0x28($a1)
-/* 95BEB4 80240CB4 8E0200D0 */  lw        $v0, 0xd0($s0)
-/* 95BEB8 80240CB8 8C42007C */  lw        $v0, 0x7c($v0)
-/* 95BEBC 80240CBC 04410004 */  bgez      $v0, .L80240CD0
-/* 95BEC0 80240CC0 00000000 */   nop
-/* 95BEC4 80240CC4 C6400000 */  lwc1      $f0, ($s2)
-/* 95BEC8 80240CC8 0809033C */  j         .L80240CF0
-/* 95BECC 80240CCC E4A00018 */   swc1     $f0, 0x18($a1)
-.L80240CD0:
-/* 95BED0 80240CD0 3C018025 */  lui       $at, %hi(D_8024DDE8_968FE8)
-/* 95BED4 80240CD4 D422DDE8 */  ldc1      $f2, %lo(D_8024DDE8_968FE8)($at)
-/* 95BED8 80240CD8 44820000 */  mtc1      $v0, $f0
-/* 95BEDC 80240CDC 00000000 */  nop
-/* 95BEE0 80240CE0 46800021 */  cvt.d.w   $f0, $f0
-/* 95BEE4 80240CE4 46220003 */  div.d     $f0, $f0, $f2
-/* 95BEE8 80240CE8 46200020 */  cvt.s.d   $f0, $f0
-/* 95BEEC 80240CEC E4A00018 */  swc1      $f0, 0x18($a1)
-.L80240CF0:
-/* 95BEF0 80240CF0 24020001 */  addiu     $v0, $zero, 1
-/* 95BEF4 80240CF4 AE220070 */  sw        $v0, 0x70($s1)
-/* 95BEF8 80240CF8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 95BEFC 80240CFC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95BF00 80240D00 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95BF04 80240D04 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95BF08 80240D08 03E00008 */  jr        $ra
-/* 95BF0C 80240D0C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s
deleted file mode 100644
index c63bc65f81..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s
+++ /dev/null
@@ -1,214 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241174_95C374
-/* 95C374 80241174 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* 95C378 80241178 AFB40058 */  sw        $s4, 0x58($sp)
-/* 95C37C 8024117C 0080A02D */  daddu     $s4, $a0, $zero
-/* 95C380 80241180 AFBF0060 */  sw        $ra, 0x60($sp)
-/* 95C384 80241184 AFB5005C */  sw        $s5, 0x5c($sp)
-/* 95C388 80241188 AFB30054 */  sw        $s3, 0x54($sp)
-/* 95C38C 8024118C AFB20050 */  sw        $s2, 0x50($sp)
-/* 95C390 80241190 AFB1004C */  sw        $s1, 0x4c($sp)
-/* 95C394 80241194 AFB00048 */  sw        $s0, 0x48($sp)
-/* 95C398 80241198 8E910148 */  lw        $s1, 0x148($s4)
-/* 95C39C 8024119C 86240008 */  lh        $a0, 8($s1)
-/* 95C3A0 802411A0 0C00EABB */  jal       get_npc_unsafe
-/* 95C3A4 802411A4 00A0802D */   daddu    $s0, $a1, $zero
-/* 95C3A8 802411A8 8E83000C */  lw        $v1, 0xc($s4)
-/* 95C3AC 802411AC 0280202D */  daddu     $a0, $s4, $zero
-/* 95C3B0 802411B0 8C650000 */  lw        $a1, ($v1)
-/* 95C3B4 802411B4 0C0B1EAF */  jal       get_variable
-/* 95C3B8 802411B8 0040902D */   daddu    $s2, $v0, $zero
-/* 95C3BC 802411BC AFA00018 */  sw        $zero, 0x18($sp)
-/* 95C3C0 802411C0 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* 95C3C4 802411C4 8C630094 */  lw        $v1, 0x94($v1)
-/* 95C3C8 802411C8 AFA3001C */  sw        $v1, 0x1c($sp)
-/* 95C3CC 802411CC 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* 95C3D0 802411D0 8C630080 */  lw        $v1, 0x80($v1)
-/* 95C3D4 802411D4 AFA30020 */  sw        $v1, 0x20($sp)
-/* 95C3D8 802411D8 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* 95C3DC 802411DC 8C630088 */  lw        $v1, 0x88($v1)
-/* 95C3E0 802411E0 AFA30024 */  sw        $v1, 0x24($sp)
-/* 95C3E4 802411E4 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* 95C3E8 802411E8 8C63008C */  lw        $v1, 0x8c($v1)
-/* 95C3EC 802411EC 27B50018 */  addiu     $s5, $sp, 0x18
-/* 95C3F0 802411F0 AFA30028 */  sw        $v1, 0x28($sp)
-/* 95C3F4 802411F4 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* 95C3F8 802411F8 3C014282 */  lui       $at, 0x4282
-/* 95C3FC 802411FC 44810000 */  mtc1      $at, $f0
-/* 95C400 80241200 8C630090 */  lw        $v1, 0x90($v1)
-/* 95C404 80241204 0040982D */  daddu     $s3, $v0, $zero
-/* 95C408 80241208 E7A00030 */  swc1      $f0, 0x30($sp)
-/* 95C40C 8024120C A7A00034 */  sh        $zero, 0x34($sp)
-/* 95C410 80241210 16000005 */  bnez      $s0, .L80241228
-/* 95C414 80241214 AFA3002C */   sw       $v1, 0x2c($sp)
-/* 95C418 80241218 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* 95C41C 8024121C 30420004 */  andi      $v0, $v0, 4
-/* 95C420 80241220 10400044 */  beqz      $v0, .L80241334
-/* 95C424 80241224 00000000 */   nop
-.L80241228:
-/* 95C428 80241228 2404F7FF */  addiu     $a0, $zero, -0x801
-/* 95C42C 8024122C AE800070 */  sw        $zero, 0x70($s4)
-/* 95C430 80241230 A640008E */  sh        $zero, 0x8e($s2)
-/* 95C434 80241234 8E2200CC */  lw        $v0, 0xcc($s1)
-/* 95C438 80241238 8E430000 */  lw        $v1, ($s2)
-/* 95C43C 8024123C 8C420000 */  lw        $v0, ($v0)
-/* 95C440 80241240 00641824 */  and       $v1, $v1, $a0
-/* 95C444 80241244 AE430000 */  sw        $v1, ($s2)
-/* 95C448 80241248 AE420028 */  sw        $v0, 0x28($s2)
-/* 95C44C 8024124C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* 95C450 80241250 8C420098 */  lw        $v0, 0x98($v0)
-/* 95C454 80241254 54400005 */  bnel      $v0, $zero, .L8024126C
-/* 95C458 80241258 2402FDFF */   addiu    $v0, $zero, -0x201
-/* 95C45C 8024125C 34620200 */  ori       $v0, $v1, 0x200
-/* 95C460 80241260 2403FFF7 */  addiu     $v1, $zero, -9
-/* 95C464 80241264 0809049D */  j         .L80241274
-/* 95C468 80241268 00431024 */   and      $v0, $v0, $v1
-.L8024126C:
-/* 95C46C 8024126C 00621024 */  and       $v0, $v1, $v0
-/* 95C470 80241270 34420008 */  ori       $v0, $v0, 8
-.L80241274:
-/* 95C474 80241274 AE420000 */  sw        $v0, ($s2)
-/* 95C478 80241278 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* 95C47C 8024127C 30420004 */  andi      $v0, $v0, 4
-/* 95C480 80241280 10400008 */  beqz      $v0, .L802412A4
-/* 95C484 80241284 24020063 */   addiu    $v0, $zero, 0x63
-/* 95C488 80241288 AE820070 */  sw        $v0, 0x70($s4)
-/* 95C48C 8024128C AE800074 */  sw        $zero, 0x74($s4)
-/* 95C490 80241290 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* 95C494 80241294 2403FFFB */  addiu     $v1, $zero, -5
-/* 95C498 80241298 00431024 */  and       $v0, $v0, $v1
-/* 95C49C 8024129C 080904B4 */  j         .L802412D0
-/* 95C4A0 802412A0 AE2200B0 */   sw       $v0, 0xb0($s1)
-.L802412A4:
-/* 95C4A4 802412A4 8E220000 */  lw        $v0, ($s1)
-/* 95C4A8 802412A8 3C034000 */  lui       $v1, 0x4000
-/* 95C4AC 802412AC 00431024 */  and       $v0, $v0, $v1
-/* 95C4B0 802412B0 10400007 */  beqz      $v0, .L802412D0
-/* 95C4B4 802412B4 3C03BFFF */   lui      $v1, 0xbfff
-/* 95C4B8 802412B8 2402000C */  addiu     $v0, $zero, 0xc
-/* 95C4BC 802412BC AE820070 */  sw        $v0, 0x70($s4)
-/* 95C4C0 802412C0 8E220000 */  lw        $v0, ($s1)
-/* 95C4C4 802412C4 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 95C4C8 802412C8 00431024 */  and       $v0, $v0, $v1
-/* 95C4CC 802412CC AE220000 */  sw        $v0, ($s1)
-.L802412D0:
-/* 95C4D0 802412D0 27A50038 */  addiu     $a1, $sp, 0x38
-/* 95C4D4 802412D4 27A6003C */  addiu     $a2, $sp, 0x3c
-/* 95C4D8 802412D8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* 95C4DC 802412DC 864200A8 */  lh        $v0, 0xa8($s2)
-/* 95C4E0 802412E0 3C0142C8 */  lui       $at, 0x42c8
-/* 95C4E4 802412E4 44812000 */  mtc1      $at, $f4
-/* 95C4E8 802412E8 44823000 */  mtc1      $v0, $f6
-/* 95C4EC 802412EC 00000000 */  nop
-/* 95C4F0 802412F0 468031A0 */  cvt.s.w   $f6, $f6
-/* 95C4F4 802412F4 27A20044 */  addiu     $v0, $sp, 0x44
-/* 95C4F8 802412F8 E7A00038 */  swc1      $f0, 0x38($sp)
-/* 95C4FC 802412FC C640003C */  lwc1      $f0, 0x3c($s2)
-/* 95C500 80241300 C6420040 */  lwc1      $f2, 0x40($s2)
-/* 95C504 80241304 46060000 */  add.s     $f0, $f0, $f6
-/* 95C508 80241308 E7A40044 */  swc1      $f4, 0x44($sp)
-/* 95C50C 8024130C E7A20040 */  swc1      $f2, 0x40($sp)
-/* 95C510 80241310 E7A0003C */  swc1      $f0, 0x3c($sp)
-/* 95C514 80241314 AFA20010 */  sw        $v0, 0x10($sp)
-/* 95C518 80241318 8E440080 */  lw        $a0, 0x80($s2)
-/* 95C51C 8024131C 0C0372DF */  jal       func_800DCB7C
-/* 95C520 80241320 27A70040 */   addiu    $a3, $sp, 0x40
-/* 95C524 80241324 10400003 */  beqz      $v0, .L80241334
-/* 95C528 80241328 00000000 */   nop
-/* 95C52C 8024132C C7A0003C */  lwc1      $f0, 0x3c($sp)
-/* 95C530 80241330 E640003C */  swc1      $f0, 0x3c($s2)
-.L80241334:
-/* 95C534 80241334 8E830070 */  lw        $v1, 0x70($s4)
-/* 95C538 80241338 2C620064 */  sltiu     $v0, $v1, 0x64
-/* 95C53C 8024133C 10400042 */  beqz      $v0, L80241448_95C648
-/* 95C540 80241340 00031080 */   sll      $v0, $v1, 2
-/* 95C544 80241344 3C018025 */  lui       $at, %hi(jtbl_8024DDF0_968FF0)
-/* 95C548 80241348 00220821 */  addu      $at, $at, $v0
-/* 95C54C 8024134C 8C22DDF0 */  lw        $v0, %lo(jtbl_8024DDF0_968FF0)($at)
-/* 95C550 80241350 00400008 */  jr        $v0
-/* 95C554 80241354 00000000 */   nop
-glabel L80241358_95C558
-/* 95C558 80241358 0280202D */  daddu     $a0, $s4, $zero
-/* 95C55C 8024135C 0260282D */  daddu     $a1, $s3, $zero
-/* 95C560 80241360 0C090178 */  jal       func_802405E0_95B7E0
-/* 95C564 80241364 02A0302D */   daddu    $a2, $s5, $zero
-glabel L80241368_95C568
-/* 95C568 80241368 0280202D */  daddu     $a0, $s4, $zero
-/* 95C56C 8024136C 0260282D */  daddu     $a1, $s3, $zero
-/* 95C570 80241370 0C0901CE */  jal       dro_01_UnkFunc13
-/* 95C574 80241374 02A0302D */   daddu    $a2, $s5, $zero
-/* 95C578 80241378 08090512 */  j         L80241448_95C648
-/* 95C57C 8024137C 00000000 */   nop
-glabel L80241380_95C580
-/* 95C580 80241380 0280202D */  daddu     $a0, $s4, $zero
-/* 95C584 80241384 0260282D */  daddu     $a1, $s3, $zero
-/* 95C588 80241388 0C090278 */  jal       dro_01_UnkNpcAIFunc1
-/* 95C58C 8024138C 02A0302D */   daddu    $a2, $s5, $zero
-glabel L80241390_95C590
-/* 95C590 80241390 0280202D */  daddu     $a0, $s4, $zero
-/* 95C594 80241394 0260282D */  daddu     $a1, $s3, $zero
-/* 95C598 80241398 0C0902A8 */  jal       dro_01_UnkFunc14
-/* 95C59C 8024139C 02A0302D */   daddu    $a2, $s5, $zero
-/* 95C5A0 802413A0 08090512 */  j         L80241448_95C648
-/* 95C5A4 802413A4 00000000 */   nop
-glabel L802413A8_95C5A8
-/* 95C5A8 802413A8 0280202D */  daddu     $a0, $s4, $zero
-/* 95C5AC 802413AC 0260282D */  daddu     $a1, $s3, $zero
-/* 95C5B0 802413B0 0C090317 */  jal       func_80240C5C_95BE5C
-/* 95C5B4 802413B4 02A0302D */   daddu    $a2, $s5, $zero
-/* 95C5B8 802413B8 08090512 */  j         L80241448_95C648
-/* 95C5BC 802413BC 00000000 */   nop
-glabel L802413C0_95C5C0
-/* 95C5C0 802413C0 0280202D */  daddu     $a0, $s4, $zero
-/* 95C5C4 802413C4 0260282D */  daddu     $a1, $s3, $zero
-/* 95C5C8 802413C8 0C090344 */  jal       dro_01_NpcJumpFunc2
-/* 95C5CC 802413CC 02A0302D */   daddu    $a2, $s5, $zero
-glabel L802413D0_95C5D0
-/* 95C5D0 802413D0 0280202D */  daddu     $a0, $s4, $zero
-/* 95C5D4 802413D4 0260282D */  daddu     $a1, $s3, $zero
-/* 95C5D8 802413D8 0C090361 */  jal       dro_01_NpcJumpFunc
-/* 95C5DC 802413DC 02A0302D */   daddu    $a2, $s5, $zero
-/* 95C5E0 802413E0 08090512 */  j         L80241448_95C648
-/* 95C5E4 802413E4 00000000 */   nop
-glabel L802413E8_95C5E8
-/* 95C5E8 802413E8 0280202D */  daddu     $a0, $s4, $zero
-/* 95C5EC 802413EC 0260282D */  daddu     $a1, $s3, $zero
-/* 95C5F0 802413F0 0C09037F */  jal       dro_01_UnkNpcAIFunc13
-/* 95C5F4 802413F4 02A0302D */   daddu    $a2, $s5, $zero
-glabel L802413F8_95C5F8
-/* 95C5F8 802413F8 0280202D */  daddu     $a0, $s4, $zero
-/* 95C5FC 802413FC 0260282D */  daddu     $a1, $s3, $zero
-/* 95C600 80241400 0C0903CB */  jal       dro_01_UnkFunc15
-/* 95C604 80241404 02A0302D */   daddu    $a2, $s5, $zero
-/* 95C608 80241408 08090512 */  j         L80241448_95C648
-/* 95C60C 8024140C 00000000 */   nop
-glabel L80241410_95C610
-/* 95C610 80241410 0280202D */  daddu     $a0, $s4, $zero
-/* 95C614 80241414 0260282D */  daddu     $a1, $s3, $zero
-/* 95C618 80241418 0C090413 */  jal       dro_01_UnkNpcDurationFlagFunc
-/* 95C61C 8024141C 02A0302D */   daddu    $a2, $s5, $zero
-/* 95C620 80241420 08090512 */  j         L80241448_95C648
-/* 95C624 80241424 00000000 */   nop
-glabel L80241428_95C628
-/* 95C628 80241428 0280202D */  daddu     $a0, $s4, $zero
-/* 95C62C 8024142C 0260282D */  daddu     $a1, $s3, $zero
-/* 95C630 80241430 0C09042D */  jal       dro_01_UnkFunc16
-/* 95C634 80241434 02A0302D */   daddu    $a2, $s5, $zero
-/* 95C638 80241438 08090512 */  j         L80241448_95C648
-/* 95C63C 8024143C 00000000 */   nop
-glabel L80241440_95C640
-/* 95C640 80241440 0C0129CF */  jal       func_8004A73C
-/* 95C644 80241444 0280202D */   daddu    $a0, $s4, $zero
-glabel L80241448_95C648
-/* 95C648 80241448 8FBF0060 */  lw        $ra, 0x60($sp)
-/* 95C64C 8024144C 8FB5005C */  lw        $s5, 0x5c($sp)
-/* 95C650 80241450 8FB40058 */  lw        $s4, 0x58($sp)
-/* 95C654 80241454 8FB30054 */  lw        $s3, 0x54($sp)
-/* 95C658 80241458 8FB20050 */  lw        $s2, 0x50($sp)
-/* 95C65C 8024145C 8FB1004C */  lw        $s1, 0x4c($sp)
-/* 95C660 80241460 8FB00048 */  lw        $s0, 0x48($sp)
-/* 95C664 80241464 0000102D */  daddu     $v0, $zero, $zero
-/* 95C668 80241468 03E00008 */  jr        $ra
-/* 95C66C 8024146C 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s
deleted file mode 100644
index d36987d675..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241470_95C670
-/* 95C670 80241470 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95C674 80241474 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95C678 80241478 3C108024 */  lui       $s0, %hi(D_802451B8_9603B8)
-/* 95C67C 8024147C 261051B8 */  addiu     $s0, $s0, %lo(D_802451B8_9603B8)
-/* 95C680 80241480 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95C684 80241484 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95C688 80241488 8E020000 */  lw        $v0, ($s0)
-/* 95C68C 8024148C 14400010 */  bnez      $v0, .L802414D0
-/* 95C690 80241490 0080882D */   daddu    $s1, $a0, $zero
-/* 95C694 80241494 0C00AB39 */  jal       heap_malloc
-/* 95C698 80241498 24040040 */   addiu    $a0, $zero, 0x40
-/* 95C69C 8024149C AE020000 */  sw        $v0, ($s0)
-/* 95C6A0 802414A0 0000182D */  daddu     $v1, $zero, $zero
-/* 95C6A4 802414A4 0040282D */  daddu     $a1, $v0, $zero
-/* 95C6A8 802414A8 0220202D */  daddu     $a0, $s1, $zero
-.L802414AC:
-/* 95C6AC 802414AC 8C820084 */  lw        $v0, 0x84($a0)
-/* 95C6B0 802414B0 24840004 */  addiu     $a0, $a0, 4
-/* 95C6B4 802414B4 24630001 */  addiu     $v1, $v1, 1
-/* 95C6B8 802414B8 ACA20000 */  sw        $v0, ($a1)
-/* 95C6BC 802414BC 28620010 */  slti      $v0, $v1, 0x10
-/* 95C6C0 802414C0 1440FFFA */  bnez      $v0, .L802414AC
-/* 95C6C4 802414C4 24A50004 */   addiu    $a1, $a1, 4
-/* 95C6C8 802414C8 08090543 */  j         .L8024150C
-/* 95C6CC 802414CC 00000000 */   nop
-.L802414D0:
-/* 95C6D0 802414D0 0000182D */  daddu     $v1, $zero, $zero
-/* 95C6D4 802414D4 0040282D */  daddu     $a1, $v0, $zero
-/* 95C6D8 802414D8 0220202D */  daddu     $a0, $s1, $zero
-.L802414DC:
-/* 95C6DC 802414DC 8CA20000 */  lw        $v0, ($a1)
-/* 95C6E0 802414E0 24A50004 */  addiu     $a1, $a1, 4
-/* 95C6E4 802414E4 24630001 */  addiu     $v1, $v1, 1
-/* 95C6E8 802414E8 AC820084 */  sw        $v0, 0x84($a0)
-/* 95C6EC 802414EC 28620010 */  slti      $v0, $v1, 0x10
-/* 95C6F0 802414F0 1440FFFA */  bnez      $v0, .L802414DC
-/* 95C6F4 802414F4 24840004 */   addiu    $a0, $a0, 4
-/* 95C6F8 802414F8 3C108024 */  lui       $s0, %hi(D_802451B8_9603B8)
-/* 95C6FC 802414FC 261051B8 */  addiu     $s0, $s0, %lo(D_802451B8_9603B8)
-/* 95C700 80241500 0C00AB4B */  jal       heap_free
-/* 95C704 80241504 8E040000 */   lw       $a0, ($s0)
-/* 95C708 80241508 AE000000 */  sw        $zero, ($s0)
-.L8024150C:
-/* 95C70C 8024150C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95C710 80241510 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95C714 80241514 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95C718 80241518 24020002 */  addiu     $v0, $zero, 2
-/* 95C71C 8024151C 03E00008 */  jr        $ra
-/* 95C720 80241520 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s
deleted file mode 100644
index dd9f5a3e29..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415AC_95C7AC
-/* 95C7AC 802415AC 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 95C7B0 802415B0 AFB10024 */  sw        $s1, 0x24($sp)
-/* 95C7B4 802415B4 0080882D */  daddu     $s1, $a0, $zero
-/* 95C7B8 802415B8 3C05F840 */  lui       $a1, 0xf840
-/* 95C7BC 802415BC AFBF0044 */  sw        $ra, 0x44($sp)
-/* 95C7C0 802415C0 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 95C7C4 802415C4 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 95C7C8 802415C8 AFB60038 */  sw        $s6, 0x38($sp)
-/* 95C7CC 802415CC AFB50034 */  sw        $s5, 0x34($sp)
-/* 95C7D0 802415D0 AFB40030 */  sw        $s4, 0x30($sp)
-/* 95C7D4 802415D4 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 95C7D8 802415D8 AFB20028 */  sw        $s2, 0x28($sp)
-/* 95C7DC 802415DC AFB00020 */  sw        $s0, 0x20($sp)
-/* 95C7E0 802415E0 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 95C7E4 802415E4 0C0B1EAF */  jal       get_variable
-/* 95C7E8 802415E8 34A56268 */   ori      $a1, $a1, 0x6268
-/* 95C7EC 802415EC 0040802D */  daddu     $s0, $v0, $zero
-/* 95C7F0 802415F0 0220202D */  daddu     $a0, $s1, $zero
-/* 95C7F4 802415F4 3C05F840 */  lui       $a1, 0xf840
-/* 95C7F8 802415F8 0C0B1EAF */  jal       get_variable
-/* 95C7FC 802415FC 34A56269 */   ori      $a1, $a1, 0x6269
-/* 95C800 80241600 0040B82D */  daddu     $s7, $v0, $zero
-/* 95C804 80241604 0220202D */  daddu     $a0, $s1, $zero
-/* 95C808 80241608 3C05F5DE */  lui       $a1, 0xf5de
-/* 95C80C 8024160C 0C0B1EAF */  jal       get_variable
-/* 95C810 80241610 34A502DE */   ori      $a1, $a1, 0x2de
-/* 95C814 80241614 0040B02D */  daddu     $s6, $v0, $zero
-/* 95C818 80241618 0220202D */  daddu     $a0, $s1, $zero
-/* 95C81C 8024161C 3C05F5DE */  lui       $a1, 0xf5de
-/* 95C820 80241620 0C0B1EAF */  jal       get_variable
-/* 95C824 80241624 34A502DF */   ori      $a1, $a1, 0x2df
-/* 95C828 80241628 0040A82D */  daddu     $s5, $v0, $zero
-/* 95C82C 8024162C 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 95C830 80241630 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 95C834 80241634 A7B30010 */  sh        $s3, 0x10($sp)
-/* 95C838 80241638 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 95C83C 8024163C 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 95C840 80241640 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 95C844 80241644 12820003 */  beq       $s4, $v0, .L80241654
-/* 95C848 80241648 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 95C84C 8024164C 0000B82D */  daddu     $s7, $zero, $zero
-/* 95C850 80241650 02E0802D */  daddu     $s0, $s7, $zero
-.L80241654:
-/* 95C854 80241654 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 95C858 80241658 14400016 */  bnez      $v0, .L802416B4
-/* 95C85C 8024165C 0220202D */   daddu    $a0, $s1, $zero
-/* 95C860 80241660 0C00A67F */  jal       rand_int
-/* 95C864 80241664 24040064 */   addiu    $a0, $zero, 0x64
-/* 95C868 80241668 2842001E */  slti      $v0, $v0, 0x1e
-/* 95C86C 8024166C 10400011 */  beqz      $v0, .L802416B4
-/* 95C870 80241670 0220202D */   daddu    $a0, $s1, $zero
-/* 95C874 80241674 0C00A67F */  jal       rand_int
-/* 95C878 80241678 2644FFFF */   addiu    $a0, $s2, -1
-/* 95C87C 8024167C 0040A82D */  daddu     $s5, $v0, $zero
-/* 95C880 80241680 0260B02D */  daddu     $s6, $s3, $zero
-/* 95C884 80241684 0220202D */  daddu     $a0, $s1, $zero
-/* 95C888 80241688 3C05F5DE */  lui       $a1, 0xf5de
-/* 95C88C 8024168C 34A502DE */  ori       $a1, $a1, 0x2de
-/* 95C890 80241690 0C0B2026 */  jal       set_variable
-/* 95C894 80241694 0280302D */   daddu    $a2, $s4, $zero
-/* 95C898 80241698 0220202D */  daddu     $a0, $s1, $zero
-/* 95C89C 8024169C 3C05F5DE */  lui       $a1, 0xf5de
-/* 95C8A0 802416A0 34A502DF */  ori       $a1, $a1, 0x2df
-/* 95C8A4 802416A4 0C0B2026 */  jal       set_variable
-/* 95C8A8 802416A8 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 95C8AC 802416AC 24100001 */  addiu     $s0, $zero, 1
-/* 95C8B0 802416B0 0220202D */  daddu     $a0, $s1, $zero
-.L802416B4:
-/* 95C8B4 802416B4 3C05F840 */  lui       $a1, 0xf840
-/* 95C8B8 802416B8 34A56268 */  ori       $a1, $a1, 0x6268
-/* 95C8BC 802416BC 0C0B2026 */  jal       set_variable
-/* 95C8C0 802416C0 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 95C8C4 802416C4 0220202D */  daddu     $a0, $s1, $zero
-/* 95C8C8 802416C8 3C05F840 */  lui       $a1, 0xf840
-/* 95C8CC 802416CC 34A56269 */  ori       $a1, $a1, 0x6269
-/* 95C8D0 802416D0 0C0B2026 */  jal       set_variable
-/* 95C8D4 802416D4 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 95C8D8 802416D8 0000202D */  daddu     $a0, $zero, $zero
-/* 95C8DC 802416DC 3C05F5DE */  lui       $a1, 0xf5de
-/* 95C8E0 802416E0 0C0B1EAF */  jal       get_variable
-/* 95C8E4 802416E4 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 95C8E8 802416E8 0000202D */  daddu     $a0, $zero, $zero
-/* 95C8EC 802416EC 3C05F5DE */  lui       $a1, 0xf5de
-/* 95C8F0 802416F0 34A50180 */  ori       $a1, $a1, 0x180
-/* 95C8F4 802416F4 0C0B1EAF */  jal       get_variable
-/* 95C8F8 802416F8 0040802D */   daddu    $s0, $v0, $zero
-/* 95C8FC 802416FC 0040282D */  daddu     $a1, $v0, $zero
-/* 95C900 80241700 0000182D */  daddu     $v1, $zero, $zero
-/* 95C904 80241704 3C068024 */  lui       $a2, %hi(D_8024525C_96045C)
-/* 95C908 80241708 24C6525C */  addiu     $a2, $a2, %lo(D_8024525C_96045C)
-/* 95C90C 8024170C 00C0202D */  daddu     $a0, $a2, $zero
-.L80241710:
-/* 95C910 80241710 8C820000 */  lw        $v0, ($a0)
-/* 95C914 80241714 00A2102A */  slt       $v0, $a1, $v0
-/* 95C918 80241718 14400006 */  bnez      $v0, .L80241734
-/* 95C91C 8024171C 000310C0 */   sll      $v0, $v1, 3
-/* 95C920 80241720 24630001 */  addiu     $v1, $v1, 1
-/* 95C924 80241724 28620008 */  slti      $v0, $v1, 8
-/* 95C928 80241728 1440FFF9 */  bnez      $v0, .L80241710
-/* 95C92C 8024172C 24840008 */   addiu    $a0, $a0, 8
-/* 95C930 80241730 000310C0 */  sll       $v0, $v1, 3
-.L80241734:
-/* 95C934 80241734 00461021 */  addu      $v0, $v0, $a2
-/* 95C938 80241738 8C420004 */  lw        $v0, 4($v0)
-/* 95C93C 8024173C 97A30010 */  lhu       $v1, 0x10($sp)
-/* 95C940 80241740 0202202A */  slt       $a0, $s0, $v0
-/* 95C944 80241744 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 95C948 80241748 14620008 */  bne       $v1, $v0, .L8024176C
-/* 95C94C 8024174C 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 95C950 80241750 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 95C954 80241754 14E20005 */  bne       $a3, $v0, .L8024176C
-/* 95C958 80241758 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 95C95C 8024175C 14400003 */  bnez      $v0, .L8024176C
-/* 95C960 80241760 00000000 */   nop
-/* 95C964 80241764 14800008 */  bnez      $a0, .L80241788
-/* 95C968 80241768 24020001 */   addiu    $v0, $zero, 1
-.L8024176C:
-/* 95C96C 8024176C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 95C970 80241770 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 95C974 80241774 80420075 */  lb        $v0, 0x75($v0)
-/* 95C978 80241778 10400005 */  beqz      $v0, .L80241790
-/* 95C97C 8024177C 00000000 */   nop
-/* 95C980 80241780 10800003 */  beqz      $a0, .L80241790
-/* 95C984 80241784 24020001 */   addiu    $v0, $zero, 1
-.L80241788:
-/* 95C988 80241788 080905E7 */  j         .L8024179C
-/* 95C98C 8024178C AE220084 */   sw       $v0, 0x84($s1)
-.L80241790:
-/* 95C990 80241790 0C00F9EB */  jal       kill_enemy
-/* 95C994 80241794 03C0202D */   daddu    $a0, $fp, $zero
-/* 95C998 80241798 AE200084 */  sw        $zero, 0x84($s1)
-.L8024179C:
-/* 95C99C 8024179C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 95C9A0 802417A0 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 95C9A4 802417A4 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 95C9A8 802417A8 8FB60038 */  lw        $s6, 0x38($sp)
-/* 95C9AC 802417AC 8FB50034 */  lw        $s5, 0x34($sp)
-/* 95C9B0 802417B0 8FB40030 */  lw        $s4, 0x30($sp)
-/* 95C9B4 802417B4 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 95C9B8 802417B8 8FB20028 */  lw        $s2, 0x28($sp)
-/* 95C9BC 802417BC 8FB10024 */  lw        $s1, 0x24($sp)
-/* 95C9C0 802417C0 8FB00020 */  lw        $s0, 0x20($sp)
-/* 95C9C4 802417C4 24020002 */  addiu     $v0, $zero, 2
-/* 95C9C8 802417C8 03E00008 */  jr        $ra
-/* 95C9CC 802417CC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s
deleted file mode 100644
index d2b7e90059..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417D0_95C9D0
-/* 95C9D0 802417D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95C9D4 802417D4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 95C9D8 802417D8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95C9DC 802417DC 0C00EABB */  jal       get_npc_unsafe
-/* 95C9E0 802417E0 8C84014C */   lw       $a0, 0x14c($a0)
-/* 95C9E4 802417E4 24040008 */  addiu     $a0, $zero, 8
-/* 95C9E8 802417E8 0040802D */  daddu     $s0, $v0, $zero
-/* 95C9EC 802417EC 3C028024 */  lui       $v0, %hi(func_8024183C_95CA3C)
-/* 95C9F0 802417F0 2442183C */  addiu     $v0, $v0, %lo(func_8024183C_95CA3C)
-/* 95C9F4 802417F4 0C00AB39 */  jal       heap_malloc
-/* 95C9F8 802417F8 AE020008 */   sw       $v0, 8($s0)
-/* 95C9FC 802417FC 0040182D */  daddu     $v1, $v0, $zero
-/* 95CA00 80241800 AE030020 */  sw        $v1, 0x20($s0)
-/* 95CA04 80241804 AC600000 */  sw        $zero, ($v1)
-/* 95CA08 80241808 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 95CA0C 8024180C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95CA10 80241810 24020001 */  addiu     $v0, $zero, 1
-/* 95CA14 80241814 03E00008 */  jr        $ra
-/* 95CA18 80241818 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s
deleted file mode 100644
index d439e511e9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024183C_95CA3C
-/* 95CA3C 8024183C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95CA40 80241840 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 95CA44 80241844 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 95CA48 80241848 3C05800B */  lui       $a1, %hi(gCameras)
-/* 95CA4C 8024184C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 95CA50 80241850 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95CA54 80241854 00031080 */  sll       $v0, $v1, 2
-/* 95CA58 80241858 00431021 */  addu      $v0, $v0, $v1
-/* 95CA5C 8024185C 00021080 */  sll       $v0, $v0, 2
-/* 95CA60 80241860 00431023 */  subu      $v0, $v0, $v1
-/* 95CA64 80241864 000218C0 */  sll       $v1, $v0, 3
-/* 95CA68 80241868 00431021 */  addu      $v0, $v0, $v1
-/* 95CA6C 8024186C 8C830020 */  lw        $v1, 0x20($a0)
-/* 95CA70 80241870 000210C0 */  sll       $v0, $v0, 3
-/* 95CA74 80241874 8C630000 */  lw        $v1, ($v1)
-/* 95CA78 80241878 30630001 */  andi      $v1, $v1, 1
-/* 95CA7C 8024187C 10600004 */  beqz      $v1, .L80241890
-/* 95CA80 80241880 00451021 */   addu     $v0, $v0, $a1
-/* 95CA84 80241884 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 95CA88 80241888 0C00A6C9 */  jal       clamp_angle
-/* 95CA8C 8024188C 46006307 */   neg.s    $f12, $f12
-.L80241890:
-/* 95CA90 80241890 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95CA94 80241894 03E00008 */  jr        $ra
-/* 95CA98 80241898 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s
deleted file mode 100644
index caa55eb97e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419E8_95CBE8
-/* 95CBE8 802419E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 95CBEC 802419EC AFB00010 */  sw        $s0, 0x10($sp)
-/* 95CBF0 802419F0 0080802D */  daddu     $s0, $a0, $zero
-/* 95CBF4 802419F4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 95CBF8 802419F8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 95CBFC 802419FC AFB20018 */  sw        $s2, 0x18($sp)
-/* 95CC00 80241A00 10A00009 */  beqz      $a1, .L80241A28
-/* 95CC04 80241A04 AFB10014 */   sw       $s1, 0x14($sp)
-/* 95CC08 80241A08 0000202D */  daddu     $a0, $zero, $zero
-/* 95CC0C 80241A0C 0080282D */  daddu     $a1, $a0, $zero
-/* 95CC10 80241A10 0080302D */  daddu     $a2, $a0, $zero
-/* 95CC14 80241A14 0C046F97 */  jal       set_background_color_blend
-/* 95CC18 80241A18 240700FF */   addiu    $a3, $zero, 0xff
-/* 95CC1C 80241A1C 240200FF */  addiu     $v0, $zero, 0xff
-/* 95CC20 80241A20 AE020070 */  sw        $v0, 0x70($s0)
-/* 95CC24 80241A24 AE000074 */  sw        $zero, 0x74($s0)
-.L80241A28:
-/* 95CC28 80241A28 8E020070 */  lw        $v0, 0x70($s0)
-/* 95CC2C 80241A2C 2442FFF8 */  addiu     $v0, $v0, -8
-/* 95CC30 80241A30 04410002 */  bgez      $v0, .L80241A3C
-/* 95CC34 80241A34 AE020070 */   sw       $v0, 0x70($s0)
-/* 95CC38 80241A38 AE000070 */  sw        $zero, 0x70($s0)
-.L80241A3C:
-/* 95CC3C 80241A3C 0000202D */  daddu     $a0, $zero, $zero
-/* 95CC40 80241A40 0080282D */  daddu     $a1, $a0, $zero
-/* 95CC44 80241A44 92070073 */  lbu       $a3, 0x73($s0)
-/* 95CC48 80241A48 0C046F97 */  jal       set_background_color_blend
-/* 95CC4C 80241A4C 0080302D */   daddu    $a2, $a0, $zero
-/* 95CC50 80241A50 8E020070 */  lw        $v0, 0x70($s0)
-/* 95CC54 80241A54 14400006 */  bnez      $v0, .L80241A70
-/* 95CC58 80241A58 00000000 */   nop
-/* 95CC5C 80241A5C 8E020074 */  lw        $v0, 0x74($s0)
-/* 95CC60 80241A60 14400003 */  bnez      $v0, .L80241A70
-/* 95CC64 80241A64 24020001 */   addiu    $v0, $zero, 1
-/* 95CC68 80241A68 080906CF */  j         .L80241B3C
-/* 95CC6C 80241A6C AE020074 */   sw       $v0, 0x74($s0)
-.L80241A70:
-/* 95CC70 80241A70 8E030074 */  lw        $v1, 0x74($s0)
-/* 95CC74 80241A74 24020001 */  addiu     $v0, $zero, 1
-/* 95CC78 80241A78 14620031 */  bne       $v1, $v0, .L80241B40
-/* 95CC7C 80241A7C 0000102D */   daddu    $v0, $zero, $zero
-/* 95CC80 80241A80 0C04760B */  jal       func_8011D82C
-/* 95CC84 80241A84 0000202D */   daddu    $a0, $zero, $zero
-/* 95CC88 80241A88 0000802D */  daddu     $s0, $zero, $zero
-/* 95CC8C 80241A8C 2413FFFC */  addiu     $s3, $zero, -4
-/* 95CC90 80241A90 2412000A */  addiu     $s2, $zero, 0xa
-/* 95CC94 80241A94 3C11FF7F */  lui       $s1, 0xff7f
-/* 95CC98 80241A98 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 95CC9C 80241A9C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 95CCA0 80241AA0 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 95CCA4 80241AA4 A0400000 */  sb        $zero, ($v0)
-.L80241AA8:
-/* 95CCA8 80241AA8 0C00E2B7 */  jal       get_npc_by_index
-/* 95CCAC 80241AAC 0200202D */   daddu    $a0, $s0, $zero
-/* 95CCB0 80241AB0 0040202D */  daddu     $a0, $v0, $zero
-/* 95CCB4 80241AB4 5080000B */  beql      $a0, $zero, .L80241AE4
-/* 95CCB8 80241AB8 26100001 */   addiu    $s0, $s0, 1
-/* 95CCBC 80241ABC 8C820000 */  lw        $v0, ($a0)
-/* 95CCC0 80241AC0 50400008 */  beql      $v0, $zero, .L80241AE4
-/* 95CCC4 80241AC4 26100001 */   addiu    $s0, $s0, 1
-/* 95CCC8 80241AC8 808300A4 */  lb        $v1, 0xa4($a0)
-/* 95CCCC 80241ACC 10730005 */  beq       $v1, $s3, .L80241AE4
-/* 95CCD0 80241AD0 26100001 */   addiu    $s0, $s0, 1
-/* 95CCD4 80241AD4 10720003 */  beq       $v1, $s2, .L80241AE4
-/* 95CCD8 80241AD8 00000000 */   nop
-/* 95CCDC 80241ADC 00511024 */  and       $v0, $v0, $s1
-/* 95CCE0 80241AE0 AC820000 */  sw        $v0, ($a0)
-.L80241AE4:
-/* 95CCE4 80241AE4 2A020040 */  slti      $v0, $s0, 0x40
-/* 95CCE8 80241AE8 1440FFEF */  bnez      $v0, .L80241AA8
-/* 95CCEC 80241AEC 00000000 */   nop
-/* 95CCF0 80241AF0 0000802D */  daddu     $s0, $zero, $zero
-/* 95CCF4 80241AF4 3C11F7FF */  lui       $s1, 0xf7ff
-/* 95CCF8 80241AF8 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80241AFC:
-/* 95CCFC 80241AFC 0C04C3D6 */  jal       get_item_entity
-/* 95CD00 80241B00 0200202D */   daddu    $a0, $s0, $zero
-/* 95CD04 80241B04 0040182D */  daddu     $v1, $v0, $zero
-/* 95CD08 80241B08 10600007 */  beqz      $v1, .L80241B28
-/* 95CD0C 80241B0C 26100001 */   addiu    $s0, $s0, 1
-/* 95CD10 80241B10 8C640000 */  lw        $a0, ($v1)
-/* 95CD14 80241B14 30820010 */  andi      $v0, $a0, 0x10
-/* 95CD18 80241B18 10400003 */  beqz      $v0, .L80241B28
-/* 95CD1C 80241B1C 00000000 */   nop
-/* 95CD20 80241B20 00911024 */  and       $v0, $a0, $s1
-/* 95CD24 80241B24 AC620000 */  sw        $v0, ($v1)
-.L80241B28:
-/* 95CD28 80241B28 2A020100 */  slti      $v0, $s0, 0x100
-/* 95CD2C 80241B2C 1440FFF3 */  bnez      $v0, .L80241AFC
-/* 95CD30 80241B30 24020002 */   addiu    $v0, $zero, 2
-/* 95CD34 80241B34 080906D0 */  j         .L80241B40
-/* 95CD38 80241B38 00000000 */   nop
-.L80241B3C:
-/* 95CD3C 80241B3C 0000102D */  daddu     $v0, $zero, $zero
-.L80241B40:
-/* 95CD40 80241B40 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 95CD44 80241B44 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 95CD48 80241B48 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95CD4C 80241B4C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95CD50 80241B50 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95CD54 80241B54 03E00008 */  jr        $ra
-/* 95CD58 80241B58 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s
deleted file mode 100644
index dabbd8b5d2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B5C_95CD5C
-/* 95CD5C 80241B5C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95CD60 80241B60 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95CD64 80241B64 3C108011 */  lui       $s0, %hi(gPlayerData)
-/* 95CD68 80241B68 2610F290 */  addiu     $s0, $s0, %lo(gPlayerData)
-/* 95CD6C 80241B6C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95CD70 80241B70 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95CD74 80241B74 960302C0 */  lhu       $v1, 0x2c0($s0)
-/* 95CD78 80241B78 2C6203E7 */  sltiu     $v0, $v1, 0x3e7
-/* 95CD7C 80241B7C 10400003 */  beqz      $v0, .L80241B8C
-/* 95CD80 80241B80 0080882D */   daddu    $s1, $a0, $zero
-/* 95CD84 80241B84 24620001 */  addiu     $v0, $v1, 1
-/* 95CD88 80241B88 A60202C0 */  sh        $v0, 0x2c0($s0)
-.L80241B8C:
-/* 95CD8C 80241B8C 3C05F5DE */  lui       $a1, 0xf5de
-/* 95CD90 80241B90 34A502E0 */  ori       $a1, $a1, 0x2e0
-/* 95CD94 80241B94 0C0B1EAF */  jal       get_variable
-/* 95CD98 80241B98 0000202D */   daddu    $a0, $zero, $zero
-/* 95CD9C 80241B9C 3C038024 */  lui       $v1, %hi(D_8024521C_96041C)
-/* 95CDA0 80241BA0 00621821 */  addu      $v1, $v1, $v0
-/* 95CDA4 80241BA4 9063521C */  lbu       $v1, %lo(D_8024521C_96041C)($v1)
-/* 95CDA8 80241BA8 8E220084 */  lw        $v0, 0x84($s1)
-/* 95CDAC 80241BAC 54430006 */  bnel      $v0, $v1, .L80241BC8
-/* 95CDB0 80241BB0 AE200084 */   sw       $zero, 0x84($s1)
-/* 95CDB4 80241BB4 24020001 */  addiu     $v0, $zero, 1
-/* 95CDB8 80241BB8 AE220084 */  sw        $v0, 0x84($s1)
-/* 95CDBC 80241BBC 960202C2 */  lhu       $v0, 0x2c2($s0)
-/* 95CDC0 80241BC0 24420001 */  addiu     $v0, $v0, 1
-/* 95CDC4 80241BC4 A60202C2 */  sh        $v0, 0x2c2($s0)
-.L80241BC8:
-/* 95CDC8 80241BC8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95CDCC 80241BCC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95CDD0 80241BD0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95CDD4 80241BD4 24020002 */  addiu     $v0, $zero, 2
-/* 95CDD8 80241BD8 03E00008 */  jr        $ra
-/* 95CDDC 80241BDC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s
deleted file mode 100644
index 7879f8d5db..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241BE0_95CDE0
-/* 95CDE0 80241BE0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 95CDE4 80241BE4 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 95CDE8 80241BE8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 95CDEC 80241BEC AFB00018 */  sw        $s0, 0x18($sp)
-/* 95CDF0 80241BF0 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 95CDF4 80241BF4 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 95CDF8 80241BF8 10A00060 */  beqz      $a1, .L80241D7C
-/* 95CDFC 80241BFC 0080882D */   daddu    $s1, $a0, $zero
-/* 95CE00 80241C00 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CE04 80241C04 0C0B1EAF */  jal       get_variable
-/* 95CE08 80241C08 34A5D481 */   ori      $a1, $a1, 0xd481
-/* 95CE0C 80241C0C 0220202D */  daddu     $a0, $s1, $zero
-/* 95CE10 80241C10 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CE14 80241C14 4482B000 */  mtc1      $v0, $f22
-/* 95CE18 80241C18 00000000 */  nop
-/* 95CE1C 80241C1C 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 95CE20 80241C20 0C0B1EAF */  jal       get_variable
-/* 95CE24 80241C24 34A5D482 */   ori      $a1, $a1, 0xd482
-/* 95CE28 80241C28 0220202D */  daddu     $a0, $s1, $zero
-/* 95CE2C 80241C2C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CE30 80241C30 4482A000 */  mtc1      $v0, $f20
-/* 95CE34 80241C34 00000000 */  nop
-/* 95CE38 80241C38 4680A520 */  cvt.s.w   $f20, $f20
-/* 95CE3C 80241C3C 0C0B1EAF */  jal       get_variable
-/* 95CE40 80241C40 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 95CE44 80241C44 44821000 */  mtc1      $v0, $f2
-/* 95CE48 80241C48 00000000 */  nop
-/* 95CE4C 80241C4C 468010A0 */  cvt.s.w   $f2, $f2
-/* 95CE50 80241C50 4405B000 */  mfc1      $a1, $f22
-/* 95CE54 80241C54 4406A000 */  mfc1      $a2, $f20
-/* 95CE58 80241C58 44071000 */  mfc1      $a3, $f2
-/* 95CE5C 80241C5C 0C01C574 */  jal       func_800715D0
-/* 95CE60 80241C60 0000202D */   daddu    $a0, $zero, $zero
-/* 95CE64 80241C64 0220202D */  daddu     $a0, $s1, $zero
-/* 95CE68 80241C68 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CE6C 80241C6C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 95CE70 80241C70 3C108025 */  lui       $s0, %hi(D_8024DFE0)
-/* 95CE74 80241C74 2610DFE0 */  addiu     $s0, $s0, %lo(D_8024DFE0)
-/* 95CE78 80241C78 0C0B1EAF */  jal       get_variable
-/* 95CE7C 80241C7C AE020000 */   sw       $v0, ($s0)
-/* 95CE80 80241C80 0220202D */  daddu     $a0, $s1, $zero
-/* 95CE84 80241C84 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CE88 80241C88 4482B000 */  mtc1      $v0, $f22
-/* 95CE8C 80241C8C 00000000 */  nop
-/* 95CE90 80241C90 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 95CE94 80241C94 0C0B1EAF */  jal       get_variable
-/* 95CE98 80241C98 34A5D482 */   ori      $a1, $a1, 0xd482
-/* 95CE9C 80241C9C 0220202D */  daddu     $a0, $s1, $zero
-/* 95CEA0 80241CA0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CEA4 80241CA4 4482A000 */  mtc1      $v0, $f20
-/* 95CEA8 80241CA8 00000000 */  nop
-/* 95CEAC 80241CAC 4680A520 */  cvt.s.w   $f20, $f20
-/* 95CEB0 80241CB0 0C0B1EAF */  jal       get_variable
-/* 95CEB4 80241CB4 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 95CEB8 80241CB8 44821000 */  mtc1      $v0, $f2
-/* 95CEBC 80241CBC 00000000 */  nop
-/* 95CEC0 80241CC0 468010A0 */  cvt.s.w   $f2, $f2
-/* 95CEC4 80241CC4 4405B000 */  mfc1      $a1, $f22
-/* 95CEC8 80241CC8 4406A000 */  mfc1      $a2, $f20
-/* 95CECC 80241CCC 44071000 */  mfc1      $a3, $f2
-/* 95CED0 80241CD0 0C01C604 */  jal       func_80071810
-/* 95CED4 80241CD4 0000202D */   daddu    $a0, $zero, $zero
-/* 95CED8 80241CD8 0220202D */  daddu     $a0, $s1, $zero
-/* 95CEDC 80241CDC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CEE0 80241CE0 3C018025 */  lui       $at, %hi(D_8024DFE4)
-/* 95CEE4 80241CE4 AC22DFE4 */  sw        $v0, %lo(D_8024DFE4)($at)
-/* 95CEE8 80241CE8 0C0B1EAF */  jal       get_variable
-/* 95CEEC 80241CEC 34A5D481 */   ori      $a1, $a1, 0xd481
-/* 95CEF0 80241CF0 0220202D */  daddu     $a0, $s1, $zero
-/* 95CEF4 80241CF4 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CEF8 80241CF8 4482B000 */  mtc1      $v0, $f22
-/* 95CEFC 80241CFC 00000000 */  nop
-/* 95CF00 80241D00 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 95CF04 80241D04 0C0B1EAF */  jal       get_variable
-/* 95CF08 80241D08 34A5D482 */   ori      $a1, $a1, 0xd482
-/* 95CF0C 80241D0C 0220202D */  daddu     $a0, $s1, $zero
-/* 95CF10 80241D10 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CF14 80241D14 4482A000 */  mtc1      $v0, $f20
-/* 95CF18 80241D18 00000000 */  nop
-/* 95CF1C 80241D1C 4680A520 */  cvt.s.w   $f20, $f20
-/* 95CF20 80241D20 0C0B1EAF */  jal       get_variable
-/* 95CF24 80241D24 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 95CF28 80241D28 44821000 */  mtc1      $v0, $f2
-/* 95CF2C 80241D2C 00000000 */  nop
-/* 95CF30 80241D30 468010A0 */  cvt.s.w   $f2, $f2
-/* 95CF34 80241D34 4405B000 */  mfc1      $a1, $f22
-/* 95CF38 80241D38 4406A000 */  mfc1      $a2, $f20
-/* 95CF3C 80241D3C 3C013F80 */  lui       $at, 0x3f80
-/* 95CF40 80241D40 44810000 */  mtc1      $at, $f0
-/* 95CF44 80241D44 44071000 */  mfc1      $a3, $f2
-/* 95CF48 80241D48 0000202D */  daddu     $a0, $zero, $zero
-/* 95CF4C 80241D4C AFA00014 */  sw        $zero, 0x14($sp)
-/* 95CF50 80241D50 0C01CA24 */  jal       func_80072890
-/* 95CF54 80241D54 E7A00010 */   swc1     $f0, 0x10($sp)
-/* 95CF58 80241D58 8E030000 */  lw        $v1, ($s0)
-/* 95CF5C 80241D5C 8C64000C */  lw        $a0, 0xc($v1)
-/* 95CF60 80241D60 3C018025 */  lui       $at, %hi(D_8024DFE8)
-/* 95CF64 80241D64 AC22DFE8 */  sw        $v0, %lo(D_8024DFE8)($at)
-/* 95CF68 80241D68 AC800018 */  sw        $zero, 0x18($a0)
-/* 95CF6C 80241D6C AC800020 */  sw        $zero, 0x20($a0)
-/* 95CF70 80241D70 AC800024 */  sw        $zero, 0x24($a0)
-/* 95CF74 80241D74 AC800028 */  sw        $zero, 0x28($a0)
-/* 95CF78 80241D78 AC80001C */  sw        $zero, 0x1c($a0)
-.L80241D7C:
-/* 95CF7C 80241D7C 3C028025 */  lui       $v0, %hi(D_8024DFE0)
-/* 95CF80 80241D80 8C42DFE0 */  lw        $v0, %lo(D_8024DFE0)($v0)
-/* 95CF84 80241D84 8C44000C */  lw        $a0, 0xc($v0)
-/* 95CF88 80241D88 8C820020 */  lw        $v0, 0x20($a0)
-/* 95CF8C 80241D8C 8C830028 */  lw        $v1, 0x28($a0)
-/* 95CF90 80241D90 2442000A */  addiu     $v0, $v0, 0xa
-/* 95CF94 80241D94 AC820020 */  sw        $v0, 0x20($a0)
-/* 95CF98 80241D98 8C820024 */  lw        $v0, 0x24($a0)
-/* 95CF9C 80241D9C 2463000A */  addiu     $v1, $v1, 0xa
-/* 95CFA0 80241DA0 AC830028 */  sw        $v1, 0x28($a0)
-/* 95CFA4 80241DA4 8C830018 */  lw        $v1, 0x18($a0)
-/* 95CFA8 80241DA8 2442000A */  addiu     $v0, $v0, 0xa
-/* 95CFAC 80241DAC AC820024 */  sw        $v0, 0x24($a0)
-/* 95CFB0 80241DB0 8C82001C */  lw        $v0, 0x1c($a0)
-/* 95CFB4 80241DB4 2463000A */  addiu     $v1, $v1, 0xa
-/* 95CFB8 80241DB8 AC830018 */  sw        $v1, 0x18($a0)
-/* 95CFBC 80241DBC 286300FF */  slti      $v1, $v1, 0xff
-/* 95CFC0 80241DC0 2442000A */  addiu     $v0, $v0, 0xa
-/* 95CFC4 80241DC4 AC82001C */  sw        $v0, 0x1c($a0)
-/* 95CFC8 80241DC8 14600004 */  bnez      $v1, .L80241DDC
-/* 95CFCC 80241DCC 0000102D */   daddu    $v0, $zero, $zero
-/* 95CFD0 80241DD0 240200FF */  addiu     $v0, $zero, 0xff
-/* 95CFD4 80241DD4 AC820018 */  sw        $v0, 0x18($a0)
-/* 95CFD8 80241DD8 24020002 */  addiu     $v0, $zero, 2
-.L80241DDC:
-/* 95CFDC 80241DDC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 95CFE0 80241DE0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 95CFE4 80241DE4 8FB00018 */  lw        $s0, 0x18($sp)
-/* 95CFE8 80241DE8 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 95CFEC 80241DEC D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 95CFF0 80241DF0 03E00008 */  jr        $ra
-/* 95CFF4 80241DF4 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s
deleted file mode 100644
index f8d383b470..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241DF8_95CFF8
-/* 95CFF8 80241DF8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95CFFC 80241DFC 10A0000B */  beqz      $a1, .L80241E2C
-/* 95D000 80241E00 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 95D004 80241E04 3C038025 */  lui       $v1, %hi(D_8024DFE4)
-/* 95D008 80241E08 8C63DFE4 */  lw        $v1, %lo(D_8024DFE4)($v1)
-/* 95D00C 80241E0C 8C620000 */  lw        $v0, ($v1)
-/* 95D010 80241E10 3C048025 */  lui       $a0, %hi(D_8024DFE8)
-/* 95D014 80241E14 8C84DFE8 */  lw        $a0, %lo(D_8024DFE8)($a0)
-/* 95D018 80241E18 34420010 */  ori       $v0, $v0, 0x10
-/* 95D01C 80241E1C AC620000 */  sw        $v0, ($v1)
-/* 95D020 80241E20 8C820000 */  lw        $v0, ($a0)
-/* 95D024 80241E24 34420010 */  ori       $v0, $v0, 0x10
-/* 95D028 80241E28 AC820000 */  sw        $v0, ($a0)
-.L80241E2C:
-/* 95D02C 80241E2C 3C048025 */  lui       $a0, %hi(D_8024DFE0)
-/* 95D030 80241E30 8C84DFE0 */  lw        $a0, %lo(D_8024DFE0)($a0)
-/* 95D034 80241E34 8C85000C */  lw        $a1, 0xc($a0)
-/* 95D038 80241E38 8CA20018 */  lw        $v0, 0x18($a1)
-/* 95D03C 80241E3C 8CA30020 */  lw        $v1, 0x20($a1)
-/* 95D040 80241E40 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* 95D044 80241E44 ACA20018 */  sw        $v0, 0x18($a1)
-/* 95D048 80241E48 8CA20024 */  lw        $v0, 0x24($a1)
-/* 95D04C 80241E4C 2463FFF6 */  addiu     $v1, $v1, -0xa
-/* 95D050 80241E50 ACA30020 */  sw        $v1, 0x20($a1)
-/* 95D054 80241E54 8CA30028 */  lw        $v1, 0x28($a1)
-/* 95D058 80241E58 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* 95D05C 80241E5C ACA20024 */  sw        $v0, 0x24($a1)
-/* 95D060 80241E60 8CA2001C */  lw        $v0, 0x1c($a1)
-/* 95D064 80241E64 2463FFF6 */  addiu     $v1, $v1, -0xa
-/* 95D068 80241E68 ACA30028 */  sw        $v1, 0x28($a1)
-/* 95D06C 80241E6C 8CA30018 */  lw        $v1, 0x18($a1)
-/* 95D070 80241E70 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* 95D074 80241E74 18600003 */  blez      $v1, .L80241E84
-/* 95D078 80241E78 ACA2001C */   sw       $v0, 0x1c($a1)
-/* 95D07C 80241E7C 080907A8 */  j         .L80241EA0
-/* 95D080 80241E80 0000102D */   daddu    $v0, $zero, $zero
-.L80241E84:
-/* 95D084 80241E84 0C016914 */  jal       remove_effect
-/* 95D088 80241E88 ACA00018 */   sw       $zero, 0x18($a1)
-/* 95D08C 80241E8C 3C048025 */  lui       $a0, %hi(D_8024DFC0)
-/* 95D090 80241E90 8C84DFC0 */  lw        $a0, %lo(D_8024DFC0)($a0)
-/* 95D094 80241E94 0C048D70 */  jal       free_dynamic_entity
-/* 95D098 80241E98 00000000 */   nop
-/* 95D09C 80241E9C 24020002 */  addiu     $v0, $zero, 2
-.L80241EA0:
-/* 95D0A0 80241EA0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D0A4 80241EA4 03E00008 */  jr        $ra
-/* 95D0A8 80241EA8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EAC_95D0AC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EAC_95D0AC.s
deleted file mode 100644
index 293ed21090..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EAC_95D0AC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241EAC_95D0AC
-/* 95D0AC 80241EAC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D0B0 80241EB0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D0B4 80241EB4 8C82000C */  lw        $v0, 0xc($a0)
-/* 95D0B8 80241EB8 0C0B1EAF */  jal       get_variable
-/* 95D0BC 80241EBC 8C450000 */   lw       $a1, ($v0)
-/* 95D0C0 80241EC0 3C038025 */  lui       $v1, %hi(D_8024DFE0)
-/* 95D0C4 80241EC4 8C63DFE0 */  lw        $v1, %lo(D_8024DFE0)($v1)
-/* 95D0C8 80241EC8 8C63000C */  lw        $v1, 0xc($v1)
-/* 95D0CC 80241ECC AC620034 */  sw        $v0, 0x34($v1)
-/* 95D0D0 80241ED0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D0D4 80241ED4 24020002 */  addiu     $v0, $zero, 2
-/* 95D0D8 80241ED8 03E00008 */  jr        $ra
-/* 95D0DC 80241EDC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s
deleted file mode 100644
index ef8d4ad201..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241EE0_95D0E0
-/* 95D0E0 80241EE0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D0E4 80241EE4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D0E8 80241EE8 8C82000C */  lw        $v0, 0xc($a0)
-/* 95D0EC 80241EEC 0C0B1EAF */  jal       get_variable
-/* 95D0F0 80241EF0 8C450000 */   lw       $a1, ($v0)
-/* 95D0F4 80241EF4 0040202D */  daddu     $a0, $v0, $zero
-/* 95D0F8 80241EF8 3C028025 */  lui       $v0, %hi(D_8024DFE0)
-/* 95D0FC 80241EFC 8C42DFE0 */  lw        $v0, %lo(D_8024DFE0)($v0)
-/* 95D100 80241F00 24030001 */  addiu     $v1, $zero, 1
-/* 95D104 80241F04 8C45000C */  lw        $a1, 0xc($v0)
-/* 95D108 80241F08 1083000D */  beq       $a0, $v1, .L80241F40
-/* 95D10C 80241F0C 28820002 */   slti     $v0, $a0, 2
-/* 95D110 80241F10 10400005 */  beqz      $v0, .L80241F28
-/* 95D114 80241F14 24020002 */   addiu    $v0, $zero, 2
-/* 95D118 80241F18 10800007 */  beqz      $a0, .L80241F38
-/* 95D11C 80241F1C 240200C0 */   addiu    $v0, $zero, 0xc0
-/* 95D120 80241F20 080907D4 */  j         .L80241F50
-/* 95D124 80241F24 ACA00038 */   sw       $zero, 0x38($a1)
-.L80241F28:
-/* 95D128 80241F28 10820008 */  beq       $a0, $v0, .L80241F4C
-/* 95D12C 80241F2C 24020040 */   addiu    $v0, $zero, 0x40
-/* 95D130 80241F30 080907D4 */  j         .L80241F50
-/* 95D134 80241F34 ACA00038 */   sw       $zero, 0x38($a1)
-.L80241F38:
-/* 95D138 80241F38 080907D4 */  j         .L80241F50
-/* 95D13C 80241F3C ACA20038 */   sw       $v0, 0x38($a1)
-.L80241F40:
-/* 95D140 80241F40 24020080 */  addiu     $v0, $zero, 0x80
-/* 95D144 80241F44 080907D4 */  j         .L80241F50
-/* 95D148 80241F48 ACA20038 */   sw       $v0, 0x38($a1)
-.L80241F4C:
-/* 95D14C 80241F4C ACA20038 */  sw        $v0, 0x38($a1)
-.L80241F50:
-/* 95D150 80241F50 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D154 80241F54 24020002 */  addiu     $v0, $zero, 2
-/* 95D158 80241F58 03E00008 */  jr        $ra
-/* 95D15C 80241F5C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s
deleted file mode 100644
index 32a9c48be1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F60_95D160
-/* 95D160 80241F60 3C028025 */  lui       $v0, %hi(D_8024DFE8)
-/* 95D164 80241F64 8C42DFE8 */  lw        $v0, %lo(D_8024DFE8)($v0)
-/* 95D168 80241F68 8C42000C */  lw        $v0, 0xc($v0)
-/* 95D16C 80241F6C AC40001C */  sw        $zero, 0x1c($v0)
-/* 95D170 80241F70 03E00008 */  jr        $ra
-/* 95D174 80241F74 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s
deleted file mode 100644
index d2f3975d20..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F78_95D178
-/* 95D178 80241F78 3C028025 */  lui       $v0, %hi(D_8024DFE8)
-/* 95D17C 80241F7C 8C42DFE8 */  lw        $v0, %lo(D_8024DFE8)($v0)
-/* 95D180 80241F80 8C43000C */  lw        $v1, 0xc($v0)
-/* 95D184 80241F84 24020001 */  addiu     $v0, $zero, 1
-/* 95D188 80241F88 AC62001C */  sw        $v0, 0x1c($v1)
-/* 95D18C 80241F8C 03E00008 */  jr        $ra
-/* 95D190 80241F90 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s
deleted file mode 100644
index 947bc87317..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F94_95D194
-/* 95D194 80241F94 3C028025 */  lui       $v0, %hi(D_8024DFE8)
-/* 95D198 80241F98 8C42DFE8 */  lw        $v0, %lo(D_8024DFE8)($v0)
-/* 95D19C 80241F9C 8C43000C */  lw        $v1, 0xc($v0)
-/* 95D1A0 80241FA0 24020002 */  addiu     $v0, $zero, 2
-/* 95D1A4 80241FA4 03E00008 */  jr        $ra
-/* 95D1A8 80241FA8 AC62001C */   sw       $v0, 0x1c($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s
deleted file mode 100644
index fd7d0d1cf4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242468_95D668
-/* 95D668 80242468 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D66C 8024246C 3C058025 */  lui       $a1, %hi(D_8024DFD8)
-/* 95D670 80242470 8CA5DFD8 */  lw        $a1, %lo(D_8024DFD8)($a1)
-/* 95D674 80242474 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D678 80242478 0C0B1EAF */  jal       get_variable
-/* 95D67C 8024247C 0000202D */   daddu    $a0, $zero, $zero
-/* 95D680 80242480 0040182D */  daddu     $v1, $v0, $zero
-/* 95D684 80242484 24020001 */  addiu     $v0, $zero, 1
-/* 95D688 80242488 14620006 */  bne       $v1, $v0, .L802424A4
-/* 95D68C 8024248C 24020002 */   addiu    $v0, $zero, 2
-/* 95D690 80242490 44800000 */  mtc1      $zero, $f0
-/* 95D694 80242494 00000000 */  nop
-/* 95D698 80242498 44050000 */  mfc1      $a1, $f0
-/* 95D69C 8024249C 0809092F */  j         .L802424BC
-/* 95D6A0 802424A0 0000202D */   daddu    $a0, $zero, $zero
-.L802424A4:
-/* 95D6A4 802424A4 14620008 */  bne       $v1, $v0, .L802424C8
-/* 95D6A8 802424A8 24040001 */   addiu    $a0, $zero, 1
-/* 95D6AC 802424AC 44800000 */  mtc1      $zero, $f0
-/* 95D6B0 802424B0 00000000 */  nop
-/* 95D6B4 802424B4 44050000 */  mfc1      $a1, $f0
-/* 95D6B8 802424B8 00000000 */  nop
-.L802424BC:
-/* 95D6BC 802424BC 00A0302D */  daddu     $a2, $a1, $zero
-/* 95D6C0 802424C0 0C01C5A4 */  jal       func_80071690
-/* 95D6C4 802424C4 00A0382D */   daddu    $a3, $a1, $zero
-.L802424C8:
-/* 95D6C8 802424C8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D6CC 802424CC 03E00008 */  jr        $ra
-/* 95D6D0 802424D0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s
deleted file mode 100644
index f62bd00f06..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802424D4_95D6D4
-/* 95D6D4 802424D4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D6D8 802424D8 3C058024 */  lui       $a1, %hi(func_80242468_95D668)
-/* 95D6DC 802424DC 24A52468 */  addiu     $a1, $a1, %lo(func_80242468_95D668)
-/* 95D6E0 802424E0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D6E4 802424E4 0C048C8F */  jal       create_dynamic_entity_frontUI
-/* 95D6E8 802424E8 0000202D */   daddu    $a0, $zero, $zero
-/* 95D6EC 802424EC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D6F0 802424F0 3C018025 */  lui       $at, %hi(D_8024DFC0)
-/* 95D6F4 802424F4 AC22DFC0 */  sw        $v0, %lo(D_8024DFC0)($at)
-/* 95D6F8 802424F8 24020002 */  addiu     $v0, $zero, 2
-/* 95D6FC 802424FC 03E00008 */  jr        $ra
-/* 95D700 80242500 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s
deleted file mode 100644
index 5e2997137e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242730_95D930
-/* 95D930 80242730 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D934 80242734 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D938 80242738 10A00003 */  beqz      $a1, .L80242748
-/* 95D93C 8024273C 8C86000C */   lw       $a2, 0xc($a0)
-/* 95D940 80242740 3C018024 */  lui       $at, %hi(D_802477E0_9629E0)
-/* 95D944 80242744 AC2077E0 */  sw        $zero, %lo(D_802477E0_9629E0)($at)
-.L80242748:
-/* 95D948 80242748 3C038024 */  lui       $v1, %hi(D_802477E0_9629E0)
-/* 95D94C 8024274C 246377E0 */  addiu     $v1, $v1, %lo(D_802477E0_9629E0)
-/* 95D950 80242750 8C620000 */  lw        $v0, ($v1)
-/* 95D954 80242754 54400003 */  bnel      $v0, $zero, .L80242764
-/* 95D958 80242758 AC600000 */   sw       $zero, ($v1)
-/* 95D95C 8024275C 080909DE */  j         .L80242778
-/* 95D960 80242760 0000102D */   daddu    $v0, $zero, $zero
-.L80242764:
-/* 95D964 80242764 8CC50000 */  lw        $a1, ($a2)
-/* 95D968 80242768 3C068024 */  lui       $a2, %hi(D_802477E4_9629E4)
-/* 95D96C 8024276C 0C0B2026 */  jal       set_variable
-/* 95D970 80242770 8CC677E4 */   lw       $a2, %lo(D_802477E4_9629E4)($a2)
-/* 95D974 80242774 24020002 */  addiu     $v0, $zero, 2
-.L80242778:
-/* 95D978 80242778 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D97C 8024277C 03E00008 */  jr        $ra
-/* 95D980 80242780 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s
deleted file mode 100644
index c4cc50a715..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242784_95D984
-/* 95D984 80242784 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D988 80242788 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D98C 8024278C 8C82000C */  lw        $v0, 0xc($a0)
-/* 95D990 80242790 0C0B1EAF */  jal       get_variable
-/* 95D994 80242794 8C450000 */   lw       $a1, ($v0)
-/* 95D998 80242798 3C018024 */  lui       $at, %hi(D_802477E4_9629E4)
-/* 95D99C 8024279C AC2277E4 */  sw        $v0, %lo(D_802477E4_9629E4)($at)
-/* 95D9A0 802427A0 24020002 */  addiu     $v0, $zero, 2
-/* 95D9A4 802427A4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D9A8 802427A8 24030001 */  addiu     $v1, $zero, 1
-/* 95D9AC 802427AC 3C018024 */  lui       $at, %hi(D_802477E0_9629E0)
-/* 95D9B0 802427B0 AC2377E0 */  sw        $v1, %lo(D_802477E0_9629E0)($at)
-/* 95D9B4 802427B4 03E00008 */  jr        $ra
-/* 95D9B8 802427B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s
deleted file mode 100644
index d0244d51f7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802427BC_95D9BC
-/* 95D9BC 802427BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D9C0 802427C0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95D9C4 802427C4 8C82000C */  lw        $v0, 0xc($a0)
-/* 95D9C8 802427C8 0C0B1EAF */  jal       get_variable
-/* 95D9CC 802427CC 8C450000 */   lw       $a1, ($v0)
-/* 95D9D0 802427D0 0040182D */  daddu     $v1, $v0, $zero
-/* 95D9D4 802427D4 10600012 */  beqz      $v1, .L80242820
-/* 95D9D8 802427D8 0000202D */   daddu    $a0, $zero, $zero
-/* 95D9DC 802427DC 8C620000 */  lw        $v0, ($v1)
-/* 95D9E0 802427E0 5040000A */  beql      $v0, $zero, .L8024280C
-/* 95D9E4 802427E4 00041080 */   sll      $v0, $a0, 2
-/* 95D9E8 802427E8 3C058025 */  lui       $a1, %hi(D_8024DFF0)
-/* 95D9EC 802427EC 24A5DFF0 */  addiu     $a1, $a1, %lo(D_8024DFF0)
-.L802427F0:
-/* 95D9F0 802427F0 24630004 */  addiu     $v1, $v1, 4
-/* 95D9F4 802427F4 24840001 */  addiu     $a0, $a0, 1
-/* 95D9F8 802427F8 ACA20000 */  sw        $v0, ($a1)
-/* 95D9FC 802427FC 8C620000 */  lw        $v0, ($v1)
-/* 95DA00 80242800 1440FFFB */  bnez      $v0, .L802427F0
-/* 95DA04 80242804 24A50004 */   addiu    $a1, $a1, 4
-/* 95DA08 80242808 00041080 */  sll       $v0, $a0, 2
-.L8024280C:
-/* 95DA0C 8024280C 3C018025 */  lui       $at, %hi(D_8024DFF0)
-/* 95DA10 80242810 00220821 */  addu      $at, $at, $v0
-/* 95DA14 80242814 AC20DFF0 */  sw        $zero, %lo(D_8024DFF0)($at)
-/* 95DA18 80242818 08090A12 */  j         .L80242848
-/* 95DA1C 8024281C 00000000 */   nop
-.L80242820:
-/* 95DA20 80242820 3C038025 */  lui       $v1, %hi(D_8024DFF0)
-/* 95DA24 80242824 2463DFF0 */  addiu     $v1, $v1, %lo(D_8024DFF0)
-/* 95DA28 80242828 0060282D */  daddu     $a1, $v1, $zero
-.L8024282C:
-/* 95DA2C 8024282C 24820010 */  addiu     $v0, $a0, 0x10
-/* 95DA30 80242830 AC620000 */  sw        $v0, ($v1)
-/* 95DA34 80242834 24630004 */  addiu     $v1, $v1, 4
-/* 95DA38 80242838 24840001 */  addiu     $a0, $a0, 1
-/* 95DA3C 8024283C 28820070 */  slti      $v0, $a0, 0x70
-/* 95DA40 80242840 1440FFFA */  bnez      $v0, .L8024282C
-/* 95DA44 80242844 ACA001C0 */   sw       $zero, 0x1c0($a1)
-.L80242848:
-/* 95DA48 80242848 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95DA4C 8024284C 24020002 */  addiu     $v0, $zero, 2
-/* 95DA50 80242850 03E00008 */  jr        $ra
-/* 95DA54 80242854 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s
deleted file mode 100644
index cf2515e5b4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s
+++ /dev/null
@@ -1,355 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242858_95DA58
-/* 95DA58 80242858 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 95DA5C 8024285C AFB20018 */  sw        $s2, 0x18($sp)
-/* 95DA60 80242860 0080902D */  daddu     $s2, $a0, $zero
-/* 95DA64 80242864 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 95DA68 80242868 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 95DA6C 8024286C AFB10014 */  sw        $s1, 0x14($sp)
-/* 95DA70 80242870 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95DA74 80242874 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 95DA78 80242878 8E42000C */  lw        $v0, 0xc($s2)
-/* 95DA7C 8024287C 00A0802D */  daddu     $s0, $a1, $zero
-/* 95DA80 80242880 0C0B1EAF */  jal       get_variable
-/* 95DA84 80242884 8C450000 */   lw       $a1, ($v0)
-/* 95DA88 80242888 3C138011 */  lui       $s3, %hi(gPlayerStatus)
-/* 95DA8C 8024288C 2673EFC8 */  addiu     $s3, $s3, %lo(gPlayerStatus)
-/* 95DA90 80242890 1200001A */  beqz      $s0, .L802428FC
-/* 95DA94 80242894 0040882D */   daddu    $s1, $v0, $zero
-/* 95DA98 80242898 0C00AB39 */  jal       heap_malloc
-/* 95DA9C 8024289C 2404003C */   addiu    $a0, $zero, 0x3c
-/* 95DAA0 802428A0 AE420074 */  sw        $v0, 0x74($s2)
-/* 95DAA4 802428A4 8E230000 */  lw        $v1, ($s1)
-/* 95DAA8 802428A8 0040802D */  daddu     $s0, $v0, $zero
-/* 95DAAC 802428AC AE030000 */  sw        $v1, ($s0)
-/* 95DAB0 802428B0 8E220004 */  lw        $v0, 4($s1)
-/* 95DAB4 802428B4 AE020004 */  sw        $v0, 4($s0)
-/* 95DAB8 802428B8 8E220008 */  lw        $v0, 8($s1)
-/* 95DABC 802428BC AE020008 */  sw        $v0, 8($s0)
-/* 95DAC0 802428C0 8E22000C */  lw        $v0, 0xc($s1)
-/* 95DAC4 802428C4 AE02000C */  sw        $v0, 0xc($s0)
-/* 95DAC8 802428C8 8E220010 */  lw        $v0, 0x10($s1)
-/* 95DACC 802428CC AE020010 */  sw        $v0, 0x10($s0)
-/* 95DAD0 802428D0 8E220014 */  lw        $v0, 0x14($s1)
-/* 95DAD4 802428D4 AE000018 */  sw        $zero, 0x18($s0)
-/* 95DAD8 802428D8 AE00001C */  sw        $zero, 0x1c($s0)
-/* 95DADC 802428DC AE000020 */  sw        $zero, 0x20($s0)
-/* 95DAE0 802428E0 AE000024 */  sw        $zero, 0x24($s0)
-/* 95DAE4 802428E4 AE000028 */  sw        $zero, 0x28($s0)
-/* 95DAE8 802428E8 AE00002C */  sw        $zero, 0x2c($s0)
-/* 95DAEC 802428EC AE000030 */  sw        $zero, 0x30($s0)
-/* 95DAF0 802428F0 AE000034 */  sw        $zero, 0x34($s0)
-/* 95DAF4 802428F4 AE000038 */  sw        $zero, 0x38($s0)
-/* 95DAF8 802428F8 AE020014 */  sw        $v0, 0x14($s0)
-.L802428FC:
-/* 95DAFC 802428FC 8E500074 */  lw        $s0, 0x74($s2)
-/* 95DB00 80242900 8E030020 */  lw        $v1, 0x20($s0)
-/* 95DB04 80242904 2C620005 */  sltiu     $v0, $v1, 5
-/* 95DB08 80242908 10400116 */  beqz      $v0, .L80242D64
-/* 95DB0C 8024290C 00031080 */   sll      $v0, $v1, 2
-/* 95DB10 80242910 3C018025 */  lui       $at, %hi(jtbl_8024DF80_969180)
-/* 95DB14 80242914 00220821 */  addu      $at, $at, $v0
-/* 95DB18 80242918 8C22DF80 */  lw        $v0, %lo(jtbl_8024DF80_969180)($at)
-/* 95DB1C 8024291C 00400008 */  jr        $v0
-/* 95DB20 80242920 00000000 */   nop
-glabel L80242924_95DB24
-/* 95DB24 80242924 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DB28 80242928 46806320 */  cvt.s.w   $f12, $f12
-/* 95DB2C 8024292C C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DB30 80242930 0C038022 */  jal       func_800E0088
-/* 95DB34 80242934 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DB38 80242938 8E02000C */  lw        $v0, 0xc($s0)
-/* 95DB3C 8024293C 4600010D */  trunc.w.s $f4, $f0
-/* 95DB40 80242940 44032000 */  mfc1      $v1, $f4
-/* 95DB44 80242944 00000000 */  nop
-/* 95DB48 80242948 0062102A */  slt       $v0, $v1, $v0
-/* 95DB4C 8024294C 10400105 */  beqz      $v0, .L80242D64
-/* 95DB50 80242950 00000000 */   nop
-/* 95DB54 80242954 C6600028 */  lwc1      $f0, 0x28($s3)
-/* 95DB58 80242958 8E020020 */  lw        $v0, 0x20($s0)
-/* 95DB5C 8024295C E6000024 */  swc1      $f0, 0x24($s0)
-/* 95DB60 80242960 C6600030 */  lwc1      $f0, 0x30($s3)
-/* 95DB64 80242964 24420001 */  addiu     $v0, $v0, 1
-/* 95DB68 80242968 AE020020 */  sw        $v0, 0x20($s0)
-/* 95DB6C 8024296C 08090B59 */  j         .L80242D64
-/* 95DB70 80242970 E6000028 */   swc1     $f0, 0x28($s0)
-glabel L80242974_95DB74
-/* 95DB74 80242974 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DB78 80242978 46806320 */  cvt.s.w   $f12, $f12
-/* 95DB7C 8024297C C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DB80 80242980 0C038022 */  jal       func_800E0088
-/* 95DB84 80242984 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DB88 80242988 8E02000C */  lw        $v0, 0xc($s0)
-/* 95DB8C 8024298C 4600010D */  trunc.w.s $f4, $f0
-/* 95DB90 80242990 44032000 */  mfc1      $v1, $f4
-/* 95DB94 80242994 00000000 */  nop
-/* 95DB98 80242998 0062102A */  slt       $v0, $v1, $v0
-/* 95DB9C 8024299C 504000F1 */  beql      $v0, $zero, .L80242D64
-/* 95DBA0 802429A0 AE000020 */   sw       $zero, 0x20($s0)
-/* 95DBA4 802429A4 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DBA8 802429A8 46806320 */  cvt.s.w   $f12, $f12
-/* 95DBAC 802429AC 8E060024 */  lw        $a2, 0x24($s0)
-/* 95DBB0 802429B0 8E070028 */  lw        $a3, 0x28($s0)
-/* 95DBB4 802429B4 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DBB8 802429B8 0C00A720 */  jal       atan2
-/* 95DBBC 802429BC 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DBC0 802429C0 4600010D */  trunc.w.s $f4, $f0
-/* 95DBC4 802429C4 44112000 */  mfc1      $s1, $f4
-/* 95DBC8 802429C8 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DBCC 802429CC 46806320 */  cvt.s.w   $f12, $f12
-/* 95DBD0 802429D0 8E660028 */  lw        $a2, 0x28($s3)
-/* 95DBD4 802429D4 8E670030 */  lw        $a3, 0x30($s3)
-/* 95DBD8 802429D8 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DBDC 802429DC 0C00A720 */  jal       atan2
-/* 95DBE0 802429E0 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DBE4 802429E4 4600010D */  trunc.w.s $f4, $f0
-/* 95DBE8 802429E8 44022000 */  mfc1      $v0, $f4
-/* 95DBEC 802429EC 44916000 */  mtc1      $s1, $f12
-/* 95DBF0 802429F0 00000000 */  nop
-/* 95DBF4 802429F4 46806320 */  cvt.s.w   $f12, $f12
-/* 95DBF8 802429F8 44827000 */  mtc1      $v0, $f14
-/* 95DBFC 802429FC 00000000 */  nop
-/* 95DC00 80242A00 0C00A70A */  jal       get_clamped_angle_diff
-/* 95DC04 80242A04 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DC08 80242A08 4600010D */  trunc.w.s $f4, $f0
-/* 95DC0C 80242A0C 44022000 */  mfc1      $v0, $f4
-/* 95DC10 80242A10 00000000 */  nop
-/* 95DC14 80242A14 44826000 */  mtc1      $v0, $f12
-/* 95DC18 80242A18 00000000 */  nop
-/* 95DC1C 80242A1C 0C00A69F */  jal       signF
-/* 95DC20 80242A20 46806320 */   cvt.s.w  $f12, $f12
-/* 95DC24 80242A24 8E020020 */  lw        $v0, 0x20($s0)
-/* 95DC28 80242A28 08090B52 */  j         .L80242D48
-/* 95DC2C 80242A2C E6000034 */   swc1     $f0, 0x34($s0)
-glabel L80242A30_95DC30
-/* 95DC30 80242A30 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DC34 80242A34 46806320 */  cvt.s.w   $f12, $f12
-/* 95DC38 80242A38 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DC3C 80242A3C 0C038022 */  jal       func_800E0088
-/* 95DC40 80242A40 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DC44 80242A44 8E02000C */  lw        $v0, 0xc($s0)
-/* 95DC48 80242A48 4600010D */  trunc.w.s $f4, $f0
-/* 95DC4C 80242A4C 44032000 */  mfc1      $v1, $f4
-/* 95DC50 80242A50 00000000 */  nop
-/* 95DC54 80242A54 0062102A */  slt       $v0, $v1, $v0
-/* 95DC58 80242A58 504000C2 */  beql      $v0, $zero, .L80242D64
-/* 95DC5C 80242A5C AE000020 */   sw       $zero, 0x20($s0)
-/* 95DC60 80242A60 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DC64 80242A64 46806320 */  cvt.s.w   $f12, $f12
-/* 95DC68 80242A68 8E06002C */  lw        $a2, 0x2c($s0)
-/* 95DC6C 80242A6C 8E070030 */  lw        $a3, 0x30($s0)
-/* 95DC70 80242A70 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DC74 80242A74 0C00A720 */  jal       atan2
-/* 95DC78 80242A78 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DC7C 80242A7C 4600010D */  trunc.w.s $f4, $f0
-/* 95DC80 80242A80 44112000 */  mfc1      $s1, $f4
-/* 95DC84 80242A84 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DC88 80242A88 46806320 */  cvt.s.w   $f12, $f12
-/* 95DC8C 80242A8C 8E660028 */  lw        $a2, 0x28($s3)
-/* 95DC90 80242A90 8E670030 */  lw        $a3, 0x30($s3)
-/* 95DC94 80242A94 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DC98 80242A98 0C00A720 */  jal       atan2
-/* 95DC9C 80242A9C 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DCA0 80242AA0 4600010D */  trunc.w.s $f4, $f0
-/* 95DCA4 80242AA4 44022000 */  mfc1      $v0, $f4
-/* 95DCA8 80242AA8 44916000 */  mtc1      $s1, $f12
-/* 95DCAC 80242AAC 00000000 */  nop
-/* 95DCB0 80242AB0 46806320 */  cvt.s.w   $f12, $f12
-/* 95DCB4 80242AB4 44827000 */  mtc1      $v0, $f14
-/* 95DCB8 80242AB8 00000000 */  nop
-/* 95DCBC 80242ABC 0C00A70A */  jal       get_clamped_angle_diff
-/* 95DCC0 80242AC0 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DCC4 80242AC4 4600010D */  trunc.w.s $f4, $f0
-/* 95DCC8 80242AC8 44022000 */  mfc1      $v0, $f4
-/* 95DCCC 80242ACC 00000000 */  nop
-/* 95DCD0 80242AD0 44826000 */  mtc1      $v0, $f12
-/* 95DCD4 80242AD4 00000000 */  nop
-/* 95DCD8 80242AD8 0C00A69F */  jal       signF
-/* 95DCDC 80242ADC 46806320 */   cvt.s.w  $f12, $f12
-/* 95DCE0 80242AE0 C6020034 */  lwc1      $f2, 0x34($s0)
-/* 95DCE4 80242AE4 46001032 */  c.eq.s    $f2, $f0
-/* 95DCE8 80242AE8 00000000 */  nop
-/* 95DCEC 80242AEC 4502009D */  bc1fl     .L80242D64
-/* 95DCF0 80242AF0 AE000020 */   sw       $zero, 0x20($s0)
-/* 95DCF4 80242AF4 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DCF8 80242AF8 46806320 */  cvt.s.w   $f12, $f12
-/* 95DCFC 80242AFC 8E060024 */  lw        $a2, 0x24($s0)
-/* 95DD00 80242B00 8E070028 */  lw        $a3, 0x28($s0)
-/* 95DD04 80242B04 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DD08 80242B08 0C00A720 */  jal       atan2
-/* 95DD0C 80242B0C 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DD10 80242B10 4600010D */  trunc.w.s $f4, $f0
-/* 95DD14 80242B14 44112000 */  mfc1      $s1, $f4
-/* 95DD18 80242B18 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DD1C 80242B1C 46806320 */  cvt.s.w   $f12, $f12
-/* 95DD20 80242B20 8E660028 */  lw        $a2, 0x28($s3)
-/* 95DD24 80242B24 8E670030 */  lw        $a3, 0x30($s3)
-/* 95DD28 80242B28 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DD2C 80242B2C 0C00A720 */  jal       atan2
-/* 95DD30 80242B30 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DD34 80242B34 4600010D */  trunc.w.s $f4, $f0
-/* 95DD38 80242B38 44022000 */  mfc1      $v0, $f4
-/* 95DD3C 80242B3C 44916000 */  mtc1      $s1, $f12
-/* 95DD40 80242B40 00000000 */  nop
-/* 95DD44 80242B44 46806320 */  cvt.s.w   $f12, $f12
-/* 95DD48 80242B48 44827000 */  mtc1      $v0, $f14
-/* 95DD4C 80242B4C 00000000 */  nop
-/* 95DD50 80242B50 0C00A70A */  jal       get_clamped_angle_diff
-/* 95DD54 80242B54 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DD58 80242B58 4600010D */  trunc.w.s $f4, $f0
-/* 95DD5C 80242B5C 44022000 */  mfc1      $v0, $f4
-/* 95DD60 80242B60 00000000 */  nop
-/* 95DD64 80242B64 44820000 */  mtc1      $v0, $f0
-/* 95DD68 80242B68 00000000 */  nop
-/* 95DD6C 80242B6C 46800020 */  cvt.s.w   $f0, $f0
-/* 95DD70 80242B70 3C0142B4 */  lui       $at, 0x42b4
-/* 95DD74 80242B74 44811000 */  mtc1      $at, $f2
-/* 95DD78 80242B78 46000505 */  abs.s     $f20, $f0
-/* 95DD7C 80242B7C 4614103C */  c.lt.s    $f2, $f20
-/* 95DD80 80242B80 00000000 */  nop
-/* 95DD84 80242B84 45000077 */  bc1f      .L80242D64
-/* 95DD88 80242B88 00000000 */   nop
-/* 95DD8C 80242B8C 8E020014 */  lw        $v0, 0x14($s0)
-/* 95DD90 80242B90 10400003 */  beqz      $v0, .L80242BA0
-/* 95DD94 80242B94 0200202D */   daddu    $a0, $s0, $zero
-/* 95DD98 80242B98 0040F809 */  jalr      $v0
-/* 95DD9C 80242B9C 0000282D */   daddu    $a1, $zero, $zero
-.L80242BA0:
-/* 95DDA0 80242BA0 C6000018 */  lwc1      $f0, 0x18($s0)
-/* 95DDA4 80242BA4 46800020 */  cvt.s.w   $f0, $f0
-/* 95DDA8 80242BA8 8E020020 */  lw        $v0, 0x20($s0)
-/* 95DDAC 80242BAC 46140000 */  add.s     $f0, $f0, $f20
-/* 95DDB0 80242BB0 24420001 */  addiu     $v0, $v0, 1
-/* 95DDB4 80242BB4 AE020020 */  sw        $v0, 0x20($s0)
-/* 95DDB8 80242BB8 4600010D */  trunc.w.s $f4, $f0
-/* 95DDBC 80242BBC 08090B59 */  j         .L80242D64
-/* 95DDC0 80242BC0 E6040018 */   swc1     $f4, 0x18($s0)
-glabel L80242BC4_95DDC4
-/* 95DDC4 80242BC4 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DDC8 80242BC8 46806320 */  cvt.s.w   $f12, $f12
-/* 95DDCC 80242BCC C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DDD0 80242BD0 0C038022 */  jal       func_800E0088
-/* 95DDD4 80242BD4 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DDD8 80242BD8 8E020010 */  lw        $v0, 0x10($s0)
-/* 95DDDC 80242BDC 4600010D */  trunc.w.s $f4, $f0
-/* 95DDE0 80242BE0 44032000 */  mfc1      $v1, $f4
-/* 95DDE4 80242BE4 00000000 */  nop
-/* 95DDE8 80242BE8 0062102A */  slt       $v0, $v1, $v0
-/* 95DDEC 80242BEC 10400050 */  beqz      $v0, .L80242D30
-/* 95DDF0 80242BF0 00000000 */   nop
-/* 95DDF4 80242BF4 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DDF8 80242BF8 46806320 */  cvt.s.w   $f12, $f12
-/* 95DDFC 80242BFC 8E06002C */  lw        $a2, 0x2c($s0)
-/* 95DE00 80242C00 8E070030 */  lw        $a3, 0x30($s0)
-/* 95DE04 80242C04 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DE08 80242C08 0C00A720 */  jal       atan2
-/* 95DE0C 80242C0C 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DE10 80242C10 4600010D */  trunc.w.s $f4, $f0
-/* 95DE14 80242C14 44112000 */  mfc1      $s1, $f4
-/* 95DE18 80242C18 C60C0000 */  lwc1      $f12, ($s0)
-/* 95DE1C 80242C1C 46806320 */  cvt.s.w   $f12, $f12
-/* 95DE20 80242C20 8E660028 */  lw        $a2, 0x28($s3)
-/* 95DE24 80242C24 8E670030 */  lw        $a3, 0x30($s3)
-/* 95DE28 80242C28 C60E0008 */  lwc1      $f14, 8($s0)
-/* 95DE2C 80242C2C 0C00A720 */  jal       atan2
-/* 95DE30 80242C30 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DE34 80242C34 4600010D */  trunc.w.s $f4, $f0
-/* 95DE38 80242C38 44022000 */  mfc1      $v0, $f4
-/* 95DE3C 80242C3C 44916000 */  mtc1      $s1, $f12
-/* 95DE40 80242C40 00000000 */  nop
-/* 95DE44 80242C44 46806320 */  cvt.s.w   $f12, $f12
-/* 95DE48 80242C48 44827000 */  mtc1      $v0, $f14
-/* 95DE4C 80242C4C 00000000 */  nop
-/* 95DE50 80242C50 0C00A70A */  jal       get_clamped_angle_diff
-/* 95DE54 80242C54 468073A0 */   cvt.s.w  $f14, $f14
-/* 95DE58 80242C58 4600010D */  trunc.w.s $f4, $f0
-/* 95DE5C 80242C5C 44022000 */  mfc1      $v0, $f4
-/* 95DE60 80242C60 00000000 */  nop
-/* 95DE64 80242C64 4482A000 */  mtc1      $v0, $f20
-/* 95DE68 80242C68 00000000 */  nop
-/* 95DE6C 80242C6C 4680A520 */  cvt.s.w   $f20, $f20
-/* 95DE70 80242C70 0C00A69F */  jal       signF
-/* 95DE74 80242C74 4600A306 */   mov.s    $f12, $f20
-/* 95DE78 80242C78 C6020034 */  lwc1      $f2, 0x34($s0)
-/* 95DE7C 80242C7C 46001032 */  c.eq.s    $f2, $f0
-/* 95DE80 80242C80 00000000 */  nop
-/* 95DE84 80242C84 4503000A */  bc1tl     .L80242CB0
-/* 95DE88 80242C88 4600A005 */   abs.s    $f0, $f20
-/* 95DE8C 80242C8C 8E020014 */  lw        $v0, 0x14($s0)
-/* 95DE90 80242C90 10400003 */  beqz      $v0, .L80242CA0
-/* 95DE94 80242C94 0200202D */   daddu    $a0, $s0, $zero
-/* 95DE98 80242C98 0040F809 */  jalr      $v0
-/* 95DE9C 80242C9C 24050003 */   addiu    $a1, $zero, 3
-.L80242CA0:
-/* 95DEA0 80242CA0 8E020020 */  lw        $v0, 0x20($s0)
-/* 95DEA4 80242CA4 24420001 */  addiu     $v0, $v0, 1
-/* 95DEA8 80242CA8 08090B45 */  j         .L80242D14
-/* 95DEAC 80242CAC AE020020 */   sw       $v0, 0x20($s0)
-.L80242CB0:
-/* 95DEB0 80242CB0 C6020018 */  lwc1      $f2, 0x18($s0)
-/* 95DEB4 80242CB4 468010A0 */  cvt.s.w   $f2, $f2
-/* 95DEB8 80242CB8 46001080 */  add.s     $f2, $f2, $f0
-/* 95DEBC 80242CBC 3C02B60B */  lui       $v0, 0xb60b
-/* 95DEC0 80242CC0 344260B7 */  ori       $v0, $v0, 0x60b7
-/* 95DEC4 80242CC4 4600110D */  trunc.w.s $f4, $f2
-/* 95DEC8 80242CC8 44032000 */  mfc1      $v1, $f4
-/* 95DECC 80242CCC 00000000 */  nop
-/* 95DED0 80242CD0 00620018 */  mult      $v1, $v0
-/* 95DED4 80242CD4 8E040038 */  lw        $a0, 0x38($s0)
-/* 95DED8 80242CD8 AE030018 */  sw        $v1, 0x18($s0)
-/* 95DEDC 80242CDC 00004010 */  mfhi      $t0
-/* 95DEE0 80242CE0 01031021 */  addu      $v0, $t0, $v1
-/* 95DEE4 80242CE4 00021203 */  sra       $v0, $v0, 8
-/* 95DEE8 80242CE8 00031FC3 */  sra       $v1, $v1, 0x1f
-/* 95DEEC 80242CEC 00431023 */  subu      $v0, $v0, $v1
-/* 95DEF0 80242CF0 10440008 */  beq       $v0, $a0, .L80242D14
-/* 95DEF4 80242CF4 AE02001C */   sw       $v0, 0x1c($s0)
-/* 95DEF8 80242CF8 8E020014 */  lw        $v0, 0x14($s0)
-/* 95DEFC 80242CFC 10400003 */  beqz      $v0, .L80242D0C
-/* 95DF00 80242D00 0200202D */   daddu    $a0, $s0, $zero
-/* 95DF04 80242D04 0040F809 */  jalr      $v0
-/* 95DF08 80242D08 24050001 */   addiu    $a1, $zero, 1
-.L80242D0C:
-/* 95DF0C 80242D0C 8E02001C */  lw        $v0, 0x1c($s0)
-/* 95DF10 80242D10 AE020038 */  sw        $v0, 0x38($s0)
-.L80242D14:
-/* 95DF14 80242D14 8E020014 */  lw        $v0, 0x14($s0)
-/* 95DF18 80242D18 10400012 */  beqz      $v0, .L80242D64
-/* 95DF1C 80242D1C 0200202D */   daddu    $a0, $s0, $zero
-/* 95DF20 80242D20 0040F809 */  jalr      $v0
-/* 95DF24 80242D24 24050002 */   addiu    $a1, $zero, 2
-/* 95DF28 80242D28 08090B59 */  j         .L80242D64
-/* 95DF2C 80242D2C 00000000 */   nop
-.L80242D30:
-/* 95DF30 80242D30 8E020014 */  lw        $v0, 0x14($s0)
-/* 95DF34 80242D34 10400003 */  beqz      $v0, .L80242D44
-/* 95DF38 80242D38 0200202D */   daddu    $a0, $s0, $zero
-/* 95DF3C 80242D3C 0040F809 */  jalr      $v0
-/* 95DF40 80242D40 24050004 */   addiu    $a1, $zero, 4
-.L80242D44:
-/* 95DF44 80242D44 8E020020 */  lw        $v0, 0x20($s0)
-.L80242D48:
-/* 95DF48 80242D48 24420001 */  addiu     $v0, $v0, 1
-/* 95DF4C 80242D4C 08090B59 */  j         .L80242D64
-/* 95DF50 80242D50 AE020020 */   sw       $v0, 0x20($s0)
-glabel L80242D54_95DF54
-/* 95DF54 80242D54 AE000018 */  sw        $zero, 0x18($s0)
-/* 95DF58 80242D58 AE00001C */  sw        $zero, 0x1c($s0)
-/* 95DF5C 80242D5C AE000038 */  sw        $zero, 0x38($s0)
-/* 95DF60 80242D60 AE000020 */  sw        $zero, 0x20($s0)
-.L80242D64:
-/* 95DF64 80242D64 C6600028 */  lwc1      $f0, 0x28($s3)
-/* 95DF68 80242D68 E600002C */  swc1      $f0, 0x2c($s0)
-/* 95DF6C 80242D6C C6600030 */  lwc1      $f0, 0x30($s3)
-/* 95DF70 80242D70 E6000030 */  swc1      $f0, 0x30($s0)
-/* 95DF74 80242D74 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 95DF78 80242D78 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 95DF7C 80242D7C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 95DF80 80242D80 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95DF84 80242D84 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95DF88 80242D88 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 95DF8C 80242D8C 0000102D */  daddu     $v0, $zero, $zero
-/* 95DF90 80242D90 03E00008 */  jr        $ra
-/* 95DF94 80242D94 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s
deleted file mode 100644
index cbd25301df..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243014_95E214
-/* 95E214 80243014 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95E218 80243018 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95E21C 8024301C 0080802D */  daddu     $s0, $a0, $zero
-/* 95E220 80243020 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 95E224 80243024 0C00EABB */  jal       get_npc_unsafe
-/* 95E228 80243028 8E04008C */   lw       $a0, 0x8c($s0)
-/* 95E22C 8024302C 0040282D */  daddu     $a1, $v0, $zero
-/* 95E230 80243030 8E040094 */  lw        $a0, 0x94($s0)
-/* 95E234 80243034 8CA30028 */  lw        $v1, 0x28($a1)
-/* 95E238 80243038 ACA40028 */  sw        $a0, 0x28($a1)
-/* 95E23C 8024303C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 95E240 80243040 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95E244 80243044 24020002 */  addiu     $v0, $zero, 2
-/* 95E248 80243048 3C018025 */  lui       $at, %hi(D_8024E1B4)
-/* 95E24C 8024304C AC23E1B4 */  sw        $v1, %lo(D_8024E1B4)($at)
-/* 95E250 80243050 03E00008 */  jr        $ra
-/* 95E254 80243054 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s
deleted file mode 100644
index 3aea0e3b8c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243058_95E258
-/* 95E258 80243058 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95E25C 8024305C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95E260 80243060 0C00EABB */  jal       get_npc_unsafe
-/* 95E264 80243064 8C84008C */   lw       $a0, 0x8c($a0)
-/* 95E268 80243068 3C038025 */  lui       $v1, %hi(D_8024E1B4)
-/* 95E26C 8024306C 8C63E1B4 */  lw        $v1, %lo(D_8024E1B4)($v1)
-/* 95E270 80243070 AC430028 */  sw        $v1, 0x28($v0)
-/* 95E274 80243074 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95E278 80243078 24020002 */  addiu     $v0, $zero, 2
-/* 95E27C 8024307C 03E00008 */  jr        $ra
-/* 95E280 80243080 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084_95E284.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084_95E284.s
deleted file mode 100644
index 516bae8fa7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084_95E284.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243084_95E284
-/* 95E284 80243084 3C038011 */  lui       $v1, %hi(gPlayerData)
-/* 95E288 80243088 2463F290 */  addiu     $v1, $v1, %lo(gPlayerData)
-/* 95E28C 8024308C 8C6202BC */  lw        $v0, 0x2bc($v1)
-/* 95E290 80243090 AC620328 */  sw        $v0, 0x328($v1)
-/* 95E294 80243094 03E00008 */  jr        $ra
-/* 95E298 80243098 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C_95E29C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C_95E29C.s
deleted file mode 100644
index 8ba73b3d40..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C_95E29C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024309C_95E29C
-/* 95E29C 8024309C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95E2A0 802430A0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95E2A4 802430A4 8C82000C */  lw        $v0, 0xc($a0)
-/* 95E2A8 802430A8 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* 95E2AC 802430AC 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* 95E2B0 802430B0 0C0B2026 */  jal       set_variable
-/* 95E2B4 802430B4 8C450000 */   lw       $a1, ($v0)
-/* 95E2B8 802430B8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95E2BC 802430BC 24020002 */  addiu     $v0, $zero, 2
-/* 95E2C0 802430C0 03E00008 */  jr        $ra
-/* 95E2C4 802430C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s
deleted file mode 100644
index 2c3d7d375c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s
+++ /dev/null
@@ -1,65 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802430C8_95E2C8
-/* 95E2C8 802430C8 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 95E2CC 802430CC AFB10014 */  sw        $s1, 0x14($sp)
-/* 95E2D0 802430D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95E2D4 802430D4 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* 95E2D8 802430D8 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* 95E2DC 802430DC 2CA20005 */  sltiu     $v0, $a1, 5
-/* 95E2E0 802430E0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95E2E4 802430E4 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 95E2E8 802430E8 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 95E2EC 802430EC 1040002A */  beqz      $v0, L80243198_95E398
-/* 95E2F0 802430F0 0080882D */   daddu    $s1, $a0, $zero
-/* 95E2F4 802430F4 00051080 */  sll       $v0, $a1, 2
-/* 95E2F8 802430F8 3C018025 */  lui       $at, %hi(jtbl_8024DF98_969198)
-/* 95E2FC 802430FC 00220821 */  addu      $at, $at, $v0
-/* 95E300 80243100 8C22DF98 */  lw        $v0, %lo(jtbl_8024DF98_969198)($at)
-/* 95E304 80243104 00400008 */  jr        $v0
-/* 95E308 80243108 00000000 */   nop
-glabel L8024310C_95E30C
-/* 95E30C 8024310C 8E22001C */  lw        $v0, 0x1c($s1)
-/* 95E310 80243110 28420006 */  slti      $v0, $v0, 6
-/* 95E314 80243114 14400020 */  bnez      $v0, L80243198_95E398
-/* 95E318 80243118 00000000 */   nop
-/* 95E31C 8024311C 3C064318 */  lui       $a2, 0x4318
-/* 95E320 80243120 3C07C274 */  lui       $a3, 0xc274
-/* 95E324 80243124 3C0142FA */  lui       $at, 0x42fa
-/* 95E328 80243128 4481A000 */  mtc1      $at, $f20
-/* 95E32C 8024312C 3C01C228 */  lui       $at, 0xc228
-/* 95E330 80243130 4481B000 */  mtc1      $at, $f22
-/* 95E334 80243134 4600A306 */  mov.s     $f12, $f20
-/* 95E338 80243138 0C00A720 */  jal       atan2
-/* 95E33C 8024313C 4600B386 */   mov.s    $f14, $f22
-/* 95E340 80243140 4600A306 */  mov.s     $f12, $f20
-/* 95E344 80243144 4600B386 */  mov.s     $f14, $f22
-/* 95E348 80243148 8E060028 */  lw        $a2, 0x28($s0)
-/* 95E34C 8024314C 8E070030 */  lw        $a3, 0x30($s0)
-/* 95E350 80243150 0C00A720 */  jal       atan2
-/* 95E354 80243154 46000506 */   mov.s    $f20, $f0
-/* 95E358 80243158 4600A306 */  mov.s     $f12, $f20
-/* 95E35C 8024315C 0C00A70A */  jal       get_clamped_angle_diff
-/* 95E360 80243160 46000386 */   mov.s    $f14, $f0
-/* 95E364 80243164 3C0141F0 */  lui       $at, 0x41f0
-/* 95E368 80243168 44811000 */  mtc1      $at, $f2
-/* 95E36C 8024316C 46000005 */  abs.s     $f0, $f0
-/* 95E370 80243170 4602003C */  c.lt.s    $f0, $f2
-/* 95E374 80243174 00000000 */  nop
-/* 95E378 80243178 45000007 */  bc1f      L80243198_95E398
-/* 95E37C 8024317C 0000302D */   daddu    $a2, $zero, $zero
-/* 95E380 80243180 3C048025 */  lui       $a0, %hi(D_80248504_963704)
-/* 95E384 80243184 24848504 */  addiu     $a0, $a0, %lo(D_80248504_963704)
-/* 95E388 80243188 0C0B0CF8 */  jal       start_script
-/* 95E38C 8024318C 24050001 */   addiu    $a1, $zero, 1
-/* 95E390 80243190 24020004 */  addiu     $v0, $zero, 4
-/* 95E394 80243194 AE220020 */  sw        $v0, 0x20($s1)
-glabel L80243198_95E398
-/* 95E398 80243198 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95E39C 8024319C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95E3A0 802431A0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95E3A4 802431A4 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 95E3A8 802431A8 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 95E3AC 802431AC 03E00008 */  jr        $ra
-/* 95E3B0 802431B0 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431B4_95E3B4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431B4_95E3B4.s
deleted file mode 100644
index c20a03d473..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431B4_95E3B4.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431B4_95E3B4
-/* 95E3B4 802431B4 3C038011 */  lui       $v1, %hi(gPlayerData)
-/* 95E3B8 802431B8 2463F290 */  addiu     $v1, $v1, %lo(gPlayerData)
-/* 95E3BC 802431BC 8C6202BC */  lw        $v0, 0x2bc($v1)
-/* 95E3C0 802431C0 8C630328 */  lw        $v1, 0x328($v1)
-/* 95E3C4 802431C4 00431023 */  subu      $v0, $v0, $v1
-/* 95E3C8 802431C8 3C0391A2 */  lui       $v1, 0x91a2
-/* 95E3CC 802431CC 3463B3C5 */  ori       $v1, $v1, 0xb3c5
-/* 95E3D0 802431D0 00430019 */  multu     $v0, $v1
-/* 95E3D4 802431D4 00002810 */  mfhi      $a1
-/* 95E3D8 802431D8 000512C2 */  srl       $v0, $a1, 0xb
-/* 95E3DC 802431DC 2842001E */  slti      $v0, $v0, 0x1e
-/* 95E3E0 802431E0 10400003 */  beqz      $v0, .L802431F0
-/* 95E3E4 802431E4 24020001 */   addiu    $v0, $zero, 1
-/* 95E3E8 802431E8 08090C7D */  j         .L802431F4
-/* 95E3EC 802431EC AC820084 */   sw       $v0, 0x84($a0)
-.L802431F0:
-/* 95E3F0 802431F0 AC800084 */  sw        $zero, 0x84($a0)
-.L802431F4:
-/* 95E3F4 802431F4 03E00008 */  jr        $ra
-/* 95E3F8 802431F8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s
deleted file mode 100644
index 0fdbd7e935..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s
+++ /dev/null
@@ -1,91 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802431FC_95E3FC
-/* 95E3FC 802431FC 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 95E400 80243200 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95E404 80243204 0080882D */  daddu     $s1, $a0, $zero
-/* 95E408 80243208 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95E40C 8024320C AFB00010 */  sw        $s0, 0x10($sp)
-/* 95E410 80243210 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* 95E414 80243214 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 95E418 80243218 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 95E41C 8024321C 0C00EAD2 */  jal       get_npc_safe
-/* 95E420 80243220 8E24014C */   lw       $a0, 0x14c($s1)
-/* 95E424 80243224 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* 95E428 80243228 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* 95E42C 8024322C 0040802D */  daddu     $s0, $v0, $zero
-/* 95E430 80243230 3C014337 */  lui       $at, 0x4337
-/* 95E434 80243234 4481A000 */  mtc1      $at, $f20
-/* 95E438 80243238 3C01C296 */  lui       $at, 0xc296
-/* 95E43C 8024323C 4481B000 */  mtc1      $at, $f22
-/* 95E440 80243240 8C660028 */  lw        $a2, 0x28($v1)
-/* 95E444 80243244 8C670030 */  lw        $a3, 0x30($v1)
-/* 95E448 80243248 4600A306 */  mov.s     $f12, $f20
-/* 95E44C 8024324C 0C00A720 */  jal       atan2
-/* 95E450 80243250 4600B386 */   mov.s    $f14, $f22
-/* 95E454 80243254 46000606 */  mov.s     $f24, $f0
-/* 95E458 80243258 4600A306 */  mov.s     $f12, $f20
-/* 95E45C 8024325C 8E060038 */  lw        $a2, 0x38($s0)
-/* 95E460 80243260 8E070040 */  lw        $a3, 0x40($s0)
-/* 95E464 80243264 0C00A720 */  jal       atan2
-/* 95E468 80243268 4600B386 */   mov.s    $f14, $f22
-/* 95E46C 8024326C 46000586 */  mov.s     $f22, $f0
-/* 95E470 80243270 4600B306 */  mov.s     $f12, $f22
-/* 95E474 80243274 0C00A70A */  jal       get_clamped_angle_diff
-/* 95E478 80243278 4600C386 */   mov.s    $f14, $f24
-/* 95E47C 8024327C 46000606 */  mov.s     $f24, $f0
-/* 95E480 80243280 0C00A67F */  jal       rand_int
-/* 95E484 80243284 2404000A */   addiu    $a0, $zero, 0xa
-/* 95E488 80243288 44800000 */  mtc1      $zero, $f0
-/* 95E48C 8024328C 00000000 */  nop
-/* 95E490 80243290 4600C03C */  c.lt.s    $f24, $f0
-/* 95E494 80243294 00000000 */  nop
-/* 95E498 80243298 45000006 */  bc1f      .L802432B4
-/* 95E49C 8024329C 2450001E */   addiu    $s0, $v0, 0x1e
-/* 95E4A0 802432A0 44900000 */  mtc1      $s0, $f0
-/* 95E4A4 802432A4 00000000 */  nop
-/* 95E4A8 802432A8 46800020 */  cvt.s.w   $f0, $f0
-/* 95E4AC 802432AC 08090CB1 */  j         .L802432C4
-/* 95E4B0 802432B0 4600B580 */   add.s    $f22, $f22, $f0
-.L802432B4:
-/* 95E4B4 802432B4 44900000 */  mtc1      $s0, $f0
-/* 95E4B8 802432B8 00000000 */  nop
-/* 95E4BC 802432BC 46800020 */  cvt.s.w   $f0, $f0
-/* 95E4C0 802432C0 4600B581 */  sub.s     $f22, $f22, $f0
-.L802432C4:
-/* 95E4C4 802432C4 0C00A67F */  jal       rand_int
-/* 95E4C8 802432C8 24040014 */   addiu    $a0, $zero, 0x14
-/* 95E4CC 802432CC 2450001E */  addiu     $s0, $v0, 0x1e
-/* 95E4D0 802432D0 0C00A8BB */  jal       sin_deg
-/* 95E4D4 802432D4 4600B306 */   mov.s    $f12, $f22
-/* 95E4D8 802432D8 4490A000 */  mtc1      $s0, $f20
-/* 95E4DC 802432DC 00000000 */  nop
-/* 95E4E0 802432E0 4680A520 */  cvt.s.w   $f20, $f20
-/* 95E4E4 802432E4 46140002 */  mul.s     $f0, $f0, $f20
-/* 95E4E8 802432E8 00000000 */  nop
-/* 95E4EC 802432EC 3C014337 */  lui       $at, 0x4337
-/* 95E4F0 802432F0 44811000 */  mtc1      $at, $f2
-/* 95E4F4 802432F4 00000000 */  nop
-/* 95E4F8 802432F8 46020000 */  add.s     $f0, $f0, $f2
-/* 95E4FC 802432FC 4600010D */  trunc.w.s $f4, $f0
-/* 95E500 80243300 E6240084 */  swc1      $f4, 0x84($s1)
-/* 95E504 80243304 0C00A8D4 */  jal       cos_deg
-/* 95E508 80243308 4600B306 */   mov.s    $f12, $f22
-/* 95E50C 8024330C 46140002 */  mul.s     $f0, $f0, $f20
-/* 95E510 80243310 00000000 */  nop
-/* 95E514 80243314 3C01C296 */  lui       $at, 0xc296
-/* 95E518 80243318 44811000 */  mtc1      $at, $f2
-/* 95E51C 8024331C 00000000 */  nop
-/* 95E520 80243320 46001081 */  sub.s     $f2, $f2, $f0
-/* 95E524 80243324 4600110D */  trunc.w.s $f4, $f2
-/* 95E528 80243328 E6240088 */  swc1      $f4, 0x88($s1)
-/* 95E52C 8024332C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95E530 80243330 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95E534 80243334 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95E538 80243338 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* 95E53C 8024333C D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 95E540 80243340 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 95E544 80243344 24020002 */  addiu     $v0, $zero, 2
-/* 95E548 80243348 03E00008 */  jr        $ra
-/* 95E54C 8024334C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s
deleted file mode 100644
index 48be5cf83a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s
+++ /dev/null
@@ -1,74 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243350_95E550
-/* 95E550 80243350 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 95E554 80243354 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95E558 80243358 0080882D */  daddu     $s1, $a0, $zero
-/* 95E55C 8024335C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95E560 80243360 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95E564 80243364 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* 95E568 80243368 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* 95E56C 8024336C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 95E570 80243370 8E30000C */  lw        $s0, 0xc($s1)
-/* 95E574 80243374 8E050000 */  lw        $a1, ($s0)
-/* 95E578 80243378 0C0B1EAF */  jal       get_variable
-/* 95E57C 8024337C 26100004 */   addiu    $s0, $s0, 4
-/* 95E580 80243380 8E050000 */  lw        $a1, ($s0)
-/* 95E584 80243384 26100004 */  addiu     $s0, $s0, 4
-/* 95E588 80243388 4482C000 */  mtc1      $v0, $f24
-/* 95E58C 8024338C 00000000 */  nop
-/* 95E590 80243390 4680C620 */  cvt.s.w   $f24, $f24
-/* 95E594 80243394 0C0B1EAF */  jal       get_variable
-/* 95E598 80243398 0220202D */   daddu    $a0, $s1, $zero
-/* 95E59C 8024339C 8E050000 */  lw        $a1, ($s0)
-/* 95E5A0 802433A0 26100004 */  addiu     $s0, $s0, 4
-/* 95E5A4 802433A4 4482B000 */  mtc1      $v0, $f22
-/* 95E5A8 802433A8 00000000 */  nop
-/* 95E5AC 802433AC 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 95E5B0 802433B0 0C0B1EAF */  jal       get_variable
-/* 95E5B4 802433B4 0220202D */   daddu    $a0, $s1, $zero
-/* 95E5B8 802433B8 8E050000 */  lw        $a1, ($s0)
-/* 95E5BC 802433BC 4482A000 */  mtc1      $v0, $f20
-/* 95E5C0 802433C0 00000000 */  nop
-/* 95E5C4 802433C4 4680A520 */  cvt.s.w   $f20, $f20
-/* 95E5C8 802433C8 0C0B1EAF */  jal       get_variable
-/* 95E5CC 802433CC 0220202D */   daddu    $a0, $s1, $zero
-/* 95E5D0 802433D0 44820000 */  mtc1      $v0, $f0
-/* 95E5D4 802433D4 00000000 */  nop
-/* 95E5D8 802433D8 46800020 */  cvt.s.w   $f0, $f0
-/* 95E5DC 802433DC 46160001 */  sub.s     $f0, $f0, $f22
-/* 95E5E0 802433E0 4618A501 */  sub.s     $f20, $f20, $f24
-/* 95E5E4 802433E4 46140003 */  div.s     $f0, $f0, $f20
-/* 95E5E8 802433E8 46180602 */  mul.s     $f24, $f0, $f24
-/* 95E5EC 802433EC 00000000 */  nop
-/* 95E5F0 802433F0 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* 95E5F4 802433F4 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 95E5F8 802433F8 C4420028 */  lwc1      $f2, 0x28($v0)
-/* 95E5FC 802433FC 46020002 */  mul.s     $f0, $f0, $f2
-/* 95E600 80243400 00000000 */  nop
-/* 95E604 80243404 4618B581 */  sub.s     $f22, $f22, $f24
-/* 95E608 80243408 46160000 */  add.s     $f0, $f0, $f22
-/* 95E60C 8024340C C4420030 */  lwc1      $f2, 0x30($v0)
-/* 95E610 80243410 4600103C */  c.lt.s    $f2, $f0
-/* 95E614 80243414 00000000 */  nop
-/* 95E618 80243418 45030005 */  bc1tl     .L80243430
-/* 95E61C 8024341C AE200084 */   sw       $zero, 0x84($s1)
-/* 95E620 80243420 24020001 */  addiu     $v0, $zero, 1
-/* 95E624 80243424 AE220084 */  sw        $v0, 0x84($s1)
-/* 95E628 80243428 08090D0D */  j         .L80243434
-/* 95E62C 8024342C 0000102D */   daddu    $v0, $zero, $zero
-.L80243430:
-/* 95E630 80243430 24020002 */  addiu     $v0, $zero, 2
-.L80243434:
-/* 95E634 80243434 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95E638 80243438 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95E63C 8024343C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95E640 80243440 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* 95E644 80243444 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* 95E648 80243448 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 95E64C 8024344C 03E00008 */  jr        $ra
-/* 95E650 80243450 27BD0038 */   addiu    $sp, $sp, 0x38
-/* 95E654 80243454 00000000 */  nop
-/* 95E658 80243458 00000000 */  nop
-/* 95E65C 8024345C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s
deleted file mode 100644
index 20829f483d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243460_95E660
-/* 95E660 80243460 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 95E664 80243464 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95E668 80243468 3C108025 */  lui       $s0, %hi(D_8024B5B0_9667B0)
-/* 95E66C 8024346C 2610B5B0 */  addiu     $s0, $s0, %lo(D_8024B5B0_9667B0)
-/* 95E670 80243470 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 95E674 80243474 AFB10014 */  sw        $s1, 0x14($sp)
-/* 95E678 80243478 8E020000 */  lw        $v0, ($s0)
-/* 95E67C 8024347C 14400010 */  bnez      $v0, .L802434C0
-/* 95E680 80243480 0080882D */   daddu    $s1, $a0, $zero
-/* 95E684 80243484 0C00AB39 */  jal       heap_malloc
-/* 95E688 80243488 24040040 */   addiu    $a0, $zero, 0x40
-/* 95E68C 8024348C AE020000 */  sw        $v0, ($s0)
-/* 95E690 80243490 0000182D */  daddu     $v1, $zero, $zero
-/* 95E694 80243494 0040282D */  daddu     $a1, $v0, $zero
-/* 95E698 80243498 0220202D */  daddu     $a0, $s1, $zero
-.L8024349C:
-/* 95E69C 8024349C 8C820084 */  lw        $v0, 0x84($a0)
-/* 95E6A0 802434A0 24840004 */  addiu     $a0, $a0, 4
-/* 95E6A4 802434A4 24630001 */  addiu     $v1, $v1, 1
-/* 95E6A8 802434A8 ACA20000 */  sw        $v0, ($a1)
-/* 95E6AC 802434AC 28620010 */  slti      $v0, $v1, 0x10
-/* 95E6B0 802434B0 1440FFFA */  bnez      $v0, .L8024349C
-/* 95E6B4 802434B4 24A50004 */   addiu    $a1, $a1, 4
-/* 95E6B8 802434B8 08090D3F */  j         .L802434FC
-/* 95E6BC 802434BC 00000000 */   nop
-.L802434C0:
-/* 95E6C0 802434C0 0000182D */  daddu     $v1, $zero, $zero
-/* 95E6C4 802434C4 0040282D */  daddu     $a1, $v0, $zero
-/* 95E6C8 802434C8 0220202D */  daddu     $a0, $s1, $zero
-.L802434CC:
-/* 95E6CC 802434CC 8CA20000 */  lw        $v0, ($a1)
-/* 95E6D0 802434D0 24A50004 */  addiu     $a1, $a1, 4
-/* 95E6D4 802434D4 24630001 */  addiu     $v1, $v1, 1
-/* 95E6D8 802434D8 AC820084 */  sw        $v0, 0x84($a0)
-/* 95E6DC 802434DC 28620010 */  slti      $v0, $v1, 0x10
-/* 95E6E0 802434E0 1440FFFA */  bnez      $v0, .L802434CC
-/* 95E6E4 802434E4 24840004 */   addiu    $a0, $a0, 4
-/* 95E6E8 802434E8 3C108025 */  lui       $s0, %hi(D_8024B5B0_9667B0)
-/* 95E6EC 802434EC 2610B5B0 */  addiu     $s0, $s0, %lo(D_8024B5B0_9667B0)
-/* 95E6F0 802434F0 0C00AB4B */  jal       heap_free
-/* 95E6F4 802434F4 8E040000 */   lw       $a0, ($s0)
-/* 95E6F8 802434F8 AE000000 */  sw        $zero, ($s0)
-.L802434FC:
-/* 95E6FC 802434FC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 95E700 80243500 8FB10014 */  lw        $s1, 0x14($sp)
-/* 95E704 80243504 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95E708 80243508 24020002 */  addiu     $v0, $zero, 2
-/* 95E70C 8024350C 03E00008 */  jr        $ra
-/* 95E710 80243510 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s
deleted file mode 100644
index 7c3984657c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243578_95E778
-/* 95E778 80243578 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95E77C 8024357C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 95E780 80243580 0C03A5B2 */  jal       func_800E96C8
-/* 95E784 80243584 00000000 */   nop
-/* 95E788 80243588 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95E78C 8024358C 24020002 */  addiu     $v0, $zero, 2
-/* 95E790 80243590 03E00008 */  jr        $ra
-/* 95E794 80243594 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 95E798 80243598 00000000 */  nop
-/* 95E79C 8024359C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s
deleted file mode 100644
index 14f9b148bd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802435D4_95E7D4
-/* 95E7D4 802435D4 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 95E7D8 802435D8 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 95E7DC 802435DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95E7E0 802435E0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95E7E4 802435E4 0080802D */  daddu     $s0, $a0, $zero
-/* 95E7E8 802435E8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 95E7EC 802435EC 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 95E7F0 802435F0 10620003 */  beq       $v1, $v0, .L80243600
-/* 95E7F4 802435F4 24020002 */   addiu    $v0, $zero, 2
-/* 95E7F8 802435F8 08090DA0 */  j         .L80243680
-/* 95E7FC 802435FC AE000084 */   sw       $zero, 0x84($s0)
-.L80243600:
-/* 95E800 80243600 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 95E804 80243604 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 95E808 80243608 80620040 */  lb        $v0, 0x40($v1)
-/* 95E80C 8024360C 80670044 */  lb        $a3, 0x44($v1)
-/* 95E810 80243610 04420001 */  bltzl     $v0, .L80243618
-/* 95E814 80243614 00021023 */   negu     $v0, $v0
-.L80243618:
-/* 95E818 80243618 14400003 */  bnez      $v0, .L80243628
-/* 95E81C 8024361C 00000000 */   nop
-/* 95E820 80243620 50E00017 */  beql      $a3, $zero, .L80243680
-/* 95E824 80243624 0000102D */   daddu    $v0, $zero, $zero
-.L80243628:
-/* 95E828 80243628 44822000 */  mtc1      $v0, $f4
-/* 95E82C 8024362C 00000000 */  nop
-/* 95E830 80243630 46802120 */  cvt.s.w   $f4, $f4
-/* 95E834 80243634 44062000 */  mfc1      $a2, $f4
-/* 95E838 80243638 44872000 */  mtc1      $a3, $f4
-/* 95E83C 8024363C 00000000 */  nop
-/* 95E840 80243640 46802120 */  cvt.s.w   $f4, $f4
-/* 95E844 80243644 44806000 */  mtc1      $zero, $f12
-/* 95E848 80243648 44072000 */  mfc1      $a3, $f4
-/* 95E84C 8024364C 0C00A720 */  jal       atan2
-/* 95E850 80243650 46006386 */   mov.s    $f14, $f12
-/* 95E854 80243654 3C014270 */  lui       $at, 0x4270
-/* 95E858 80243658 44811000 */  mtc1      $at, $f2
-/* 95E85C 8024365C 00000000 */  nop
-/* 95E860 80243660 4602003C */  c.lt.s    $f0, $f2
-/* 95E864 80243664 00000000 */  nop
-/* 95E868 80243668 45000004 */  bc1f      .L8024367C
-/* 95E86C 8024366C 24020001 */   addiu    $v0, $zero, 1
-/* 95E870 80243670 AE020084 */  sw        $v0, 0x84($s0)
-/* 95E874 80243674 08090DA0 */  j         .L80243680
-/* 95E878 80243678 24020002 */   addiu    $v0, $zero, 2
-.L8024367C:
-/* 95E87C 8024367C 0000102D */  daddu     $v0, $zero, $zero
-.L80243680:
-/* 95E880 80243680 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 95E884 80243684 8FB00010 */  lw        $s0, 0x10($sp)
-/* 95E888 80243688 03E00008 */  jr        $ra
-/* 95E88C 8024368C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s
deleted file mode 100644
index 67ea1376cf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_9691C0
-/* 9691C0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9691C4 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9691C8 80240008 0080882D */  daddu     $s1, $a0, $zero
-/* 9691CC 8024000C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 9691D0 80240010 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9691D4 80240014 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9691D8 80240018 8E30000C */  lw        $s0, 0xc($s1)
-/* 9691DC 8024001C 8E050000 */  lw        $a1, ($s0)
-/* 9691E0 80240020 0C0B1EAF */  jal       get_variable
-/* 9691E4 80240024 26100004 */   addiu    $s0, $s0, 4
-/* 9691E8 80240028 8E050000 */  lw        $a1, ($s0)
-/* 9691EC 8024002C 26100004 */  addiu     $s0, $s0, 4
-/* 9691F0 80240030 0220202D */  daddu     $a0, $s1, $zero
-/* 9691F4 80240034 0C0B1EAF */  jal       get_variable
-/* 9691F8 80240038 0040902D */   daddu    $s2, $v0, $zero
-/* 9691FC 8024003C 0220202D */  daddu     $a0, $s1, $zero
-/* 969200 80240040 8E050000 */  lw        $a1, ($s0)
-/* 969204 80240044 0C0B1EAF */  jal       get_variable
-/* 969208 80240048 0040802D */   daddu    $s0, $v0, $zero
-/* 96920C 8024004C 0040882D */  daddu     $s1, $v0, $zero
-/* 969210 80240050 2402FFFF */  addiu     $v0, $zero, -1
-/* 969214 80240054 16020005 */  bne       $s0, $v0, .L8024006C
-/* 969218 80240058 24020001 */   addiu    $v0, $zero, 1
-/* 96921C 8024005C 0C04760B */  jal       func_8011D82C
-/* 969220 80240060 0220202D */   daddu    $a0, $s1, $zero
-/* 969224 80240064 08090043 */  j         .L8024010C
-/* 969228 80240068 24020002 */   addiu    $v0, $zero, 2
-.L8024006C:
-/* 96922C 8024006C 12420018 */  beq       $s2, $v0, .L802400D0
-/* 969230 80240070 2A420002 */   slti     $v0, $s2, 2
-/* 969234 80240074 10400005 */  beqz      $v0, .L8024008C
-/* 969238 80240078 24020002 */   addiu    $v0, $zero, 2
-/* 96923C 8024007C 12400007 */  beqz      $s2, .L8024009C
-/* 969240 80240080 3412FFFF */   ori      $s2, $zero, 0xffff
-/* 969244 80240084 08090043 */  j         .L8024010C
-/* 969248 80240088 00000000 */   nop
-.L8024008C:
-/* 96924C 8024008C 1242001B */  beq       $s2, $v0, .L802400FC
-/* 969250 80240090 24020002 */   addiu    $v0, $zero, 2
-/* 969254 80240094 08090043 */  j         .L8024010C
-/* 969258 80240098 00000000 */   nop
-.L8024009C:
-/* 96925C 8024009C 8E040000 */  lw        $a0, ($s0)
-/* 969260 802400A0 1092001A */  beq       $a0, $s2, .L8024010C
-/* 969264 802400A4 24020002 */   addiu    $v0, $zero, 2
-/* 969268 802400A8 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 96926C 802400AC 26100004 */   addiu    $s0, $s0, 4
-/* 969270 802400B0 0C046B4C */  jal       get_model_from_list_index
-/* 969274 802400B4 0040202D */   daddu    $a0, $v0, $zero
-/* 969278 802400B8 0040202D */  daddu     $a0, $v0, $zero
-/* 96927C 802400BC 2405FFFF */  addiu     $a1, $zero, -1
-/* 969280 802400C0 0C046F1F */  jal       func_8011BC7C
-/* 969284 802400C4 0220302D */   daddu    $a2, $s1, $zero
-/* 969288 802400C8 08090027 */  j         .L8024009C
-/* 96928C 802400CC 00000000 */   nop
-.L802400D0:
-/* 969290 802400D0 3412FFFF */  ori       $s2, $zero, 0xffff
-.L802400D4:
-/* 969294 802400D4 8E020000 */  lw        $v0, ($s0)
-/* 969298 802400D8 1052000B */  beq       $v0, $s2, .L80240108
-/* 96929C 802400DC 2405FFFF */   addiu    $a1, $zero, -1
-/* 9692A0 802400E0 96040002 */  lhu       $a0, 2($s0)
-/* 9692A4 802400E4 0220302D */  daddu     $a2, $s1, $zero
-/* 9692A8 802400E8 26100004 */  addiu     $s0, $s0, 4
-/* 9692AC 802400EC 0C046E54 */  jal       func_8011B950
-/* 9692B0 802400F0 0000382D */   daddu    $a3, $zero, $zero
-/* 9692B4 802400F4 08090035 */  j         .L802400D4
-/* 9692B8 802400F8 00000000 */   nop
-.L802400FC:
-/* 9692BC 802400FC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 9692C0 80240100 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 9692C4 80240104 A0510000 */  sb        $s1, ($v0)
-.L80240108:
-/* 9692C8 80240108 24020002 */  addiu     $v0, $zero, 2
-.L8024010C:
-/* 9692CC 8024010C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 9692D0 80240110 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9692D4 80240114 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9692D8 80240118 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9692DC 8024011C 03E00008 */  jr        $ra
-/* 9692E0 80240120 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240124_9692E4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240124_9692E4.s
deleted file mode 100644
index 7a10c10f5a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240124_9692E4.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240124_9692E4
-/* 9692E4 80240124 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 9692E8 80240128 AFB10034 */  sw        $s1, 0x34($sp)
-/* 9692EC 8024012C 0080882D */  daddu     $s1, $a0, $zero
-/* 9692F0 80240130 AFBF0054 */  sw        $ra, 0x54($sp)
-/* 9692F4 80240134 AFBE0050 */  sw        $fp, 0x50($sp)
-/* 9692F8 80240138 AFB7004C */  sw        $s7, 0x4c($sp)
-/* 9692FC 8024013C AFB60048 */  sw        $s6, 0x48($sp)
-/* 969300 80240140 AFB50044 */  sw        $s5, 0x44($sp)
-/* 969304 80240144 AFB40040 */  sw        $s4, 0x40($sp)
-/* 969308 80240148 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 96930C 8024014C AFB20038 */  sw        $s2, 0x38($sp)
-/* 969310 80240150 AFB00030 */  sw        $s0, 0x30($sp)
-/* 969314 80240154 8E30000C */  lw        $s0, 0xc($s1)
-/* 969318 80240158 8E050000 */  lw        $a1, ($s0)
-/* 96931C 8024015C 0C0B1EAF */  jal       get_variable
-/* 969320 80240160 26100004 */   addiu    $s0, $s0, 4
-/* 969324 80240164 8E050000 */  lw        $a1, ($s0)
-/* 969328 80240168 26100004 */  addiu     $s0, $s0, 4
-/* 96932C 8024016C 0220202D */  daddu     $a0, $s1, $zero
-/* 969330 80240170 0C0B1EAF */  jal       get_variable
-/* 969334 80240174 0040982D */   daddu    $s3, $v0, $zero
-/* 969338 80240178 8E050000 */  lw        $a1, ($s0)
-/* 96933C 8024017C 26100004 */  addiu     $s0, $s0, 4
-/* 969340 80240180 0220202D */  daddu     $a0, $s1, $zero
-/* 969344 80240184 0C0B1EAF */  jal       get_variable
-/* 969348 80240188 0040B02D */   daddu    $s6, $v0, $zero
-/* 96934C 8024018C 8E050000 */  lw        $a1, ($s0)
-/* 969350 80240190 26100004 */  addiu     $s0, $s0, 4
-/* 969354 80240194 0220202D */  daddu     $a0, $s1, $zero
-/* 969358 80240198 0C0B1EAF */  jal       get_variable
-/* 96935C 8024019C 0040A82D */   daddu    $s5, $v0, $zero
-/* 969360 802401A0 8E050000 */  lw        $a1, ($s0)
-/* 969364 802401A4 26100004 */  addiu     $s0, $s0, 4
-/* 969368 802401A8 0220202D */  daddu     $a0, $s1, $zero
-/* 96936C 802401AC 0C0B1EAF */  jal       get_variable
-/* 969370 802401B0 0040A02D */   daddu    $s4, $v0, $zero
-/* 969374 802401B4 8E050000 */  lw        $a1, ($s0)
-/* 969378 802401B8 26100004 */  addiu     $s0, $s0, 4
-/* 96937C 802401BC 0220202D */  daddu     $a0, $s1, $zero
-/* 969380 802401C0 0C0B1EAF */  jal       get_variable
-/* 969384 802401C4 0040902D */   daddu    $s2, $v0, $zero
-/* 969388 802401C8 8E050000 */  lw        $a1, ($s0)
-/* 96938C 802401CC 26100004 */  addiu     $s0, $s0, 4
-/* 969390 802401D0 0220202D */  daddu     $a0, $s1, $zero
-/* 969394 802401D4 0C0B1EAF */  jal       get_variable
-/* 969398 802401D8 AFA20028 */   sw       $v0, 0x28($sp)
-/* 96939C 802401DC 8E050000 */  lw        $a1, ($s0)
-/* 9693A0 802401E0 26100004 */  addiu     $s0, $s0, 4
-/* 9693A4 802401E4 0220202D */  daddu     $a0, $s1, $zero
-/* 9693A8 802401E8 0C0B1EAF */  jal       get_variable
-/* 9693AC 802401EC 0040F02D */   daddu    $fp, $v0, $zero
-/* 9693B0 802401F0 8E050000 */  lw        $a1, ($s0)
-/* 9693B4 802401F4 26100004 */  addiu     $s0, $s0, 4
-/* 9693B8 802401F8 0220202D */  daddu     $a0, $s1, $zero
-/* 9693BC 802401FC 0C0B1EAF */  jal       get_variable
-/* 9693C0 80240200 0040B82D */   daddu    $s7, $v0, $zero
-/* 9693C4 80240204 0220202D */  daddu     $a0, $s1, $zero
-/* 9693C8 80240208 8E050000 */  lw        $a1, ($s0)
-/* 9693CC 8024020C 0C0B1EAF */  jal       get_variable
-/* 9693D0 80240210 0040802D */   daddu    $s0, $v0, $zero
-/* 9693D4 80240214 0040182D */  daddu     $v1, $v0, $zero
-/* 9693D8 80240218 24020002 */  addiu     $v0, $zero, 2
-/* 9693DC 8024021C 12620012 */  beq       $s3, $v0, .L80240268
-/* 9693E0 80240220 2A620003 */   slti     $v0, $s3, 3
-/* 9693E4 80240224 10400005 */  beqz      $v0, .L8024023C
-/* 9693E8 80240228 24020001 */   addiu    $v0, $zero, 1
-/* 9693EC 8024022C 12620008 */  beq       $s3, $v0, .L80240250
-/* 9693F0 80240230 32C400FF */   andi     $a0, $s6, 0xff
-/* 9693F4 80240234 080900B1 */  j         .L802402C4
-/* 9693F8 80240238 00000000 */   nop
-.L8024023C:
-/* 9693FC 8024023C 24020003 */  addiu     $v0, $zero, 3
-/* 969400 80240240 12620018 */  beq       $s3, $v0, .L802402A4
-/* 969404 80240244 32C400FF */   andi     $a0, $s6, 0xff
-/* 969408 80240248 080900B1 */  j         .L802402C4
-/* 96940C 8024024C 00000000 */   nop
-.L80240250:
-/* 969410 80240250 32A500FF */  andi      $a1, $s5, 0xff
-/* 969414 80240254 328600FF */  andi      $a2, $s4, 0xff
-/* 969418 80240258 0C046F97 */  jal       set_background_color_blend
-/* 96941C 8024025C 324700FF */   andi     $a3, $s2, 0xff
-/* 969420 80240260 080900B1 */  j         .L802402C4
-/* 969424 80240264 00000000 */   nop
-.L80240268:
-/* 969428 80240268 32C400FF */  andi      $a0, $s6, 0xff
-/* 96942C 8024026C 32A500FF */  andi      $a1, $s5, 0xff
-/* 969430 80240270 328600FF */  andi      $a2, $s4, 0xff
-/* 969434 80240274 324700FF */  andi      $a3, $s2, 0xff
-/* 969438 80240278 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 96943C 8024027C AFB0001C */  sw        $s0, 0x1c($sp)
-/* 969440 80240280 AFA30020 */  sw        $v1, 0x20($sp)
-/* 969444 80240284 AFA20010 */  sw        $v0, 0x10($sp)
-/* 969448 80240288 33C200FF */  andi      $v0, $fp, 0xff
-/* 96944C 8024028C AFA20014 */  sw        $v0, 0x14($sp)
-/* 969450 80240290 32E200FF */  andi      $v0, $s7, 0xff
-/* 969454 80240294 0C046FAD */  jal       func_8011BEB4
-/* 969458 80240298 AFA20018 */   sw       $v0, 0x18($sp)
-/* 96945C 8024029C 080900B1 */  j         .L802402C4
-/* 969460 802402A0 00000000 */   nop
-.L802402A4:
-/* 969464 802402A4 32A500FF */  andi      $a1, $s5, 0xff
-/* 969468 802402A8 328600FF */  andi      $a2, $s4, 0xff
-/* 96946C 802402AC 324700FF */  andi      $a3, $s2, 0xff
-/* 969470 802402B0 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 969474 802402B4 AFA20010 */  sw        $v0, 0x10($sp)
-/* 969478 802402B8 33C200FF */  andi      $v0, $fp, 0xff
-/* 96947C 802402BC 0C046FE6 */  jal       func_8011BF98
-/* 969480 802402C0 AFA20014 */   sw       $v0, 0x14($sp)
-.L802402C4:
-/* 969484 802402C4 8FBF0054 */  lw        $ra, 0x54($sp)
-/* 969488 802402C8 8FBE0050 */  lw        $fp, 0x50($sp)
-/* 96948C 802402CC 8FB7004C */  lw        $s7, 0x4c($sp)
-/* 969490 802402D0 8FB60048 */  lw        $s6, 0x48($sp)
-/* 969494 802402D4 8FB50044 */  lw        $s5, 0x44($sp)
-/* 969498 802402D8 8FB40040 */  lw        $s4, 0x40($sp)
-/* 96949C 802402DC 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 9694A0 802402E0 8FB20038 */  lw        $s2, 0x38($sp)
-/* 9694A4 802402E4 8FB10034 */  lw        $s1, 0x34($sp)
-/* 9694A8 802402E8 8FB00030 */  lw        $s0, 0x30($sp)
-/* 9694AC 802402EC 24020002 */  addiu     $v0, $zero, 2
-/* 9694B0 802402F0 03E00008 */  jr        $ra
-/* 9694B4 802402F4 27BD0058 */   addiu    $sp, $sp, 0x58
-/* 9694B8 802402F8 00000000 */  nop
-/* 9694BC 802402FC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024190C_96AACC.s
similarity index 96%
rename from ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s
rename to ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024190C_96AACC.s
index c4a854b926..7d073c1f0a 100644
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s
+++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024190C_96AACC.s
@@ -27,8 +27,8 @@ glabel func_8024190C_96AACC
 /* 96AB24 80241964 25080008 */  addiu     $t0, $t0, 8
 /* 96AB28 80241968 AFC80000 */  sw        $t0, ($fp)
 /* 96AB2C 8024196C AC620000 */  sw        $v0, ($v1)
-/* 96AB30 80241970 3C028024 */  lui       $v0, %hi(D_802478C8_970A88)
-/* 96AB34 80241974 244278C8 */  addiu     $v0, $v0, %lo(D_802478C8_970A88)
+/* 96AB30 80241970 3C028024 */  lui       $v0, %hi(dro_02_D_802478C8_970A88)
+/* 96AB34 80241974 244278C8 */  addiu     $v0, $v0, %lo(dro_02_D_802478C8_970A88)
 /* 96AB38 80241978 AC620004 */  sw        $v0, 4($v1)
 /* 96AB3C 8024197C 8FAD0100 */  lw        $t5, 0x100($sp)
 /* 96AB40 80241980 8DA30000 */  lw        $v1, ($t5)
@@ -121,8 +121,8 @@ glabel func_8024190C_96AACC
 /* 96AC94 80241AD4 ACC20000 */  sw        $v0, ($a2)
 /* 96AC98 80241AD8 3C02DE00 */  lui       $v0, 0xde00
 /* 96AC9C 80241ADC ACA20000 */  sw        $v0, ($a1)
-/* 96ACA0 80241AE0 3C028024 */  lui       $v0, %hi(D_802479B8_970B78)
-/* 96ACA4 80241AE4 244279B8 */  addiu     $v0, $v0, %lo(D_802479B8_970B78)
+/* 96ACA0 80241AE0 3C028024 */  lui       $v0, %hi(dro_02_D_802479B8_970B78)
+/* 96ACA4 80241AE4 244279B8 */  addiu     $v0, $v0, %lo(dro_02_D_802479B8_970B78)
 /* 96ACA8 80241AE8 ACA20004 */  sw        $v0, 4($a1)
 /* 96ACAC 80241AEC 8FAD0100 */  lw        $t5, 0x100($sp)
 /* 96ACB0 80241AF0 8DA30000 */  lw        $v1, ($t5)
@@ -315,8 +315,8 @@ glabel func_8024190C_96AACC
 /* 96AF94 80241DD4 AE020000 */  sw        $v0, ($s0)
 /* 96AF98 80241DD8 3C02DE00 */  lui       $v0, 0xde00
 /* 96AF9C 80241DDC AC820000 */  sw        $v0, ($a0)
-/* 96AFA0 80241DE0 3C028024 */  lui       $v0, %hi(D_80247A38_970BF8)
-/* 96AFA4 80241DE4 24427A38 */  addiu     $v0, $v0, %lo(D_80247A38_970BF8)
+/* 96AFA0 80241DE0 3C028024 */  lui       $v0, %hi(dro_02_D_80247A38_970BF8)
+/* 96AFA4 80241DE4 24427A38 */  addiu     $v0, $v0, %lo(dro_02_D_80247A38_970BF8)
 /* 96AFA8 80241DE8 AC820004 */  sw        $v0, 4($a0)
 /* 96AFAC 80241DEC 24820010 */  addiu     $v0, $a0, 0x10
 /* 96AFB0 80241DF0 AE020000 */  sw        $v0, ($s0)
@@ -349,8 +349,8 @@ glabel func_8024190C_96AACC
 /* 96B014 80241E54 3C120001 */  lui       $s2, 1
 /* 96B018 80241E58 36521630 */  ori       $s2, $s2, 0x1630
 /* 96B01C 80241E5C AD020004 */  sw        $v0, 4($t0)
-/* 96B020 80241E60 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B024 80241E64 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96B020 80241E60 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96B024 80241E64 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96B028 80241E68 AD030000 */  sw        $v1, ($t0)
 /* 96B02C 80241E6C 8C450004 */  lw        $a1, 4($v0)
 /* 96B030 80241E70 8C460008 */  lw        $a2, 8($v0)
@@ -378,8 +378,8 @@ glabel func_8024190C_96AACC
 /* 96B088 80241EC8 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B08C 80241ECC 34A5D480 */  ori       $a1, $a1, 0xd480
 /* 96B090 80241ED0 8FC30000 */  lw        $v1, ($fp)
-/* 96B094 80241ED4 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96B098 80241ED8 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96B094 80241ED4 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96B098 80241ED8 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96B09C 80241EDC 96020000 */  lhu       $v0, ($s0)
 /* 96B0A0 80241EE0 0060302D */  daddu     $a2, $v1, $zero
 /* 96B0A4 80241EE4 24630008 */  addiu     $v1, $v1, 8
@@ -429,8 +429,8 @@ glabel func_8024190C_96AACC
 /* 96B148 80241F88 36F70002 */  ori       $s7, $s7, 2
 /* 96B14C 80241F8C 3C0DD838 */  lui       $t5, 0xd838
 /* 96B150 80241F90 35AD0002 */  ori       $t5, $t5, 2
-/* 96B154 80241F94 3C108025 */  lui       $s0, %hi(D_8024F010)
-/* 96B158 80241F98 2610F010 */  addiu     $s0, $s0, %lo(D_8024F010)
+/* 96B154 80241F94 3C108025 */  lui       $s0, %hi(dro_02_D_8024F010)
+/* 96B158 80241F98 2610F010 */  addiu     $s0, $s0, %lo(dro_02_D_8024F010)
 /* 96B15C 80241F9C AFAD00C0 */  sw        $t5, 0xc0($sp)
 /* 96B160 80241FA0 AD030000 */  sw        $v1, ($t0)
 /* 96B164 80241FA4 AD020004 */  sw        $v0, 4($t0)
@@ -457,8 +457,8 @@ glabel func_8024190C_96AACC
 /* 96B1B8 80241FF8 00452821 */   addu     $a1, $v0, $a1
 /* 96B1BC 80241FFC 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B1C0 80242000 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 96B1C4 80242004 3C158025 */  lui       $s5, %hi(D_8024EFCC)
-/* 96B1C8 80242008 26B5EFCC */  addiu     $s5, $s5, %lo(D_8024EFCC)
+/* 96B1C4 80242004 3C158025 */  lui       $s5, %hi(dro_02_D_8024EFCC)
+/* 96B1C8 80242008 26B5EFCC */  addiu     $s5, $s5, %lo(dro_02_D_8024EFCC)
 /* 96B1CC 8024200C 3C0D8000 */  lui       $t5, 0x8000
 /* 96B1D0 80242010 8FC30000 */  lw        $v1, ($fp)
 /* 96B1D4 80242014 8EA40000 */  lw        $a0, ($s5)
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s
similarity index 83%
rename from ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
rename to ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s
index 5dd47848d3..42813cf3c6 100644
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
+++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s
@@ -1,11 +1,32 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_8024EF20_9780E0
+.word L80242458_96B618, L8024252C_96B6EC, L802425CC_96B78C, L802425F4_96B7B4, L80242660_96B820, L802426F4_96B8B4, L802427C4_96B984, L802428A8_96BA68, L80242978_96BB38, L802429D0_96BB90, L80242A54_96BC14, L80242A80_96BC40, L80242C2C_96BDEC, L80242E94_96C054
+
+glabel D_8024EF58_978118
+.double 0.1
+
+glabel D_8024EF60_978120
+.double 0.1
+
+glabel D_8024EF68_978128
+.double 0.01
+
+glabel D_8024EF70_978130
+.double 0.4
+
+glabel D_8024EF78_978138
+.double 0.05
+
+.section .text
 glabel func_8024240C_96B5CC
 /* 96B5CC 8024240C 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 96B5D0 80242410 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96B5D4 80242414 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96B5D8 80242418 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96B5D4 80242414 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96B5D8 80242418 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96B5DC 8024241C AFBF0080 */  sw        $ra, 0x80($sp)
 /* 96B5E0 80242420 AFB1007C */  sw        $s1, 0x7c($sp)
 /* 96B5E4 80242424 AFB00078 */  sw        $s0, 0x78($sp)
@@ -24,14 +45,14 @@ glabel func_8024240C_96B5CC
 glabel L80242458_96B618
 /* 96B618 80242458 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B61C 8024245C 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B620 80242460 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96B624 80242464 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
-/* 96B628 80242468 3C018025 */  lui       $at, %hi(D_8024EF88)
-/* 96B62C 8024246C AC20EF88 */  sw        $zero, %lo(D_8024EF88)($at)
+/* 96B620 80242460 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96B624 80242464 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
+/* 96B628 80242468 3C018025 */  lui       $at, %hi(dro_02_D_8024EF88)
+/* 96B62C 8024246C AC20EF88 */  sw        $zero, %lo(dro_02_D_8024EF88)($at)
 /* 96B630 80242470 0C0B2026 */  jal       set_variable
 /* 96B634 80242474 24060001 */   addiu    $a2, $zero, 1
-/* 96B638 80242478 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B63C 8024247C 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96B638 80242478 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96B63C 8024247C 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96B640 80242480 24040001 */  addiu     $a0, $zero, 1
 /* 96B644 80242484 3C01C348 */  lui       $at, 0xc348
 /* 96B648 80242488 44811000 */  mtc1      $at, $f2
@@ -76,10 +97,10 @@ glabel L80242458_96B618
 /* 96B6E4 80242524 08090BA5 */  j         L80242E94_96C054
 /* 96B6E8 80242528 E4460054 */   swc1     $f6, 0x54($v0)
 glabel L8024252C_96B6EC
-/* 96B6EC 8024252C 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B6F0 80242530 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
-/* 96B6F4 80242534 3C108025 */  lui       $s0, %hi(D_8024EF88)
-/* 96B6F8 80242538 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
+/* 96B6EC 8024252C 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96B6F0 80242530 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
+/* 96B6F4 80242534 3C108025 */  lui       $s0, %hi(dro_02_D_8024EF88)
+/* 96B6F8 80242538 2610EF88 */  addiu     $s0, $s0, %lo(dro_02_D_8024EF88)
 /* 96B6FC 8024253C C4440004 */  lwc1      $f4, 4($v0)
 /* 96B700 80242540 3C014120 */  lui       $at, 0x4120
 /* 96B704 80242544 44810000 */  mtc1      $at, $f0
@@ -111,15 +132,15 @@ glabel L8024252C_96B6EC
 /* 96B768 802425A8 00000000 */   nop
 /* 96B76C 802425AC 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B770 802425B0 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B774 802425B4 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96B778 802425B8 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96B774 802425B4 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96B778 802425B8 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96B77C 802425BC 0C0B2026 */  jal       set_variable
 /* 96B780 802425C0 24060002 */   addiu    $a2, $zero, 2
 /* 96B784 802425C4 08090BA5 */  j         L80242E94_96C054
 /* 96B788 802425C8 AE000000 */   sw       $zero, ($s0)
 glabel L802425CC_96B78C
-/* 96B78C 802425CC 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B790 802425D0 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96B78C 802425CC 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96B790 802425D0 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96B794 802425D4 24030002 */  addiu     $v1, $zero, 2
 /* 96B798 802425D8 AC430000 */  sw        $v1, ($v0)
 /* 96B79C 802425DC AC400024 */  sw        $zero, 0x24($v0)
@@ -129,14 +150,14 @@ glabel L802425CC_96B78C
 /* 96B7AC 802425EC 08090BA5 */  j         L80242E94_96C054
 /* 96B7B0 802425F0 AC40000C */   sw       $zero, 0xc($v0)
 glabel L802425F4_96B7B4
-/* 96B7B4 802425F4 3C038025 */  lui       $v1, %hi(D_8024F010)
-/* 96B7B8 802425F8 2463F010 */  addiu     $v1, $v1, %lo(D_8024F010)
+/* 96B7B4 802425F4 3C038025 */  lui       $v1, %hi(dro_02_D_8024F010)
+/* 96B7B8 802425F8 2463F010 */  addiu     $v1, $v1, %lo(dro_02_D_8024F010)
 /* 96B7BC 802425FC 24020001 */  addiu     $v0, $zero, 1
 /* 96B7C0 80242600 C4620004 */  lwc1      $f2, 4($v1)
 /* 96B7C4 80242604 3C014120 */  lui       $at, 0x4120
 /* 96B7C8 80242608 44812000 */  mtc1      $at, $f4
-/* 96B7CC 8024260C 3C078025 */  lui       $a3, %hi(D_8024EF88)
-/* 96B7D0 80242610 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
+/* 96B7CC 8024260C 3C078025 */  lui       $a3, %hi(dro_02_D_8024EF88)
+/* 96B7D0 80242610 24E7EF88 */  addiu     $a3, $a3, %lo(dro_02_D_8024EF88)
 /* 96B7D4 80242614 AC620000 */  sw        $v0, ($v1)
 /* 96B7D8 80242618 AC620024 */  sw        $v0, 0x24($v1)
 /* 96B7DC 8024261C AC620048 */  sw        $v0, 0x48($v1)
@@ -152,13 +173,13 @@ glabel L802425F4_96B7B4
 /* 96B804 80242644 E4600028 */   swc1     $f0, 0x28($v1)
 /* 96B808 80242648 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B80C 8024264C 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B810 80242650 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96B814 80242654 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96B810 80242650 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96B814 80242654 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96B818 80242658 08090A91 */  j         .L80242A44
 /* 96B81C 8024265C 24060004 */   addiu    $a2, $zero, 4
 glabel L80242660_96B820
-/* 96B820 80242660 3C078025 */  lui       $a3, %hi(D_8024EF88)
-/* 96B824 80242664 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
+/* 96B820 80242660 3C078025 */  lui       $a3, %hi(dro_02_D_8024EF88)
+/* 96B824 80242664 24E7EF88 */  addiu     $a3, $a3, %lo(dro_02_D_8024EF88)
 /* 96B828 80242668 3C01C2C8 */  lui       $at, 0xc2c8
 /* 96B82C 8024266C 44810000 */  mtc1      $at, $f0
 /* 96B830 80242670 3C0142C8 */  lui       $at, 0x42c8
@@ -168,8 +189,8 @@ glabel L80242660_96B820
 /* 96B840 80242680 3C014000 */  lui       $at, 0x4000
 /* 96B844 80242684 44813000 */  mtc1      $at, $f6
 /* 96B848 80242688 8CE30000 */  lw        $v1, ($a3)
-/* 96B84C 8024268C 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B850 80242690 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96B84C 8024268C 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96B850 80242690 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96B854 80242694 AC400008 */  sw        $zero, 8($v0)
 /* 96B858 80242698 AC40000C */  sw        $zero, 0xc($v0)
 /* 96B85C 8024269C AC40002C */  sw        $zero, 0x2c($v0)
@@ -185,8 +206,8 @@ glabel L80242660_96B820
 /* 96B884 802426C4 ACE30000 */   sw       $v1, ($a3)
 /* 96B888 802426C8 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B88C 802426CC 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B890 802426D0 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96B894 802426D4 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96B890 802426D0 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96B894 802426D4 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96B898 802426D8 24060005 */  addiu     $a2, $zero, 5
 /* 96B89C 802426DC 0C0B2026 */  jal       set_variable
 /* 96B8A0 802426E0 ACE00000 */   sw       $zero, ($a3)
@@ -195,13 +216,13 @@ glabel L80242660_96B820
 /* 96B8AC 802426EC 08090A26 */  j         .L80242898
 /* 96B8B0 802426F0 24060018 */   addiu    $a2, $zero, 0x18
 glabel L802426F4_96B8B4
-/* 96B8B4 802426F4 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B8B8 802426F8 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96B8B4 802426F4 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96B8B8 802426F8 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96B8BC 802426FC C4400010 */  lwc1      $f0, 0x10($v0)
 /* 96B8C0 80242700 3C014190 */  lui       $at, 0x4190
 /* 96B8C4 80242704 44811000 */  mtc1      $at, $f2
-/* 96B8C8 80242708 3C108025 */  lui       $s0, %hi(D_8024EF88)
-/* 96B8CC 8024270C 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
+/* 96B8C8 80242708 3C108025 */  lui       $s0, %hi(dro_02_D_8024EF88)
+/* 96B8CC 8024270C 2610EF88 */  addiu     $s0, $s0, %lo(dro_02_D_8024EF88)
 /* 96B8D0 80242710 AC400034 */  sw        $zero, 0x34($v0)
 /* 96B8D4 80242714 AC400058 */  sw        $zero, 0x58($v0)
 /* 96B8D8 80242718 8E030000 */  lw        $v1, ($s0)
@@ -216,7 +237,7 @@ glabel L802426F4_96B8B4
 /* 96B8FC 8024273C 27A6001C */  addiu     $a2, $sp, 0x1c
 /* 96B900 80242740 27A70020 */  addiu     $a3, $sp, 0x20
 /* 96B904 80242744 27A20024 */  addiu     $v0, $sp, 0x24
-/* 96B908 80242748 0C090885 */  jal       func_80242214_96B3D4
+/* 96B908 80242748 0C090885 */  jal       dro_02_func_80242214_96B3D4
 /* 96B90C 8024274C AFA20010 */   sw       $v0, 0x10($sp)
 /* 96B910 80242750 C7A2001C */  lwc1      $f2, 0x1c($sp)
 /* 96B914 80242754 3C0141A0 */  lui       $at, 0x41a0
@@ -240,8 +261,8 @@ glabel L802426F4_96B8B4
 /* 96B958 80242798 24060006 */   addiu    $a2, $zero, 6
 /* 96B95C 8024279C 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B960 802427A0 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B964 802427A4 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96B968 802427A8 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96B964 802427A4 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96B968 802427A8 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96B96C 802427AC 0C0B2026 */  jal       set_variable
 /* 96B970 802427B0 AE000000 */   sw       $zero, ($s0)
 /* 96B974 802427B4 24040203 */  addiu     $a0, $zero, 0x203
@@ -249,13 +270,13 @@ glabel L802426F4_96B8B4
 /* 96B97C 802427BC 08090A26 */  j         .L80242898
 /* 96B980 802427C0 24060040 */   addiu    $a2, $zero, 0x40
 glabel L802427C4_96B984
-/* 96B984 802427C4 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B988 802427C8 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96B984 802427C4 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96B988 802427C8 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96B98C 802427CC C4420010 */  lwc1      $f2, 0x10($v0)
 /* 96B990 802427D0 3C014190 */  lui       $at, 0x4190
 /* 96B994 802427D4 44812000 */  mtc1      $at, $f4
-/* 96B998 802427D8 3C108025 */  lui       $s0, %hi(D_8024EF88)
-/* 96B99C 802427DC 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
+/* 96B998 802427D8 3C108025 */  lui       $s0, %hi(dro_02_D_8024EF88)
+/* 96B99C 802427DC 2610EF88 */  addiu     $s0, $s0, %lo(dro_02_D_8024EF88)
 /* 96B9A0 802427E0 AC400034 */  sw        $zero, 0x34($v0)
 /* 96B9A4 802427E4 8E030000 */  lw        $v1, ($s0)
 /* 96B9A8 802427E8 46041080 */  add.s     $f2, $f2, $f4
@@ -272,7 +293,7 @@ glabel L802427C4_96B984
 /* 96B9D4 80242814 27A6002C */  addiu     $a2, $sp, 0x2c
 /* 96B9D8 80242818 27A70030 */  addiu     $a3, $sp, 0x30
 /* 96B9DC 8024281C 27A20034 */  addiu     $v0, $sp, 0x34
-/* 96B9E0 80242820 0C090885 */  jal       func_80242214_96B3D4
+/* 96B9E0 80242820 0C090885 */  jal       dro_02_func_80242214_96B3D4
 /* 96B9E4 80242824 AFA20010 */   sw       $v0, 0x10($sp)
 /* 96B9E8 80242828 C7A2002C */  lwc1      $f2, 0x2c($sp)
 /* 96B9EC 8024282C 3C0141A0 */  lui       $at, 0x41a0
@@ -296,8 +317,8 @@ glabel L802427C4_96B984
 /* 96BA30 80242870 24060007 */   addiu    $a2, $zero, 7
 /* 96BA34 80242874 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BA38 80242878 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BA3C 8024287C 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96BA40 80242880 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96BA3C 8024287C 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96BA40 80242880 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96BA44 80242884 0C0B2026 */  jal       set_variable
 /* 96BA48 80242888 AE000000 */   sw       $zero, ($s0)
 /* 96BA4C 8024288C 24040203 */  addiu     $a0, $zero, 0x203
@@ -309,13 +330,13 @@ glabel L802427C4_96B984
 /* 96BA60 802428A0 08090BA5 */  j         L80242E94_96C054
 /* 96BA64 802428A4 00000000 */   nop
 glabel L802428A8_96BA68
-/* 96BA68 802428A8 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96BA6C 802428AC 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96BA68 802428A8 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96BA6C 802428AC 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96BA70 802428B0 C4420034 */  lwc1      $f2, 0x34($v0)
 /* 96BA74 802428B4 3C014190 */  lui       $at, 0x4190
 /* 96BA78 802428B8 44812000 */  mtc1      $at, $f4
-/* 96BA7C 802428BC 3C108025 */  lui       $s0, %hi(D_8024EF88)
-/* 96BA80 802428C0 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
+/* 96BA7C 802428BC 3C108025 */  lui       $s0, %hi(dro_02_D_8024EF88)
+/* 96BA80 802428C0 2610EF88 */  addiu     $s0, $s0, %lo(dro_02_D_8024EF88)
 /* 96BA84 802428C4 AC400010 */  sw        $zero, 0x10($v0)
 /* 96BA88 802428C8 8E030000 */  lw        $v1, ($s0)
 /* 96BA8C 802428CC 46041080 */  add.s     $f2, $f2, $f4
@@ -332,7 +353,7 @@ glabel L802428A8_96BA68
 /* 96BAB8 802428F8 27A6003C */  addiu     $a2, $sp, 0x3c
 /* 96BABC 802428FC 27A70040 */  addiu     $a3, $sp, 0x40
 /* 96BAC0 80242900 27A20044 */  addiu     $v0, $sp, 0x44
-/* 96BAC4 80242904 0C090885 */  jal       func_80242214_96B3D4
+/* 96BAC4 80242904 0C090885 */  jal       dro_02_func_80242214_96B3D4
 /* 96BAC8 80242908 AFA20010 */   sw       $v0, 0x10($sp)
 /* 96BACC 8024290C C7A2003C */  lwc1      $f2, 0x3c($sp)
 /* 96BAD0 80242910 3C0141A0 */  lui       $at, 0x41a0
@@ -356,20 +377,20 @@ glabel L802428A8_96BA68
 /* 96BB14 80242954 24060008 */   addiu    $a2, $zero, 8
 /* 96BB18 80242958 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BB1C 8024295C 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BB20 80242960 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96BB24 80242964 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96BB20 80242960 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96BB24 80242964 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96BB28 80242968 0C0B2026 */  jal       set_variable
 /* 96BB2C 8024296C AE000000 */   sw       $zero, ($s0)
 /* 96BB30 80242970 08090BA5 */  j         L80242E94_96C054
 /* 96BB34 80242974 00000000 */   nop
 glabel L80242978_96BB38
-/* 96BB38 80242978 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96BB3C 8024297C 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96BB38 80242978 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96BB3C 8024297C 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96BB40 80242980 C4400034 */  lwc1      $f0, 0x34($v0)
 /* 96BB44 80242984 3C014190 */  lui       $at, 0x4190
 /* 96BB48 80242988 44811000 */  mtc1      $at, $f2
-/* 96BB4C 8024298C 3C078025 */  lui       $a3, %hi(D_8024EF88)
-/* 96BB50 80242990 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
+/* 96BB4C 8024298C 3C078025 */  lui       $a3, %hi(dro_02_D_8024EF88)
+/* 96BB50 80242990 24E7EF88 */  addiu     $a3, $a3, %lo(dro_02_D_8024EF88)
 /* 96BB54 80242994 AC400010 */  sw        $zero, 0x10($v0)
 /* 96BB58 80242998 AC400058 */  sw        $zero, 0x58($v0)
 /* 96BB5C 8024299C 8CE30000 */  lw        $v1, ($a3)
@@ -381,18 +402,18 @@ glabel L80242978_96BB38
 /* 96BB74 802429B4 14620137 */  bne       $v1, $v0, L80242E94_96C054
 /* 96BB78 802429B8 24060009 */   addiu    $a2, $zero, 9
 /* 96BB7C 802429BC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96BB80 802429C0 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96BB84 802429C4 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96BB80 802429C0 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96BB84 802429C4 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96BB88 802429C8 08090A91 */  j         .L80242A44
 /* 96BB8C 802429CC 34A5D489 */   ori      $a1, $a1, 0xd489
 glabel L802429D0_96BB90
-/* 96BB90 802429D0 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96BB94 802429D4 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96BB90 802429D0 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96BB94 802429D4 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
 /* 96BB98 802429D8 C4420004 */  lwc1      $f2, 4($v0)
 /* 96BB9C 802429DC 3C014120 */  lui       $at, 0x4120
 /* 96BBA0 802429E0 44812000 */  mtc1      $at, $f4
-/* 96BBA4 802429E4 3C078025 */  lui       $a3, %hi(D_8024EF88)
-/* 96BBA8 802429E8 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
+/* 96BBA4 802429E4 3C078025 */  lui       $a3, %hi(dro_02_D_8024EF88)
+/* 96BBA8 802429E8 24E7EF88 */  addiu     $a3, $a3, %lo(dro_02_D_8024EF88)
 /* 96BBAC 802429EC AC400008 */  sw        $zero, 8($v0)
 /* 96BBB0 802429F0 AC400010 */  sw        $zero, 0x10($v0)
 /* 96BBB4 802429F4 AC40002C */  sw        $zero, 0x2c($v0)
@@ -413,16 +434,16 @@ glabel L802429D0_96BB90
 /* 96BBF0 80242A30 0040302D */   daddu    $a2, $v0, $zero
 /* 96BBF4 80242A34 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BBF8 80242A38 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BBFC 80242A3C 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96BC00 80242A40 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96BBFC 80242A3C 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96BC00 80242A40 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 .L80242A44:
 /* 96BC04 80242A44 0C0B2026 */  jal       set_variable
 /* 96BC08 80242A48 ACE00000 */   sw       $zero, ($a3)
 /* 96BC0C 80242A4C 08090BA5 */  j         L80242E94_96C054
 /* 96BC10 80242A50 00000000 */   nop
 glabel L80242A54_96BC14
-/* 96BC14 80242A54 3C038025 */  lui       $v1, %hi(D_8024F010)
-/* 96BC18 80242A58 2463F010 */  addiu     $v1, $v1, %lo(D_8024F010)
+/* 96BC14 80242A54 3C038025 */  lui       $v1, %hi(dro_02_D_8024F010)
+/* 96BC18 80242A58 2463F010 */  addiu     $v1, $v1, %lo(dro_02_D_8024F010)
 /* 96BC1C 80242A5C 24020003 */  addiu     $v0, $zero, 3
 /* 96BC20 80242A60 AC620000 */  sw        $v0, ($v1)
 /* 96BC24 80242A64 24020008 */  addiu     $v0, $zero, 8
@@ -436,13 +457,13 @@ glabel L80242A80_96BC40
 /* 96BC40 80242A80 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BC44 80242A84 34A5D489 */  ori       $a1, $a1, 0xd489
 /* 96BC48 80242A88 2406000C */  addiu     $a2, $zero, 0xc
-/* 96BC4C 80242A8C 3C118025 */  lui       $s1, %hi(D_8024EF90)
-/* 96BC50 80242A90 2631EF90 */  addiu     $s1, $s1, %lo(D_8024EF90)
+/* 96BC4C 80242A8C 3C118025 */  lui       $s1, %hi(dro_02_D_8024EF90)
+/* 96BC50 80242A90 2631EF90 */  addiu     $s1, $s1, %lo(dro_02_D_8024EF90)
 /* 96BC54 80242A94 0220802D */  daddu     $s0, $s1, $zero
-/* 96BC58 80242A98 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96BC5C 80242A9C 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
-/* 96BC60 80242AA0 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96BC64 80242AA4 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96BC58 80242A98 3C028025 */  lui       $v0, %hi(dro_02_D_8024F010)
+/* 96BC5C 80242A9C 2442F010 */  addiu     $v0, $v0, %lo(dro_02_D_8024F010)
+/* 96BC60 80242AA0 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96BC64 80242AA4 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96BC68 80242AA8 3C018025 */  lui       $at, %hi(D_8024EF58_978118)
 /* 96BC6C 80242AAC D434EF58 */  ldc1      $f20, %lo(D_8024EF58_978118)($at)
 /* 96BC70 80242AB0 3C014288 */  lui       $at, 0x4288
@@ -462,8 +483,8 @@ glabel L80242A80_96BC40
 /* 96BCA8 80242AE8 AC400030 */  sw        $zero, 0x30($v0)
 /* 96BCAC 80242AEC AC430040 */  sw        $v1, 0x40($v0)
 /* 96BCB0 80242AF0 AC400044 */  sw        $zero, 0x44($v0)
-/* 96BCB4 80242AF4 3C018025 */  lui       $at, %hi(D_8024EF88)
-/* 96BCB8 80242AF8 AC20EF88 */  sw        $zero, %lo(D_8024EF88)($at)
+/* 96BCB4 80242AF4 3C018025 */  lui       $at, %hi(dro_02_D_8024EF88)
+/* 96BCB8 80242AF8 AC20EF88 */  sw        $zero, %lo(dro_02_D_8024EF88)($at)
 /* 96BCBC 80242AFC E4400008 */  swc1      $f0, 8($v0)
 /* 96BCC0 80242B00 E4420010 */  swc1      $f2, 0x10($v0)
 /* 96BCC4 80242B04 E440002C */  swc1      $f0, 0x2c($v0)
@@ -478,9 +499,9 @@ glabel L80242A80_96BC40
 /* 96BCE8 80242B28 3C018025 */  lui       $at, %hi(gPauseMenuTabs)
 /* 96BCEC 80242B2C AC20EF80 */  sw        $zero, %lo(gPauseMenuTabs)($at)
 /* 96BCF0 80242B30 AFA20010 */  sw        $v0, 0x10($sp)
-/* 96BCF4 80242B34 3C018025 */  lui       $at, %hi(D_8024EF84)
-/* 96BCF8 80242B38 E420EF84 */  swc1      $f0, %lo(D_8024EF84)($at)
-/* 96BCFC 80242B3C 0C090885 */  jal       func_80242214_96B3D4
+/* 96BCF4 80242B34 3C018025 */  lui       $at, %hi(dro_02_D_8024EF84)
+/* 96BCF8 80242B38 E420EF84 */  swc1      $f0, %lo(dro_02_D_8024EF84)($at)
+/* 96BCFC 80242B3C 0C090885 */  jal       dro_02_func_80242214_96B3D4
 /* 96BD00 80242B40 27A70050 */   addiu    $a3, $sp, 0x50
 .L80242B44:
 /* 96BD04 80242B44 C7A2004C */  lwc1      $f2, 0x4c($sp)
@@ -549,10 +570,10 @@ glabel L80242C2C_96BDEC
 /* 96BDF4 80242C34 27A6005C */  addiu     $a2, $sp, 0x5c
 /* 96BDF8 80242C38 27A70060 */  addiu     $a3, $sp, 0x60
 /* 96BDFC 80242C3C 27A20064 */  addiu     $v0, $sp, 0x64
-/* 96BE00 80242C40 0C090885 */  jal       func_80242214_96B3D4
+/* 96BE00 80242C40 0C090885 */  jal       dro_02_func_80242214_96B3D4
 /* 96BE04 80242C44 AFA20010 */   sw       $v0, 0x10($sp)
-/* 96BE08 80242C48 3C028025 */  lui       $v0, %hi(D_8024EF90)
-/* 96BE0C 80242C4C 2442EF90 */  addiu     $v0, $v0, %lo(D_8024EF90)
+/* 96BE08 80242C48 3C028025 */  lui       $v0, %hi(dro_02_D_8024EF90)
+/* 96BE0C 80242C4C 2442EF90 */  addiu     $v0, $v0, %lo(dro_02_D_8024EF90)
 /* 96BE10 80242C50 0040282D */  daddu     $a1, $v0, $zero
 /* 96BE14 80242C54 24A70010 */  addiu     $a3, $a1, 0x10
 /* 96BE18 80242C58 C7AA0058 */  lwc1      $f10, 0x58($sp)
@@ -622,14 +643,14 @@ glabel L80242C2C_96BDEC
 /* 96BF08 80242D48 00A7102A */  slt       $v0, $a1, $a3
 /* 96BF0C 80242D4C 1440FFCF */  bnez      $v0, .L80242C8C
 /* 96BF10 80242D50 00000000 */   nop
-/* 96BF14 80242D54 3C108025 */  lui       $s0, %hi(D_8024F010)
-/* 96BF18 80242D58 2610F010 */  addiu     $s0, $s0, %lo(D_8024F010)
+/* 96BF14 80242D54 3C108025 */  lui       $s0, %hi(dro_02_D_8024F010)
+/* 96BF18 80242D58 2610F010 */  addiu     $s0, $s0, %lo(dro_02_D_8024F010)
 /* 96BF1C 80242D5C 3C048025 */  lui       $a0, %hi(gPauseMenuTabs)
 /* 96BF20 80242D60 2484EF80 */  addiu     $a0, $a0, %lo(gPauseMenuTabs)
-/* 96BF24 80242D64 3C038025 */  lui       $v1, %hi(D_8024EF84)
-/* 96BF28 80242D68 2463EF84 */  addiu     $v1, $v1, %lo(D_8024EF84)
-/* 96BF2C 80242D6C 3C078025 */  lui       $a3, %hi(D_8024EF88)
-/* 96BF30 80242D70 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
+/* 96BF24 80242D64 3C038025 */  lui       $v1, %hi(dro_02_D_8024EF84)
+/* 96BF28 80242D68 2463EF84 */  addiu     $v1, $v1, %lo(dro_02_D_8024EF84)
+/* 96BF2C 80242D6C 3C078025 */  lui       $a3, %hi(dro_02_D_8024EF88)
+/* 96BF30 80242D70 24E7EF88 */  addiu     $a3, $a3, %lo(dro_02_D_8024EF88)
 /* 96BF34 80242D74 C6060008 */  lwc1      $f6, 8($s0)
 /* 96BF38 80242D78 C4820000 */  lwc1      $f2, ($a0)
 /* 96BF3C 80242D7C C604002C */  lwc1      $f4, 0x2c($s0)
@@ -659,8 +680,8 @@ glabel L80242C2C_96BDEC
 /* 96BF9C 80242DDC E4600000 */   swc1     $f0, ($v1)
 /* 96BFA0 80242DE0 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BFA4 80242DE4 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BFA8 80242DE8 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96BFAC 80242DEC 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96BFA8 80242DE8 3C048025 */  lui       $a0, %hi(dro_02_D_8024EFCC)
+/* 96BFAC 80242DEC 8C84EFCC */  lw        $a0, %lo(dro_02_D_8024EFCC)($a0)
 /* 96BFB0 80242DF0 2406000D */  addiu     $a2, $zero, 0xd
 /* 96BFB4 80242DF4 E608002C */  swc1      $f8, 0x2c($s0)
 /* 96BFB8 80242DF8 0C0B2026 */  jal       set_variable
@@ -672,7 +693,7 @@ glabel L80242C2C_96BDEC
 /* 96BFD0 80242E10 27A20074 */  addiu     $v0, $sp, 0x74
 /* 96BFD4 80242E14 AE000000 */  sw        $zero, ($s0)
 /* 96BFD8 80242E18 AE000024 */  sw        $zero, 0x24($s0)
-/* 96BFDC 80242E1C 0C090885 */  jal       func_80242214_96B3D4
+/* 96BFDC 80242E1C 0C090885 */  jal       dro_02_func_80242214_96B3D4
 /* 96BFE0 80242E20 AFA20010 */   sw       $v0, 0x10($sp)
 /* 96BFE4 80242E24 C7A2006C */  lwc1      $f2, 0x6c($sp)
 /* 96BFE8 80242E28 3C0141A0 */  lui       $at, 0x41a0
@@ -692,8 +713,8 @@ glabel L80242C2C_96BDEC
 /* 96C020 80242E60 0C05272D */  jal       sfx_play_sound
 /* 96C024 80242E64 24040206 */   addiu    $a0, $zero, 0x206
 /* 96C028 80242E68 0000282D */  daddu     $a1, $zero, $zero
-/* 96C02C 80242E6C 3C048025 */  lui       $a0, %hi(D_8024EF90)
-/* 96C030 80242E70 2484EF90 */  addiu     $a0, $a0, %lo(D_8024EF90)
+/* 96C02C 80242E6C 3C048025 */  lui       $a0, %hi(dro_02_D_8024EF90)
+/* 96C030 80242E70 2484EF90 */  addiu     $a0, $a0, %lo(dro_02_D_8024EF90)
 .L80242E74:
 /* 96C034 80242E74 8C820000 */  lw        $v0, ($a0)
 /* 96C038 80242E78 8C430000 */  lw        $v1, ($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s
deleted file mode 100644
index ae4866ccd9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240300_9694C0
-/* 9694C0 80240300 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9694C4 80240304 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9694C8 80240308 3C108024 */  lui       $s0, %hi(D_80244DE0_96DFA0)
-/* 9694CC 8024030C 26104DE0 */  addiu     $s0, $s0, %lo(D_80244DE0_96DFA0)
-/* 9694D0 80240310 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9694D4 80240314 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9694D8 80240318 8E020000 */  lw        $v0, ($s0)
-/* 9694DC 8024031C 14400010 */  bnez      $v0, .L80240360
-/* 9694E0 80240320 0080882D */   daddu    $s1, $a0, $zero
-/* 9694E4 80240324 0C00AB39 */  jal       heap_malloc
-/* 9694E8 80240328 24040040 */   addiu    $a0, $zero, 0x40
-/* 9694EC 8024032C AE020000 */  sw        $v0, ($s0)
-/* 9694F0 80240330 0000182D */  daddu     $v1, $zero, $zero
-/* 9694F4 80240334 0040282D */  daddu     $a1, $v0, $zero
-/* 9694F8 80240338 0220202D */  daddu     $a0, $s1, $zero
-.L8024033C:
-/* 9694FC 8024033C 8C820084 */  lw        $v0, 0x84($a0)
-/* 969500 80240340 24840004 */  addiu     $a0, $a0, 4
-/* 969504 80240344 24630001 */  addiu     $v1, $v1, 1
-/* 969508 80240348 ACA20000 */  sw        $v0, ($a1)
-/* 96950C 8024034C 28620010 */  slti      $v0, $v1, 0x10
-/* 969510 80240350 1440FFFA */  bnez      $v0, .L8024033C
-/* 969514 80240354 24A50004 */   addiu    $a1, $a1, 4
-/* 969518 80240358 080900E7 */  j         .L8024039C
-/* 96951C 8024035C 00000000 */   nop
-.L80240360:
-/* 969520 80240360 0000182D */  daddu     $v1, $zero, $zero
-/* 969524 80240364 0040282D */  daddu     $a1, $v0, $zero
-/* 969528 80240368 0220202D */  daddu     $a0, $s1, $zero
-.L8024036C:
-/* 96952C 8024036C 8CA20000 */  lw        $v0, ($a1)
-/* 969530 80240370 24A50004 */  addiu     $a1, $a1, 4
-/* 969534 80240374 24630001 */  addiu     $v1, $v1, 1
-/* 969538 80240378 AC820084 */  sw        $v0, 0x84($a0)
-/* 96953C 8024037C 28620010 */  slti      $v0, $v1, 0x10
-/* 969540 80240380 1440FFFA */  bnez      $v0, .L8024036C
-/* 969544 80240384 24840004 */   addiu    $a0, $a0, 4
-/* 969548 80240388 3C108024 */  lui       $s0, %hi(D_80244DE0_96DFA0)
-/* 96954C 8024038C 26104DE0 */  addiu     $s0, $s0, %lo(D_80244DE0_96DFA0)
-/* 969550 80240390 0C00AB4B */  jal       heap_free
-/* 969554 80240394 8E040000 */   lw       $a0, ($s0)
-/* 969558 80240398 AE000000 */  sw        $zero, ($s0)
-.L8024039C:
-/* 96955C 8024039C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 969560 802403A0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 969564 802403A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 969568 802403A8 24020002 */  addiu     $v0, $zero, 2
-/* 96956C 802403AC 03E00008 */  jr        $ra
-/* 969570 802403B0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s
deleted file mode 100644
index 83f20a9d15..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s
+++ /dev/null
@@ -1,149 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024043C_9695FC
-/* 9695FC 8024043C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 969600 80240440 AFB10024 */  sw        $s1, 0x24($sp)
-/* 969604 80240444 0080882D */  daddu     $s1, $a0, $zero
-/* 969608 80240448 3C05F840 */  lui       $a1, 0xf840
-/* 96960C 8024044C AFBF0044 */  sw        $ra, 0x44($sp)
-/* 969610 80240450 AFBE0040 */  sw        $fp, 0x40($sp)
-/* 969614 80240454 AFB7003C */  sw        $s7, 0x3c($sp)
-/* 969618 80240458 AFB60038 */  sw        $s6, 0x38($sp)
-/* 96961C 8024045C AFB50034 */  sw        $s5, 0x34($sp)
-/* 969620 80240460 AFB40030 */  sw        $s4, 0x30($sp)
-/* 969624 80240464 AFB3002C */  sw        $s3, 0x2c($sp)
-/* 969628 80240468 AFB20028 */  sw        $s2, 0x28($sp)
-/* 96962C 8024046C AFB00020 */  sw        $s0, 0x20($sp)
-/* 969630 80240470 8E3E0148 */  lw        $fp, 0x148($s1)
-/* 969634 80240474 0C0B1EAF */  jal       get_variable
-/* 969638 80240478 34A56268 */   ori      $a1, $a1, 0x6268
-/* 96963C 8024047C 0040802D */  daddu     $s0, $v0, $zero
-/* 969640 80240480 0220202D */  daddu     $a0, $s1, $zero
-/* 969644 80240484 3C05F840 */  lui       $a1, 0xf840
-/* 969648 80240488 0C0B1EAF */  jal       get_variable
-/* 96964C 8024048C 34A56269 */   ori      $a1, $a1, 0x6269
-/* 969650 80240490 0040B82D */  daddu     $s7, $v0, $zero
-/* 969654 80240494 0220202D */  daddu     $a0, $s1, $zero
-/* 969658 80240498 3C05F5DE */  lui       $a1, 0xf5de
-/* 96965C 8024049C 0C0B1EAF */  jal       get_variable
-/* 969660 802404A0 34A502DE */   ori      $a1, $a1, 0x2de
-/* 969664 802404A4 0040B02D */  daddu     $s6, $v0, $zero
-/* 969668 802404A8 0220202D */  daddu     $a0, $s1, $zero
-/* 96966C 802404AC 3C05F5DE */  lui       $a1, 0xf5de
-/* 969670 802404B0 0C0B1EAF */  jal       get_variable
-/* 969674 802404B4 34A502DF */   ori      $a1, $a1, 0x2df
-/* 969678 802404B8 0040A82D */  daddu     $s5, $v0, $zero
-/* 96967C 802404BC 93D3006D */  lbu       $s3, 0x6d($fp)
-/* 969680 802404C0 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 969684 802404C4 A7B30010 */  sh        $s3, 0x10($sp)
-/* 969688 802404C8 93D2006E */  lbu       $s2, 0x6e($fp)
-/* 96968C 802404CC 93C7006F */  lbu       $a3, 0x6f($fp)
-/* 969690 802404D0 3274FFFF */  andi      $s4, $s3, 0xffff
-/* 969694 802404D4 12820003 */  beq       $s4, $v0, .L802404E4
-/* 969698 802404D8 A7A7001E */   sh       $a3, 0x1e($sp)
-/* 96969C 802404DC 0000B82D */  daddu     $s7, $zero, $zero
-/* 9696A0 802404E0 02E0802D */  daddu     $s0, $s7, $zero
-.L802404E4:
-/* 9696A4 802404E4 3202FFFF */  andi      $v0, $s0, 0xffff
-/* 9696A8 802404E8 14400016 */  bnez      $v0, .L80240544
-/* 9696AC 802404EC 0220202D */   daddu    $a0, $s1, $zero
-/* 9696B0 802404F0 0C00A67F */  jal       rand_int
-/* 9696B4 802404F4 24040064 */   addiu    $a0, $zero, 0x64
-/* 9696B8 802404F8 2842001E */  slti      $v0, $v0, 0x1e
-/* 9696BC 802404FC 10400011 */  beqz      $v0, .L80240544
-/* 9696C0 80240500 0220202D */   daddu    $a0, $s1, $zero
-/* 9696C4 80240504 0C00A67F */  jal       rand_int
-/* 9696C8 80240508 2644FFFF */   addiu    $a0, $s2, -1
-/* 9696CC 8024050C 0040A82D */  daddu     $s5, $v0, $zero
-/* 9696D0 80240510 0260B02D */  daddu     $s6, $s3, $zero
-/* 9696D4 80240514 0220202D */  daddu     $a0, $s1, $zero
-/* 9696D8 80240518 3C05F5DE */  lui       $a1, 0xf5de
-/* 9696DC 8024051C 34A502DE */  ori       $a1, $a1, 0x2de
-/* 9696E0 80240520 0C0B2026 */  jal       set_variable
-/* 9696E4 80240524 0280302D */   daddu    $a2, $s4, $zero
-/* 9696E8 80240528 0220202D */  daddu     $a0, $s1, $zero
-/* 9696EC 8024052C 3C05F5DE */  lui       $a1, 0xf5de
-/* 9696F0 80240530 34A502DF */  ori       $a1, $a1, 0x2df
-/* 9696F4 80240534 0C0B2026 */  jal       set_variable
-/* 9696F8 80240538 32A6FFFF */   andi     $a2, $s5, 0xffff
-/* 9696FC 8024053C 24100001 */  addiu     $s0, $zero, 1
-/* 969700 80240540 0220202D */  daddu     $a0, $s1, $zero
-.L80240544:
-/* 969704 80240544 3C05F840 */  lui       $a1, 0xf840
-/* 969708 80240548 34A56268 */  ori       $a1, $a1, 0x6268
-/* 96970C 8024054C 0C0B2026 */  jal       set_variable
-/* 969710 80240550 3206FFFF */   andi     $a2, $s0, 0xffff
-/* 969714 80240554 0220202D */  daddu     $a0, $s1, $zero
-/* 969718 80240558 3C05F840 */  lui       $a1, 0xf840
-/* 96971C 8024055C 34A56269 */  ori       $a1, $a1, 0x6269
-/* 969720 80240560 0C0B2026 */  jal       set_variable
-/* 969724 80240564 32E6FFFF */   andi     $a2, $s7, 0xffff
-/* 969728 80240568 0000202D */  daddu     $a0, $zero, $zero
-/* 96972C 8024056C 3C05F5DE */  lui       $a1, 0xf5de
-/* 969730 80240570 0C0B1EAF */  jal       get_variable
-/* 969734 80240574 34A502E0 */   ori      $a1, $a1, 0x2e0
-/* 969738 80240578 0000202D */  daddu     $a0, $zero, $zero
-/* 96973C 8024057C 3C05F5DE */  lui       $a1, 0xf5de
-/* 969740 80240580 34A50180 */  ori       $a1, $a1, 0x180
-/* 969744 80240584 0C0B1EAF */  jal       get_variable
-/* 969748 80240588 0040802D */   daddu    $s0, $v0, $zero
-/* 96974C 8024058C 0040282D */  daddu     $a1, $v0, $zero
-/* 969750 80240590 0000182D */  daddu     $v1, $zero, $zero
-/* 969754 80240594 3C068024 */  lui       $a2, %hi(D_80244E84_96E044)
-/* 969758 80240598 24C64E84 */  addiu     $a2, $a2, %lo(D_80244E84_96E044)
-/* 96975C 8024059C 00C0202D */  daddu     $a0, $a2, $zero
-.L802405A0:
-/* 969760 802405A0 8C820000 */  lw        $v0, ($a0)
-/* 969764 802405A4 00A2102A */  slt       $v0, $a1, $v0
-/* 969768 802405A8 14400006 */  bnez      $v0, .L802405C4
-/* 96976C 802405AC 000310C0 */   sll      $v0, $v1, 3
-/* 969770 802405B0 24630001 */  addiu     $v1, $v1, 1
-/* 969774 802405B4 28620008 */  slti      $v0, $v1, 8
-/* 969778 802405B8 1440FFF9 */  bnez      $v0, .L802405A0
-/* 96977C 802405BC 24840008 */   addiu    $a0, $a0, 8
-/* 969780 802405C0 000310C0 */  sll       $v0, $v1, 3
-.L802405C4:
-/* 969784 802405C4 00461021 */  addu      $v0, $v0, $a2
-/* 969788 802405C8 8C420004 */  lw        $v0, 4($v0)
-/* 96978C 802405CC 97A30010 */  lhu       $v1, 0x10($sp)
-/* 969790 802405D0 0202202A */  slt       $a0, $s0, $v0
-/* 969794 802405D4 32C2FFFF */  andi      $v0, $s6, 0xffff
-/* 969798 802405D8 14620008 */  bne       $v1, $v0, .L802405FC
-/* 96979C 802405DC 32A2FFFF */   andi     $v0, $s5, 0xffff
-/* 9697A0 802405E0 97A7001E */  lhu       $a3, 0x1e($sp)
-/* 9697A4 802405E4 14E20005 */  bne       $a3, $v0, .L802405FC
-/* 9697A8 802405E8 32E2FFFF */   andi     $v0, $s7, 0xffff
-/* 9697AC 802405EC 14400003 */  bnez      $v0, .L802405FC
-/* 9697B0 802405F0 00000000 */   nop
-/* 9697B4 802405F4 14800008 */  bnez      $a0, .L80240618
-/* 9697B8 802405F8 24020001 */   addiu    $v0, $zero, 1
-.L802405FC:
-/* 9697BC 802405FC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 9697C0 80240600 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 9697C4 80240604 80420075 */  lb        $v0, 0x75($v0)
-/* 9697C8 80240608 10400005 */  beqz      $v0, .L80240620
-/* 9697CC 8024060C 00000000 */   nop
-/* 9697D0 80240610 10800003 */  beqz      $a0, .L80240620
-/* 9697D4 80240614 24020001 */   addiu    $v0, $zero, 1
-.L80240618:
-/* 9697D8 80240618 0809018B */  j         .L8024062C
-/* 9697DC 8024061C AE220084 */   sw       $v0, 0x84($s1)
-.L80240620:
-/* 9697E0 80240620 0C00F9EB */  jal       kill_enemy
-/* 9697E4 80240624 03C0202D */   daddu    $a0, $fp, $zero
-/* 9697E8 80240628 AE200084 */  sw        $zero, 0x84($s1)
-.L8024062C:
-/* 9697EC 8024062C 8FBF0044 */  lw        $ra, 0x44($sp)
-/* 9697F0 80240630 8FBE0040 */  lw        $fp, 0x40($sp)
-/* 9697F4 80240634 8FB7003C */  lw        $s7, 0x3c($sp)
-/* 9697F8 80240638 8FB60038 */  lw        $s6, 0x38($sp)
-/* 9697FC 8024063C 8FB50034 */  lw        $s5, 0x34($sp)
-/* 969800 80240640 8FB40030 */  lw        $s4, 0x30($sp)
-/* 969804 80240644 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 969808 80240648 8FB20028 */  lw        $s2, 0x28($sp)
-/* 96980C 8024064C 8FB10024 */  lw        $s1, 0x24($sp)
-/* 969810 80240650 8FB00020 */  lw        $s0, 0x20($sp)
-/* 969814 80240654 24020002 */  addiu     $v0, $zero, 2
-/* 969818 80240658 03E00008 */  jr        $ra
-/* 96981C 8024065C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s
deleted file mode 100644
index a853930b5a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240660_969820
-/* 969820 80240660 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 969824 80240664 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 969828 80240668 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96982C 8024066C 0C00EABB */  jal       get_npc_unsafe
-/* 969830 80240670 8C84014C */   lw       $a0, 0x14c($a0)
-/* 969834 80240674 24040008 */  addiu     $a0, $zero, 8
-/* 969838 80240678 0040802D */  daddu     $s0, $v0, $zero
-/* 96983C 8024067C 3C028024 */  lui       $v0, %hi(func_802406CC_96988C)
-/* 969840 80240680 244206CC */  addiu     $v0, $v0, %lo(func_802406CC_96988C)
-/* 969844 80240684 0C00AB39 */  jal       heap_malloc
-/* 969848 80240688 AE020008 */   sw       $v0, 8($s0)
-/* 96984C 8024068C 0040182D */  daddu     $v1, $v0, $zero
-/* 969850 80240690 AE030020 */  sw        $v1, 0x20($s0)
-/* 969854 80240694 AC600000 */  sw        $zero, ($v1)
-/* 969858 80240698 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 96985C 8024069C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 969860 802406A0 24020001 */  addiu     $v0, $zero, 1
-/* 969864 802406A4 03E00008 */  jr        $ra
-/* 969868 802406A8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s
deleted file mode 100644
index 982fae78b3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406CC_96988C
-/* 96988C 802406CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 969890 802406D0 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 969894 802406D4 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 969898 802406D8 3C05800B */  lui       $a1, %hi(gCameras)
-/* 96989C 802406DC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 9698A0 802406E0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9698A4 802406E4 00031080 */  sll       $v0, $v1, 2
-/* 9698A8 802406E8 00431021 */  addu      $v0, $v0, $v1
-/* 9698AC 802406EC 00021080 */  sll       $v0, $v0, 2
-/* 9698B0 802406F0 00431023 */  subu      $v0, $v0, $v1
-/* 9698B4 802406F4 000218C0 */  sll       $v1, $v0, 3
-/* 9698B8 802406F8 00431021 */  addu      $v0, $v0, $v1
-/* 9698BC 802406FC 8C830020 */  lw        $v1, 0x20($a0)
-/* 9698C0 80240700 000210C0 */  sll       $v0, $v0, 3
-/* 9698C4 80240704 8C630000 */  lw        $v1, ($v1)
-/* 9698C8 80240708 30630001 */  andi      $v1, $v1, 1
-/* 9698CC 8024070C 10600004 */  beqz      $v1, .L80240720
-/* 9698D0 80240710 00451021 */   addu     $v0, $v0, $a1
-/* 9698D4 80240714 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 9698D8 80240718 0C00A6C9 */  jal       clamp_angle
-/* 9698DC 8024071C 46006307 */   neg.s    $f12, $f12
-.L80240720:
-/* 9698E0 80240720 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9698E4 80240724 03E00008 */  jr        $ra
-/* 9698E8 80240728 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s
deleted file mode 100644
index 0e02e8626c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240878_969A38
-/* 969A38 80240878 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 969A3C 8024087C AFB00010 */  sw        $s0, 0x10($sp)
-/* 969A40 80240880 0080802D */  daddu     $s0, $a0, $zero
-/* 969A44 80240884 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 969A48 80240888 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 969A4C 8024088C AFB20018 */  sw        $s2, 0x18($sp)
-/* 969A50 80240890 10A00009 */  beqz      $a1, .L802408B8
-/* 969A54 80240894 AFB10014 */   sw       $s1, 0x14($sp)
-/* 969A58 80240898 0000202D */  daddu     $a0, $zero, $zero
-/* 969A5C 8024089C 0080282D */  daddu     $a1, $a0, $zero
-/* 969A60 802408A0 0080302D */  daddu     $a2, $a0, $zero
-/* 969A64 802408A4 0C046F97 */  jal       set_background_color_blend
-/* 969A68 802408A8 240700FF */   addiu    $a3, $zero, 0xff
-/* 969A6C 802408AC 240200FF */  addiu     $v0, $zero, 0xff
-/* 969A70 802408B0 AE020070 */  sw        $v0, 0x70($s0)
-/* 969A74 802408B4 AE000074 */  sw        $zero, 0x74($s0)
-.L802408B8:
-/* 969A78 802408B8 8E020070 */  lw        $v0, 0x70($s0)
-/* 969A7C 802408BC 2442FFF8 */  addiu     $v0, $v0, -8
-/* 969A80 802408C0 04410002 */  bgez      $v0, .L802408CC
-/* 969A84 802408C4 AE020070 */   sw       $v0, 0x70($s0)
-/* 969A88 802408C8 AE000070 */  sw        $zero, 0x70($s0)
-.L802408CC:
-/* 969A8C 802408CC 0000202D */  daddu     $a0, $zero, $zero
-/* 969A90 802408D0 0080282D */  daddu     $a1, $a0, $zero
-/* 969A94 802408D4 92070073 */  lbu       $a3, 0x73($s0)
-/* 969A98 802408D8 0C046F97 */  jal       set_background_color_blend
-/* 969A9C 802408DC 0080302D */   daddu    $a2, $a0, $zero
-/* 969AA0 802408E0 8E020070 */  lw        $v0, 0x70($s0)
-/* 969AA4 802408E4 14400006 */  bnez      $v0, .L80240900
-/* 969AA8 802408E8 00000000 */   nop
-/* 969AAC 802408EC 8E020074 */  lw        $v0, 0x74($s0)
-/* 969AB0 802408F0 14400003 */  bnez      $v0, .L80240900
-/* 969AB4 802408F4 24020001 */   addiu    $v0, $zero, 1
-/* 969AB8 802408F8 08090273 */  j         .L802409CC
-/* 969ABC 802408FC AE020074 */   sw       $v0, 0x74($s0)
-.L80240900:
-/* 969AC0 80240900 8E030074 */  lw        $v1, 0x74($s0)
-/* 969AC4 80240904 24020001 */  addiu     $v0, $zero, 1
-/* 969AC8 80240908 14620031 */  bne       $v1, $v0, .L802409D0
-/* 969ACC 8024090C 0000102D */   daddu    $v0, $zero, $zero
-/* 969AD0 80240910 0C04760B */  jal       func_8011D82C
-/* 969AD4 80240914 0000202D */   daddu    $a0, $zero, $zero
-/* 969AD8 80240918 0000802D */  daddu     $s0, $zero, $zero
-/* 969ADC 8024091C 2413FFFC */  addiu     $s3, $zero, -4
-/* 969AE0 80240920 2412000A */  addiu     $s2, $zero, 0xa
-/* 969AE4 80240924 3C11FF7F */  lui       $s1, 0xff7f
-/* 969AE8 80240928 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 969AEC 8024092C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 969AF0 80240930 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 969AF4 80240934 A0400000 */  sb        $zero, ($v0)
-.L80240938:
-/* 969AF8 80240938 0C00E2B7 */  jal       get_npc_by_index
-/* 969AFC 8024093C 0200202D */   daddu    $a0, $s0, $zero
-/* 969B00 80240940 0040202D */  daddu     $a0, $v0, $zero
-/* 969B04 80240944 5080000B */  beql      $a0, $zero, .L80240974
-/* 969B08 80240948 26100001 */   addiu    $s0, $s0, 1
-/* 969B0C 8024094C 8C820000 */  lw        $v0, ($a0)
-/* 969B10 80240950 50400008 */  beql      $v0, $zero, .L80240974
-/* 969B14 80240954 26100001 */   addiu    $s0, $s0, 1
-/* 969B18 80240958 808300A4 */  lb        $v1, 0xa4($a0)
-/* 969B1C 8024095C 10730005 */  beq       $v1, $s3, .L80240974
-/* 969B20 80240960 26100001 */   addiu    $s0, $s0, 1
-/* 969B24 80240964 10720003 */  beq       $v1, $s2, .L80240974
-/* 969B28 80240968 00000000 */   nop
-/* 969B2C 8024096C 00511024 */  and       $v0, $v0, $s1
-/* 969B30 80240970 AC820000 */  sw        $v0, ($a0)
-.L80240974:
-/* 969B34 80240974 2A020040 */  slti      $v0, $s0, 0x40
-/* 969B38 80240978 1440FFEF */  bnez      $v0, .L80240938
-/* 969B3C 8024097C 00000000 */   nop
-/* 969B40 80240980 0000802D */  daddu     $s0, $zero, $zero
-/* 969B44 80240984 3C11F7FF */  lui       $s1, 0xf7ff
-/* 969B48 80240988 3631FFFF */  ori       $s1, $s1, 0xffff
-.L8024098C:
-/* 969B4C 8024098C 0C04C3D6 */  jal       get_item_entity
-/* 969B50 80240990 0200202D */   daddu    $a0, $s0, $zero
-/* 969B54 80240994 0040182D */  daddu     $v1, $v0, $zero
-/* 969B58 80240998 10600007 */  beqz      $v1, .L802409B8
-/* 969B5C 8024099C 26100001 */   addiu    $s0, $s0, 1
-/* 969B60 802409A0 8C640000 */  lw        $a0, ($v1)
-/* 969B64 802409A4 30820010 */  andi      $v0, $a0, 0x10
-/* 969B68 802409A8 10400003 */  beqz      $v0, .L802409B8
-/* 969B6C 802409AC 00000000 */   nop
-/* 969B70 802409B0 00911024 */  and       $v0, $a0, $s1
-/* 969B74 802409B4 AC620000 */  sw        $v0, ($v1)
-.L802409B8:
-/* 969B78 802409B8 2A020100 */  slti      $v0, $s0, 0x100
-/* 969B7C 802409BC 1440FFF3 */  bnez      $v0, .L8024098C
-/* 969B80 802409C0 24020002 */   addiu    $v0, $zero, 2
-/* 969B84 802409C4 08090274 */  j         .L802409D0
-/* 969B88 802409C8 00000000 */   nop
-.L802409CC:
-/* 969B8C 802409CC 0000102D */  daddu     $v0, $zero, $zero
-.L802409D0:
-/* 969B90 802409D0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 969B94 802409D4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 969B98 802409D8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 969B9C 802409DC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 969BA0 802409E0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 969BA4 802409E4 03E00008 */  jr        $ra
-/* 969BA8 802409E8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s
deleted file mode 100644
index d8503788c9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409EC_969BAC
-/* 969BAC 802409EC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 969BB0 802409F0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 969BB4 802409F4 3C108011 */  lui       $s0, %hi(gPlayerData)
-/* 969BB8 802409F8 2610F290 */  addiu     $s0, $s0, %lo(gPlayerData)
-/* 969BBC 802409FC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 969BC0 80240A00 AFB10014 */  sw        $s1, 0x14($sp)
-/* 969BC4 80240A04 960302C0 */  lhu       $v1, 0x2c0($s0)
-/* 969BC8 80240A08 2C6203E7 */  sltiu     $v0, $v1, 0x3e7
-/* 969BCC 80240A0C 10400003 */  beqz      $v0, .L80240A1C
-/* 969BD0 80240A10 0080882D */   daddu    $s1, $a0, $zero
-/* 969BD4 80240A14 24620001 */  addiu     $v0, $v1, 1
-/* 969BD8 80240A18 A60202C0 */  sh        $v0, 0x2c0($s0)
-.L80240A1C:
-/* 969BDC 80240A1C 3C05F5DE */  lui       $a1, 0xf5de
-/* 969BE0 80240A20 34A502E0 */  ori       $a1, $a1, 0x2e0
-/* 969BE4 80240A24 0C0B1EAF */  jal       get_variable
-/* 969BE8 80240A28 0000202D */   daddu    $a0, $zero, $zero
-/* 969BEC 80240A2C 3C038024 */  lui       $v1, %hi(D_80244E44_96E004)
-/* 969BF0 80240A30 00621821 */  addu      $v1, $v1, $v0
-/* 969BF4 80240A34 90634E44 */  lbu       $v1, %lo(D_80244E44_96E004)($v1)
-/* 969BF8 80240A38 8E220084 */  lw        $v0, 0x84($s1)
-/* 969BFC 80240A3C 54430006 */  bnel      $v0, $v1, .L80240A58
-/* 969C00 80240A40 AE200084 */   sw       $zero, 0x84($s1)
-/* 969C04 80240A44 24020001 */  addiu     $v0, $zero, 1
-/* 969C08 80240A48 AE220084 */  sw        $v0, 0x84($s1)
-/* 969C0C 80240A4C 960202C2 */  lhu       $v0, 0x2c2($s0)
-/* 969C10 80240A50 24420001 */  addiu     $v0, $v0, 1
-/* 969C14 80240A54 A60202C2 */  sh        $v0, 0x2c2($s0)
-.L80240A58:
-/* 969C18 80240A58 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 969C1C 80240A5C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 969C20 80240A60 8FB00010 */  lw        $s0, 0x10($sp)
-/* 969C24 80240A64 24020002 */  addiu     $v0, $zero, 2
-/* 969C28 80240A68 03E00008 */  jr        $ra
-/* 969C2C 80240A6C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s
deleted file mode 100644
index 4914e75846..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A70_969C30
-/* 969C30 80240A70 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 969C34 80240A74 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 969C38 80240A78 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 969C3C 80240A7C AFB00018 */  sw        $s0, 0x18($sp)
-/* 969C40 80240A80 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* 969C44 80240A84 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 969C48 80240A88 10A00060 */  beqz      $a1, .L80240C0C
-/* 969C4C 80240A8C 0080882D */   daddu    $s1, $a0, $zero
-/* 969C50 80240A90 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969C54 80240A94 0C0B1EAF */  jal       get_variable
-/* 969C58 80240A98 34A5D481 */   ori      $a1, $a1, 0xd481
-/* 969C5C 80240A9C 0220202D */  daddu     $a0, $s1, $zero
-/* 969C60 80240AA0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969C64 80240AA4 4482B000 */  mtc1      $v0, $f22
-/* 969C68 80240AA8 00000000 */  nop
-/* 969C6C 80240AAC 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 969C70 80240AB0 0C0B1EAF */  jal       get_variable
-/* 969C74 80240AB4 34A5D482 */   ori      $a1, $a1, 0xd482
-/* 969C78 80240AB8 0220202D */  daddu     $a0, $s1, $zero
-/* 969C7C 80240ABC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969C80 80240AC0 4482A000 */  mtc1      $v0, $f20
-/* 969C84 80240AC4 00000000 */  nop
-/* 969C88 80240AC8 4680A520 */  cvt.s.w   $f20, $f20
-/* 969C8C 80240ACC 0C0B1EAF */  jal       get_variable
-/* 969C90 80240AD0 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 969C94 80240AD4 44821000 */  mtc1      $v0, $f2
-/* 969C98 80240AD8 00000000 */  nop
-/* 969C9C 80240ADC 468010A0 */  cvt.s.w   $f2, $f2
-/* 969CA0 80240AE0 4405B000 */  mfc1      $a1, $f22
-/* 969CA4 80240AE4 4406A000 */  mfc1      $a2, $f20
-/* 969CA8 80240AE8 44071000 */  mfc1      $a3, $f2
-/* 969CAC 80240AEC 0C01C574 */  jal       func_800715D0
-/* 969CB0 80240AF0 0000202D */   daddu    $a0, $zero, $zero
-/* 969CB4 80240AF4 0220202D */  daddu     $a0, $s1, $zero
-/* 969CB8 80240AF8 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969CBC 80240AFC 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 969CC0 80240B00 3C108025 */  lui       $s0, %hi(D_8024EFC0)
-/* 969CC4 80240B04 2610EFC0 */  addiu     $s0, $s0, %lo(D_8024EFC0)
-/* 969CC8 80240B08 0C0B1EAF */  jal       get_variable
-/* 969CCC 80240B0C AE020000 */   sw       $v0, ($s0)
-/* 969CD0 80240B10 0220202D */  daddu     $a0, $s1, $zero
-/* 969CD4 80240B14 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969CD8 80240B18 4482B000 */  mtc1      $v0, $f22
-/* 969CDC 80240B1C 00000000 */  nop
-/* 969CE0 80240B20 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 969CE4 80240B24 0C0B1EAF */  jal       get_variable
-/* 969CE8 80240B28 34A5D482 */   ori      $a1, $a1, 0xd482
-/* 969CEC 80240B2C 0220202D */  daddu     $a0, $s1, $zero
-/* 969CF0 80240B30 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969CF4 80240B34 4482A000 */  mtc1      $v0, $f20
-/* 969CF8 80240B38 00000000 */  nop
-/* 969CFC 80240B3C 4680A520 */  cvt.s.w   $f20, $f20
-/* 969D00 80240B40 0C0B1EAF */  jal       get_variable
-/* 969D04 80240B44 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 969D08 80240B48 44821000 */  mtc1      $v0, $f2
-/* 969D0C 80240B4C 00000000 */  nop
-/* 969D10 80240B50 468010A0 */  cvt.s.w   $f2, $f2
-/* 969D14 80240B54 4405B000 */  mfc1      $a1, $f22
-/* 969D18 80240B58 4406A000 */  mfc1      $a2, $f20
-/* 969D1C 80240B5C 44071000 */  mfc1      $a3, $f2
-/* 969D20 80240B60 0C01C604 */  jal       func_80071810
-/* 969D24 80240B64 0000202D */   daddu    $a0, $zero, $zero
-/* 969D28 80240B68 0220202D */  daddu     $a0, $s1, $zero
-/* 969D2C 80240B6C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969D30 80240B70 3C018025 */  lui       $at, %hi(D_8024EFC4)
-/* 969D34 80240B74 AC22EFC4 */  sw        $v0, %lo(D_8024EFC4)($at)
-/* 969D38 80240B78 0C0B1EAF */  jal       get_variable
-/* 969D3C 80240B7C 34A5D481 */   ori      $a1, $a1, 0xd481
-/* 969D40 80240B80 0220202D */  daddu     $a0, $s1, $zero
-/* 969D44 80240B84 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969D48 80240B88 4482B000 */  mtc1      $v0, $f22
-/* 969D4C 80240B8C 00000000 */  nop
-/* 969D50 80240B90 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 969D54 80240B94 0C0B1EAF */  jal       get_variable
-/* 969D58 80240B98 34A5D482 */   ori      $a1, $a1, 0xd482
-/* 969D5C 80240B9C 0220202D */  daddu     $a0, $s1, $zero
-/* 969D60 80240BA0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969D64 80240BA4 4482A000 */  mtc1      $v0, $f20
-/* 969D68 80240BA8 00000000 */  nop
-/* 969D6C 80240BAC 4680A520 */  cvt.s.w   $f20, $f20
-/* 969D70 80240BB0 0C0B1EAF */  jal       get_variable
-/* 969D74 80240BB4 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 969D78 80240BB8 44821000 */  mtc1      $v0, $f2
-/* 969D7C 80240BBC 00000000 */  nop
-/* 969D80 80240BC0 468010A0 */  cvt.s.w   $f2, $f2
-/* 969D84 80240BC4 4405B000 */  mfc1      $a1, $f22
-/* 969D88 80240BC8 4406A000 */  mfc1      $a2, $f20
-/* 969D8C 80240BCC 3C013F80 */  lui       $at, 0x3f80
-/* 969D90 80240BD0 44810000 */  mtc1      $at, $f0
-/* 969D94 80240BD4 44071000 */  mfc1      $a3, $f2
-/* 969D98 80240BD8 0000202D */  daddu     $a0, $zero, $zero
-/* 969D9C 80240BDC AFA00014 */  sw        $zero, 0x14($sp)
-/* 969DA0 80240BE0 0C01CA24 */  jal       func_80072890
-/* 969DA4 80240BE4 E7A00010 */   swc1     $f0, 0x10($sp)
-/* 969DA8 80240BE8 8E030000 */  lw        $v1, ($s0)
-/* 969DAC 80240BEC 8C64000C */  lw        $a0, 0xc($v1)
-/* 969DB0 80240BF0 3C018025 */  lui       $at, %hi(D_8024EFC8)
-/* 969DB4 80240BF4 AC22EFC8 */  sw        $v0, %lo(D_8024EFC8)($at)
-/* 969DB8 80240BF8 AC800018 */  sw        $zero, 0x18($a0)
-/* 969DBC 80240BFC AC800020 */  sw        $zero, 0x20($a0)
-/* 969DC0 80240C00 AC800024 */  sw        $zero, 0x24($a0)
-/* 969DC4 80240C04 AC800028 */  sw        $zero, 0x28($a0)
-/* 969DC8 80240C08 AC80001C */  sw        $zero, 0x1c($a0)
-.L80240C0C:
-/* 969DCC 80240C0C 3C028025 */  lui       $v0, %hi(D_8024EFC0)
-/* 969DD0 80240C10 8C42EFC0 */  lw        $v0, %lo(D_8024EFC0)($v0)
-/* 969DD4 80240C14 8C44000C */  lw        $a0, 0xc($v0)
-/* 969DD8 80240C18 8C820020 */  lw        $v0, 0x20($a0)
-/* 969DDC 80240C1C 8C830028 */  lw        $v1, 0x28($a0)
-/* 969DE0 80240C20 2442000A */  addiu     $v0, $v0, 0xa
-/* 969DE4 80240C24 AC820020 */  sw        $v0, 0x20($a0)
-/* 969DE8 80240C28 8C820024 */  lw        $v0, 0x24($a0)
-/* 969DEC 80240C2C 2463000A */  addiu     $v1, $v1, 0xa
-/* 969DF0 80240C30 AC830028 */  sw        $v1, 0x28($a0)
-/* 969DF4 80240C34 8C830018 */  lw        $v1, 0x18($a0)
-/* 969DF8 80240C38 2442000A */  addiu     $v0, $v0, 0xa
-/* 969DFC 80240C3C AC820024 */  sw        $v0, 0x24($a0)
-/* 969E00 80240C40 8C82001C */  lw        $v0, 0x1c($a0)
-/* 969E04 80240C44 2463000A */  addiu     $v1, $v1, 0xa
-/* 969E08 80240C48 AC830018 */  sw        $v1, 0x18($a0)
-/* 969E0C 80240C4C 286300FF */  slti      $v1, $v1, 0xff
-/* 969E10 80240C50 2442000A */  addiu     $v0, $v0, 0xa
-/* 969E14 80240C54 AC82001C */  sw        $v0, 0x1c($a0)
-/* 969E18 80240C58 14600004 */  bnez      $v1, .L80240C6C
-/* 969E1C 80240C5C 0000102D */   daddu    $v0, $zero, $zero
-/* 969E20 80240C60 240200FF */  addiu     $v0, $zero, 0xff
-/* 969E24 80240C64 AC820018 */  sw        $v0, 0x18($a0)
-/* 969E28 80240C68 24020002 */  addiu     $v0, $zero, 2
-.L80240C6C:
-/* 969E2C 80240C6C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 969E30 80240C70 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 969E34 80240C74 8FB00018 */  lw        $s0, 0x18($sp)
-/* 969E38 80240C78 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* 969E3C 80240C7C D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 969E40 80240C80 03E00008 */  jr        $ra
-/* 969E44 80240C84 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s
deleted file mode 100644
index 185931121f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C88_969E48
-/* 969E48 80240C88 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 969E4C 80240C8C 10A0000B */  beqz      $a1, .L80240CBC
-/* 969E50 80240C90 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 969E54 80240C94 3C038025 */  lui       $v1, %hi(D_8024EFC4)
-/* 969E58 80240C98 8C63EFC4 */  lw        $v1, %lo(D_8024EFC4)($v1)
-/* 969E5C 80240C9C 8C620000 */  lw        $v0, ($v1)
-/* 969E60 80240CA0 3C048025 */  lui       $a0, %hi(D_8024EFC8)
-/* 969E64 80240CA4 8C84EFC8 */  lw        $a0, %lo(D_8024EFC8)($a0)
-/* 969E68 80240CA8 34420010 */  ori       $v0, $v0, 0x10
-/* 969E6C 80240CAC AC620000 */  sw        $v0, ($v1)
-/* 969E70 80240CB0 8C820000 */  lw        $v0, ($a0)
-/* 969E74 80240CB4 34420010 */  ori       $v0, $v0, 0x10
-/* 969E78 80240CB8 AC820000 */  sw        $v0, ($a0)
-.L80240CBC:
-/* 969E7C 80240CBC 3C048025 */  lui       $a0, %hi(D_8024EFC0)
-/* 969E80 80240CC0 8C84EFC0 */  lw        $a0, %lo(D_8024EFC0)($a0)
-/* 969E84 80240CC4 8C85000C */  lw        $a1, 0xc($a0)
-/* 969E88 80240CC8 8CA20018 */  lw        $v0, 0x18($a1)
-/* 969E8C 80240CCC 8CA30020 */  lw        $v1, 0x20($a1)
-/* 969E90 80240CD0 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* 969E94 80240CD4 ACA20018 */  sw        $v0, 0x18($a1)
-/* 969E98 80240CD8 8CA20024 */  lw        $v0, 0x24($a1)
-/* 969E9C 80240CDC 2463FFF6 */  addiu     $v1, $v1, -0xa
-/* 969EA0 80240CE0 ACA30020 */  sw        $v1, 0x20($a1)
-/* 969EA4 80240CE4 8CA30028 */  lw        $v1, 0x28($a1)
-/* 969EA8 80240CE8 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* 969EAC 80240CEC ACA20024 */  sw        $v0, 0x24($a1)
-/* 969EB0 80240CF0 8CA2001C */  lw        $v0, 0x1c($a1)
-/* 969EB4 80240CF4 2463FFF6 */  addiu     $v1, $v1, -0xa
-/* 969EB8 80240CF8 ACA30028 */  sw        $v1, 0x28($a1)
-/* 969EBC 80240CFC 8CA30018 */  lw        $v1, 0x18($a1)
-/* 969EC0 80240D00 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* 969EC4 80240D04 18600003 */  blez      $v1, .L80240D14
-/* 969EC8 80240D08 ACA2001C */   sw       $v0, 0x1c($a1)
-/* 969ECC 80240D0C 0809034C */  j         .L80240D30
-/* 969ED0 80240D10 0000102D */   daddu    $v0, $zero, $zero
-.L80240D14:
-/* 969ED4 80240D14 0C016914 */  jal       remove_effect
-/* 969ED8 80240D18 ACA00018 */   sw       $zero, 0x18($a1)
-/* 969EDC 80240D1C 3C048025 */  lui       $a0, %hi(gPauseMenuCursorPosY)
-/* 969EE0 80240D20 8C84EFA0 */  lw        $a0, %lo(gPauseMenuCursorPosY)($a0)
-/* 969EE4 80240D24 0C048D70 */  jal       free_dynamic_entity
-/* 969EE8 80240D28 00000000 */   nop
-/* 969EEC 80240D2C 24020002 */  addiu     $v0, $zero, 2
-.L80240D30:
-/* 969EF0 80240D30 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 969EF4 80240D34 03E00008 */  jr        $ra
-/* 969EF8 80240D38 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D3C_969EFC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D3C_969EFC.s
deleted file mode 100644
index 2faa6445ff..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D3C_969EFC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D3C_969EFC
-/* 969EFC 80240D3C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 969F00 80240D40 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 969F04 80240D44 8C82000C */  lw        $v0, 0xc($a0)
-/* 969F08 80240D48 0C0B1EAF */  jal       get_variable
-/* 969F0C 80240D4C 8C450000 */   lw       $a1, ($v0)
-/* 969F10 80240D50 3C038025 */  lui       $v1, %hi(D_8024EFC0)
-/* 969F14 80240D54 8C63EFC0 */  lw        $v1, %lo(D_8024EFC0)($v1)
-/* 969F18 80240D58 8C63000C */  lw        $v1, 0xc($v1)
-/* 969F1C 80240D5C AC620034 */  sw        $v0, 0x34($v1)
-/* 969F20 80240D60 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 969F24 80240D64 24020002 */  addiu     $v0, $zero, 2
-/* 969F28 80240D68 03E00008 */  jr        $ra
-/* 969F2C 80240D6C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D70_969F30.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D70_969F30.s
deleted file mode 100644
index b079b99e64..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D70_969F30.s
+++ /dev/null
@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D70_969F30
-/* 969F30 80240D70 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 969F34 80240D74 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 969F38 80240D78 8C82000C */  lw        $v0, 0xc($a0)
-/* 969F3C 80240D7C 0C0B1EAF */  jal       get_variable
-/* 969F40 80240D80 8C450000 */   lw       $a1, ($v0)
-/* 969F44 80240D84 0040202D */  daddu     $a0, $v0, $zero
-/* 969F48 80240D88 3C028025 */  lui       $v0, %hi(D_8024EFC0)
-/* 969F4C 80240D8C 8C42EFC0 */  lw        $v0, %lo(D_8024EFC0)($v0)
-/* 969F50 80240D90 24030001 */  addiu     $v1, $zero, 1
-/* 969F54 80240D94 8C45000C */  lw        $a1, 0xc($v0)
-/* 969F58 80240D98 1083000D */  beq       $a0, $v1, .L80240DD0
-/* 969F5C 80240D9C 28820002 */   slti     $v0, $a0, 2
-/* 969F60 80240DA0 10400005 */  beqz      $v0, .L80240DB8
-/* 969F64 80240DA4 24020002 */   addiu    $v0, $zero, 2
-/* 969F68 80240DA8 10800007 */  beqz      $a0, .L80240DC8
-/* 969F6C 80240DAC 240200C0 */   addiu    $v0, $zero, 0xc0
-/* 969F70 80240DB0 08090378 */  j         .L80240DE0
-/* 969F74 80240DB4 ACA00038 */   sw       $zero, 0x38($a1)
-.L80240DB8:
-/* 969F78 80240DB8 10820008 */  beq       $a0, $v0, .L80240DDC
-/* 969F7C 80240DBC 24020040 */   addiu    $v0, $zero, 0x40
-/* 969F80 80240DC0 08090378 */  j         .L80240DE0
-/* 969F84 80240DC4 ACA00038 */   sw       $zero, 0x38($a1)
-.L80240DC8:
-/* 969F88 80240DC8 08090378 */  j         .L80240DE0
-/* 969F8C 80240DCC ACA20038 */   sw       $v0, 0x38($a1)
-.L80240DD0:
-/* 969F90 80240DD0 24020080 */  addiu     $v0, $zero, 0x80
-/* 969F94 80240DD4 08090378 */  j         .L80240DE0
-/* 969F98 80240DD8 ACA20038 */   sw       $v0, 0x38($a1)
-.L80240DDC:
-/* 969F9C 80240DDC ACA20038 */  sw        $v0, 0x38($a1)
-.L80240DE0:
-/* 969FA0 80240DE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 969FA4 80240DE4 24020002 */  addiu     $v0, $zero, 2
-/* 969FA8 80240DE8 03E00008 */  jr        $ra
-/* 969FAC 80240DEC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240DF0_969FB0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240DF0_969FB0.s
deleted file mode 100644
index 847f5ed63e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240DF0_969FB0.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240DF0_969FB0
-/* 969FB0 80240DF0 3C028025 */  lui       $v0, %hi(D_8024EFC8)
-/* 969FB4 80240DF4 8C42EFC8 */  lw        $v0, %lo(D_8024EFC8)($v0)
-/* 969FB8 80240DF8 8C42000C */  lw        $v0, 0xc($v0)
-/* 969FBC 80240DFC AC40001C */  sw        $zero, 0x1c($v0)
-/* 969FC0 80240E00 03E00008 */  jr        $ra
-/* 969FC4 80240E04 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s
deleted file mode 100644
index fbbe5129d1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E08_969FC8
-/* 969FC8 80240E08 3C028025 */  lui       $v0, %hi(D_8024EFC8)
-/* 969FCC 80240E0C 8C42EFC8 */  lw        $v0, %lo(D_8024EFC8)($v0)
-/* 969FD0 80240E10 8C43000C */  lw        $v1, 0xc($v0)
-/* 969FD4 80240E14 24020001 */  addiu     $v0, $zero, 1
-/* 969FD8 80240E18 AC62001C */  sw        $v0, 0x1c($v1)
-/* 969FDC 80240E1C 03E00008 */  jr        $ra
-/* 969FE0 80240E20 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s
deleted file mode 100644
index 194fff4726..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E24_969FE4
-/* 969FE4 80240E24 3C028025 */  lui       $v0, %hi(D_8024EFC8)
-/* 969FE8 80240E28 8C42EFC8 */  lw        $v0, %lo(D_8024EFC8)($v0)
-/* 969FEC 80240E2C 8C43000C */  lw        $v1, 0xc($v0)
-/* 969FF0 80240E30 24020002 */  addiu     $v0, $zero, 2
-/* 969FF4 80240E34 03E00008 */  jr        $ra
-/* 969FF8 80240E38 AC62001C */   sw       $v0, 0x1c($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s
deleted file mode 100644
index a5386fc484..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412F8_96A4B8
-/* 96A4B8 802412F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96A4BC 802412FC 3C058025 */  lui       $a1, %hi(D_8024EFB8)
-/* 96A4C0 80241300 8CA5EFB8 */  lw        $a1, %lo(D_8024EFB8)($a1)
-/* 96A4C4 80241304 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96A4C8 80241308 0C0B1EAF */  jal       get_variable
-/* 96A4CC 8024130C 0000202D */   daddu    $a0, $zero, $zero
-/* 96A4D0 80241310 0040182D */  daddu     $v1, $v0, $zero
-/* 96A4D4 80241314 24020001 */  addiu     $v0, $zero, 1
-/* 96A4D8 80241318 14620006 */  bne       $v1, $v0, .L80241334
-/* 96A4DC 8024131C 24020002 */   addiu    $v0, $zero, 2
-/* 96A4E0 80241320 44800000 */  mtc1      $zero, $f0
-/* 96A4E4 80241324 00000000 */  nop
-/* 96A4E8 80241328 44050000 */  mfc1      $a1, $f0
-/* 96A4EC 8024132C 080904D3 */  j         .L8024134C
-/* 96A4F0 80241330 0000202D */   daddu    $a0, $zero, $zero
-.L80241334:
-/* 96A4F4 80241334 14620008 */  bne       $v1, $v0, .L80241358
-/* 96A4F8 80241338 24040001 */   addiu    $a0, $zero, 1
-/* 96A4FC 8024133C 44800000 */  mtc1      $zero, $f0
-/* 96A500 80241340 00000000 */  nop
-/* 96A504 80241344 44050000 */  mfc1      $a1, $f0
-/* 96A508 80241348 00000000 */  nop
-.L8024134C:
-/* 96A50C 8024134C 00A0302D */  daddu     $a2, $a1, $zero
-/* 96A510 80241350 0C01C5A4 */  jal       func_80071690
-/* 96A514 80241354 00A0382D */   daddu    $a3, $a1, $zero
-.L80241358:
-/* 96A518 80241358 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96A51C 8024135C 03E00008 */  jr        $ra
-/* 96A520 80241360 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s
deleted file mode 100644
index 58fe39f670..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241364_96A524
-/* 96A524 80241364 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96A528 80241368 3C058024 */  lui       $a1, %hi(func_802412F8_96A4B8)
-/* 96A52C 8024136C 24A512F8 */  addiu     $a1, $a1, %lo(func_802412F8_96A4B8)
-/* 96A530 80241370 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96A534 80241374 0C048C8F */  jal       create_dynamic_entity_frontUI
-/* 96A538 80241378 0000202D */   daddu    $a0, $zero, $zero
-/* 96A53C 8024137C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96A540 80241380 3C018025 */  lui       $at, %hi(gPauseMenuCursorPosY)
-/* 96A544 80241384 AC22EFA0 */  sw        $v0, %lo(gPauseMenuCursorPosY)($at)
-/* 96A548 80241388 24020002 */  addiu     $v0, $zero, 2
-/* 96A54C 8024138C 03E00008 */  jr        $ra
-/* 96A550 80241390 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s
deleted file mode 100644
index 1d819c5c79..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s
+++ /dev/null
@@ -1,90 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241394_96A554
-/* 96A554 80241394 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 96A558 80241398 AFB20018 */  sw        $s2, 0x18($sp)
-/* 96A55C 8024139C 0080902D */  daddu     $s2, $a0, $zero
-/* 96A560 802413A0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 96A564 802413A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A568 802413A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A56C 802413AC 8E50000C */  lw        $s0, 0xc($s2)
-/* 96A570 802413B0 8E050000 */  lw        $a1, ($s0)
-/* 96A574 802413B4 0C0B1EAF */  jal       get_variable
-/* 96A578 802413B8 26100004 */   addiu    $s0, $s0, 4
-/* 96A57C 802413BC 3C118011 */  lui       $s1, %hi(gPlayerData)
-/* 96A580 802413C0 2631F290 */  addiu     $s1, $s1, %lo(gPlayerData)
-/* 96A584 802413C4 3C058024 */  lui       $a1, %hi(D_802475E0_9707A0)
-/* 96A588 802413C8 00A22821 */  addu      $a1, $a1, $v0
-/* 96A58C 802413CC 90A575E0 */  lbu       $a1, %lo(D_802475E0_9707A0)($a1)
-/* 96A590 802413D0 8623000C */  lh        $v1, 0xc($s1)
-/* 96A594 802413D4 8E100000 */  lw        $s0, ($s0)
-/* 96A598 802413D8 3C068024 */  lui       $a2, %hi(D_802475DC_97079C)
-/* 96A59C 802413DC 00C23021 */  addu      $a2, $a2, $v0
-/* 96A5A0 802413E0 90C675DC */  lbu       $a2, %lo(D_802475DC_97079C)($a2)
-/* 96A5A4 802413E4 9624000C */  lhu       $a0, 0xc($s1)
-/* 96A5A8 802413E8 0065182A */  slt       $v1, $v1, $a1
-/* 96A5AC 802413EC 10600005 */  beqz      $v1, .L80241404
-/* 96A5B0 802413F0 30A200FF */   andi     $v0, $a1, 0xff
-/* 96A5B4 802413F4 0240202D */  daddu     $a0, $s2, $zero
-/* 96A5B8 802413F8 0200282D */  daddu     $a1, $s0, $zero
-/* 96A5BC 802413FC 08090527 */  j         .L8024149C
-/* 96A5C0 80241400 24060001 */   addiu    $a2, $zero, 1
-.L80241404:
-/* 96A5C4 80241404 00821023 */  subu      $v0, $a0, $v0
-/* 96A5C8 80241408 A622000C */  sh        $v0, 0xc($s1)
-/* 96A5CC 8024140C 8222028A */  lb        $v0, 0x28a($s1)
-/* 96A5D0 80241410 30C300FF */  andi      $v1, $a2, 0xff
-/* 96A5D4 80241414 0043102A */  slt       $v0, $v0, $v1
-/* 96A5D8 80241418 54400001 */  bnel      $v0, $zero, .L80241420
-/* 96A5DC 8024141C A226028A */   sb       $a2, 0x28a($s1)
-.L80241420:
-/* 96A5E0 80241420 0C00A67F */  jal       rand_int
-/* 96A5E4 80241424 24040002 */   addiu    $a0, $zero, 2
-/* 96A5E8 80241428 24420001 */  addiu     $v0, $v0, 1
-/* 96A5EC 8024142C A622028C */  sh        $v0, 0x28c($s1)
-/* 96A5F0 80241430 0C00A67F */  jal       rand_int
-/* 96A5F4 80241434 24040003 */   addiu    $a0, $zero, 3
-/* 96A5F8 80241438 0040182D */  daddu     $v1, $v0, $zero
-/* 96A5FC 8024143C 24040001 */  addiu     $a0, $zero, 1
-/* 96A600 80241440 1064000D */  beq       $v1, $a0, .L80241478
-/* 96A604 80241444 28620002 */   slti     $v0, $v1, 2
-/* 96A608 80241448 10400005 */  beqz      $v0, .L80241460
-/* 96A60C 8024144C 24020002 */   addiu    $v0, $zero, 2
-/* 96A610 80241450 5060000F */  beql      $v1, $zero, .L80241490
-/* 96A614 80241454 A2240289 */   sb       $a0, 0x289($s1)
-/* 96A618 80241458 08090525 */  j         .L80241494
-/* 96A61C 8024145C 0240202D */   daddu    $a0, $s2, $zero
-.L80241460:
-/* 96A620 80241460 10620007 */  beq       $v1, $v0, .L80241480
-/* 96A624 80241464 24020003 */   addiu    $v0, $zero, 3
-/* 96A628 80241468 10620007 */  beq       $v1, $v0, .L80241488
-/* 96A62C 8024146C 0240202D */   daddu    $a0, $s2, $zero
-/* 96A630 80241470 08090526 */  j         .L80241498
-/* 96A634 80241474 0200282D */   daddu    $a1, $s0, $zero
-.L80241478:
-/* 96A638 80241478 08090523 */  j         .L8024148C
-/* 96A63C 8024147C 24020002 */   addiu    $v0, $zero, 2
-.L80241480:
-/* 96A640 80241480 08090523 */  j         .L8024148C
-/* 96A644 80241484 24020003 */   addiu    $v0, $zero, 3
-.L80241488:
-/* 96A648 80241488 24020004 */  addiu     $v0, $zero, 4
-.L8024148C:
-/* 96A64C 8024148C A2220289 */  sb        $v0, 0x289($s1)
-.L80241490:
-/* 96A650 80241490 0240202D */  daddu     $a0, $s2, $zero
-.L80241494:
-/* 96A654 80241494 0200282D */  daddu     $a1, $s0, $zero
-.L80241498:
-/* 96A658 80241498 0000302D */  daddu     $a2, $zero, $zero
-.L8024149C:
-/* 96A65C 8024149C 0C0B2026 */  jal       set_variable
-/* 96A660 802414A0 00000000 */   nop
-/* 96A664 802414A4 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 96A668 802414A8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 96A66C 802414AC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A670 802414B0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A674 802414B4 24020002 */  addiu     $v0, $zero, 2
-/* 96A678 802414B8 03E00008 */  jr        $ra
-/* 96A67C 802414BC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s
deleted file mode 100644
index 996a19733e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s
+++ /dev/null
@@ -1,75 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414C0_96A680
-/* 96A680 802414C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 96A684 802414C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96A688 802414C8 0080882D */  daddu     $s1, $a0, $zero
-/* 96A68C 802414CC AFBF0024 */  sw        $ra, 0x24($sp)
-/* 96A690 802414D0 AFB40020 */  sw        $s4, 0x20($sp)
-/* 96A694 802414D4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 96A698 802414D8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 96A69C 802414DC 10A00023 */  beqz      $a1, .L8024156C
-/* 96A6A0 802414E0 AFB00010 */   sw       $s0, 0x10($sp)
-/* 96A6A4 802414E4 0C04760B */  jal       func_8011D82C
-/* 96A6A8 802414E8 24040001 */   addiu    $a0, $zero, 1
-/* 96A6AC 802414EC 0000202D */  daddu     $a0, $zero, $zero
-/* 96A6B0 802414F0 0080282D */  daddu     $a1, $a0, $zero
-/* 96A6B4 802414F4 0080302D */  daddu     $a2, $a0, $zero
-/* 96A6B8 802414F8 0080382D */  daddu     $a3, $a0, $zero
-/* 96A6BC 802414FC 0080802D */  daddu     $s0, $a0, $zero
-/* 96A6C0 80241500 2414FFFC */  addiu     $s4, $zero, -4
-/* 96A6C4 80241504 24130004 */  addiu     $s3, $zero, 4
-/* 96A6C8 80241508 3C120080 */  lui       $s2, 0x80
-/* 96A6CC 8024150C 3C038015 */  lui       $v1, %hi(D_801512F0)
-/* 96A6D0 80241510 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
-/* 96A6D4 80241514 24020001 */  addiu     $v0, $zero, 1
-/* 96A6D8 80241518 0C046F97 */  jal       set_background_color_blend
-/* 96A6DC 8024151C A0620000 */   sb       $v0, ($v1)
-.L80241520:
-/* 96A6E0 80241520 0C00E2B7 */  jal       get_npc_by_index
-/* 96A6E4 80241524 0200202D */   daddu    $a0, $s0, $zero
-/* 96A6E8 80241528 0040202D */  daddu     $a0, $v0, $zero
-/* 96A6EC 8024152C 5080000B */  beql      $a0, $zero, .L8024155C
-/* 96A6F0 80241530 26100001 */   addiu    $s0, $s0, 1
-/* 96A6F4 80241534 8C820000 */  lw        $v0, ($a0)
-/* 96A6F8 80241538 50400008 */  beql      $v0, $zero, .L8024155C
-/* 96A6FC 8024153C 26100001 */   addiu    $s0, $s0, 1
-/* 96A700 80241540 808300A4 */  lb        $v1, 0xa4($a0)
-/* 96A704 80241544 10740005 */  beq       $v1, $s4, .L8024155C
-/* 96A708 80241548 26100001 */   addiu    $s0, $s0, 1
-/* 96A70C 8024154C 10730003 */  beq       $v1, $s3, .L8024155C
-/* 96A710 80241550 00000000 */   nop
-/* 96A714 80241554 00521025 */  or        $v0, $v0, $s2
-/* 96A718 80241558 AC820000 */  sw        $v0, ($a0)
-.L8024155C:
-/* 96A71C 8024155C 2A020040 */  slti      $v0, $s0, 0x40
-/* 96A720 80241560 1440FFEF */  bnez      $v0, .L80241520
-/* 96A724 80241564 00000000 */   nop
-/* 96A728 80241568 AE200070 */  sw        $zero, 0x70($s1)
-.L8024156C:
-/* 96A72C 8024156C 8E220070 */  lw        $v0, 0x70($s1)
-/* 96A730 80241570 24420008 */  addiu     $v0, $v0, 8
-/* 96A734 80241574 AE220070 */  sw        $v0, 0x70($s1)
-/* 96A738 80241578 28420100 */  slti      $v0, $v0, 0x100
-/* 96A73C 8024157C 14400003 */  bnez      $v0, .L8024158C
-/* 96A740 80241580 0000202D */   daddu    $a0, $zero, $zero
-/* 96A744 80241584 240200FF */  addiu     $v0, $zero, 0xff
-/* 96A748 80241588 AE220070 */  sw        $v0, 0x70($s1)
-.L8024158C:
-/* 96A74C 8024158C 0080282D */  daddu     $a1, $a0, $zero
-/* 96A750 80241590 92270073 */  lbu       $a3, 0x73($s1)
-/* 96A754 80241594 0C046F97 */  jal       set_background_color_blend
-/* 96A758 80241598 0080302D */   daddu    $a2, $a0, $zero
-/* 96A75C 8024159C 8E220070 */  lw        $v0, 0x70($s1)
-/* 96A760 802415A0 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 96A764 802415A4 8FB40020 */  lw        $s4, 0x20($sp)
-/* 96A768 802415A8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 96A76C 802415AC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 96A770 802415B0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A774 802415B4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A778 802415B8 384200FF */  xori      $v0, $v0, 0xff
-/* 96A77C 802415BC 2C420001 */  sltiu     $v0, $v0, 1
-/* 96A780 802415C0 00021040 */  sll       $v0, $v0, 1
-/* 96A784 802415C4 03E00008 */  jr        $ra
-/* 96A788 802415C8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s
deleted file mode 100644
index 173cb85933..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s
+++ /dev/null
@@ -1,87 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415CC_96A78C
-/* 96A78C 802415CC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 96A790 802415D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96A794 802415D4 0080802D */  daddu     $s0, $a0, $zero
-/* 96A798 802415D8 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 96A79C 802415DC AFB3001C */  sw        $s3, 0x1c($sp)
-/* 96A7A0 802415E0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 96A7A4 802415E4 10A00009 */  beqz      $a1, .L8024160C
-/* 96A7A8 802415E8 AFB10014 */   sw       $s1, 0x14($sp)
-/* 96A7AC 802415EC 0000202D */  daddu     $a0, $zero, $zero
-/* 96A7B0 802415F0 0080282D */  daddu     $a1, $a0, $zero
-/* 96A7B4 802415F4 0080302D */  daddu     $a2, $a0, $zero
-/* 96A7B8 802415F8 0C046F97 */  jal       set_background_color_blend
-/* 96A7BC 802415FC 240700FF */   addiu    $a3, $zero, 0xff
-/* 96A7C0 80241600 240200FF */  addiu     $v0, $zero, 0xff
-/* 96A7C4 80241604 AE020070 */  sw        $v0, 0x70($s0)
-/* 96A7C8 80241608 AE000074 */  sw        $zero, 0x74($s0)
-.L8024160C:
-/* 96A7CC 8024160C 8E020070 */  lw        $v0, 0x70($s0)
-/* 96A7D0 80241610 2442FFF8 */  addiu     $v0, $v0, -8
-/* 96A7D4 80241614 04410002 */  bgez      $v0, .L80241620
-/* 96A7D8 80241618 AE020070 */   sw       $v0, 0x70($s0)
-/* 96A7DC 8024161C AE000070 */  sw        $zero, 0x70($s0)
-.L80241620:
-/* 96A7E0 80241620 0000202D */  daddu     $a0, $zero, $zero
-/* 96A7E4 80241624 0080282D */  daddu     $a1, $a0, $zero
-/* 96A7E8 80241628 92070073 */  lbu       $a3, 0x73($s0)
-/* 96A7EC 8024162C 0C046F97 */  jal       set_background_color_blend
-/* 96A7F0 80241630 0080302D */   daddu    $a2, $a0, $zero
-/* 96A7F4 80241634 8E020070 */  lw        $v0, 0x70($s0)
-/* 96A7F8 80241638 14400006 */  bnez      $v0, .L80241654
-/* 96A7FC 8024163C 00000000 */   nop
-/* 96A800 80241640 8E020074 */  lw        $v0, 0x74($s0)
-/* 96A804 80241644 14400003 */  bnez      $v0, .L80241654
-/* 96A808 80241648 24020001 */   addiu    $v0, $zero, 1
-/* 96A80C 8024164C 080905B7 */  j         .L802416DC
-/* 96A810 80241650 AE020074 */   sw       $v0, 0x74($s0)
-.L80241654:
-/* 96A814 80241654 8E030074 */  lw        $v1, 0x74($s0)
-/* 96A818 80241658 24020001 */  addiu     $v0, $zero, 1
-/* 96A81C 8024165C 14620020 */  bne       $v1, $v0, .L802416E0
-/* 96A820 80241660 0000102D */   daddu    $v0, $zero, $zero
-/* 96A824 80241664 0C04760B */  jal       func_8011D82C
-/* 96A828 80241668 0000202D */   daddu    $a0, $zero, $zero
-/* 96A82C 8024166C 0000802D */  daddu     $s0, $zero, $zero
-/* 96A830 80241670 2413FFFC */  addiu     $s3, $zero, -4
-/* 96A834 80241674 24120004 */  addiu     $s2, $zero, 4
-/* 96A838 80241678 3C11FF7F */  lui       $s1, 0xff7f
-/* 96A83C 8024167C 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 96A840 80241680 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 96A844 80241684 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 96A848 80241688 A0400000 */  sb        $zero, ($v0)
-.L8024168C:
-/* 96A84C 8024168C 0C00E2B7 */  jal       get_npc_by_index
-/* 96A850 80241690 0200202D */   daddu    $a0, $s0, $zero
-/* 96A854 80241694 0040202D */  daddu     $a0, $v0, $zero
-/* 96A858 80241698 5080000B */  beql      $a0, $zero, .L802416C8
-/* 96A85C 8024169C 26100001 */   addiu    $s0, $s0, 1
-/* 96A860 802416A0 8C820000 */  lw        $v0, ($a0)
-/* 96A864 802416A4 50400008 */  beql      $v0, $zero, .L802416C8
-/* 96A868 802416A8 26100001 */   addiu    $s0, $s0, 1
-/* 96A86C 802416AC 808300A4 */  lb        $v1, 0xa4($a0)
-/* 96A870 802416B0 10730005 */  beq       $v1, $s3, .L802416C8
-/* 96A874 802416B4 26100001 */   addiu    $s0, $s0, 1
-/* 96A878 802416B8 10720003 */  beq       $v1, $s2, .L802416C8
-/* 96A87C 802416BC 00000000 */   nop
-/* 96A880 802416C0 00511024 */  and       $v0, $v0, $s1
-/* 96A884 802416C4 AC820000 */  sw        $v0, ($a0)
-.L802416C8:
-/* 96A888 802416C8 2A020040 */  slti      $v0, $s0, 0x40
-/* 96A88C 802416CC 1440FFEF */  bnez      $v0, .L8024168C
-/* 96A890 802416D0 24020002 */   addiu    $v0, $zero, 2
-/* 96A894 802416D4 080905B8 */  j         .L802416E0
-/* 96A898 802416D8 00000000 */   nop
-.L802416DC:
-/* 96A89C 802416DC 0000102D */  daddu     $v0, $zero, $zero
-.L802416E0:
-/* 96A8A0 802416E0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 96A8A4 802416E4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 96A8A8 802416E8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 96A8AC 802416EC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96A8B0 802416F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96A8B4 802416F4 03E00008 */  jr        $ra
-/* 96A8B8 802416F8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s
deleted file mode 100644
index a250af5492..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s
+++ /dev/null
@@ -1,98 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416FC_96A8BC
-/* 96A8BC 802416FC 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 96A8C0 80241700 AFB20028 */  sw        $s2, 0x28($sp)
-/* 96A8C4 80241704 0080902D */  daddu     $s2, $a0, $zero
-/* 96A8C8 80241708 AFBF0030 */  sw        $ra, 0x30($sp)
-/* 96A8CC 8024170C AFB3002C */  sw        $s3, 0x2c($sp)
-/* 96A8D0 80241710 AFB10024 */  sw        $s1, 0x24($sp)
-/* 96A8D4 80241714 AFB00020 */  sw        $s0, 0x20($sp)
-/* 96A8D8 80241718 3C018025 */  lui       $at, %hi(D_8024EFCC)
-/* 96A8DC 8024171C AC32EFCC */  sw        $s2, %lo(D_8024EFCC)($at)
-/* 96A8E0 80241720 0C04E9C1 */  jal       func_8013A704
-/* 96A8E4 80241724 24040001 */   addiu    $a0, $zero, 1
-/* 96A8E8 80241728 0040982D */  daddu     $s3, $v0, $zero
-/* 96A8EC 8024172C 0260202D */  daddu     $a0, $s3, $zero
-/* 96A8F0 80241730 24050005 */  addiu     $a1, $zero, 5
-/* 96A8F4 80241734 2406000F */  addiu     $a2, $zero, 0xf
-/* 96A8F8 80241738 24070001 */  addiu     $a3, $zero, 1
-/* 96A8FC 8024173C 00E0882D */  daddu     $s1, $a3, $zero
-/* 96A900 80241740 24100800 */  addiu     $s0, $zero, 0x800
-/* 96A904 80241744 AFB10010 */  sw        $s1, 0x10($sp)
-/* 96A908 80241748 AFA00014 */  sw        $zero, 0x14($sp)
-/* 96A90C 8024174C 0C04EAA7 */  jal       func_8013AA9C
-/* 96A910 80241750 AFB00018 */   sw       $s0, 0x18($sp)
-/* 96A914 80241754 0240202D */  daddu     $a0, $s2, $zero
-/* 96A918 80241758 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96A91C 8024175C 34A5D480 */  ori       $a1, $a1, 0xd480
-/* 96A920 80241760 0C0B2026 */  jal       set_variable
-/* 96A924 80241764 0260302D */   daddu    $a2, $s3, $zero
-/* 96A928 80241768 0C04E9C1 */  jal       func_8013A704
-/* 96A92C 8024176C 24040001 */   addiu    $a0, $zero, 1
-/* 96A930 80241770 0040982D */  daddu     $s3, $v0, $zero
-/* 96A934 80241774 0260202D */  daddu     $a0, $s3, $zero
-/* 96A938 80241778 24050005 */  addiu     $a1, $zero, 5
-/* 96A93C 8024177C 24060010 */  addiu     $a2, $zero, 0x10
-/* 96A940 80241780 24070001 */  addiu     $a3, $zero, 1
-/* 96A944 80241784 AFB10010 */  sw        $s1, 0x10($sp)
-/* 96A948 80241788 AFA00014 */  sw        $zero, 0x14($sp)
-/* 96A94C 8024178C 0C04EAA7 */  jal       func_8013AA9C
-/* 96A950 80241790 AFB00018 */   sw       $s0, 0x18($sp)
-/* 96A954 80241794 0240202D */  daddu     $a0, $s2, $zero
-/* 96A958 80241798 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96A95C 8024179C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 96A960 802417A0 0C0B2026 */  jal       set_variable
-/* 96A964 802417A4 0260302D */   daddu    $a2, $s3, $zero
-/* 96A968 802417A8 0C04E9C1 */  jal       func_8013A704
-/* 96A96C 802417AC 24040001 */   addiu    $a0, $zero, 1
-/* 96A970 802417B0 0040982D */  daddu     $s3, $v0, $zero
-/* 96A974 802417B4 0260202D */  daddu     $a0, $s3, $zero
-/* 96A978 802417B8 24050005 */  addiu     $a1, $zero, 5
-/* 96A97C 802417BC 24060011 */  addiu     $a2, $zero, 0x11
-/* 96A980 802417C0 24070001 */  addiu     $a3, $zero, 1
-/* 96A984 802417C4 AFB10010 */  sw        $s1, 0x10($sp)
-/* 96A988 802417C8 AFA00014 */  sw        $zero, 0x14($sp)
-/* 96A98C 802417CC 0C04EAA7 */  jal       func_8013AA9C
-/* 96A990 802417D0 AFB00018 */   sw       $s0, 0x18($sp)
-/* 96A994 802417D4 0240202D */  daddu     $a0, $s2, $zero
-/* 96A998 802417D8 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96A99C 802417DC 34A5D482 */  ori       $a1, $a1, 0xd482
-/* 96A9A0 802417E0 0C0B2026 */  jal       set_variable
-/* 96A9A4 802417E4 0260302D */   daddu    $a2, $s3, $zero
-/* 96A9A8 802417E8 0C04E9C1 */  jal       func_8013A704
-/* 96A9AC 802417EC 24040001 */   addiu    $a0, $zero, 1
-/* 96A9B0 802417F0 0040982D */  daddu     $s3, $v0, $zero
-/* 96A9B4 802417F4 0260202D */  daddu     $a0, $s3, $zero
-/* 96A9B8 802417F8 24050005 */  addiu     $a1, $zero, 5
-/* 96A9BC 802417FC 24060012 */  addiu     $a2, $zero, 0x12
-/* 96A9C0 80241800 24070001 */  addiu     $a3, $zero, 1
-/* 96A9C4 80241804 AFB10010 */  sw        $s1, 0x10($sp)
-/* 96A9C8 80241808 AFA00014 */  sw        $zero, 0x14($sp)
-/* 96A9CC 8024180C 0C04EAA7 */  jal       func_8013AA9C
-/* 96A9D0 80241810 AFB00018 */   sw       $s0, 0x18($sp)
-/* 96A9D4 80241814 0240202D */  daddu     $a0, $s2, $zero
-/* 96A9D8 80241818 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96A9DC 8024181C 34A5D483 */  ori       $a1, $a1, 0xd483
-/* 96A9E0 80241820 0C0B2026 */  jal       set_variable
-/* 96A9E4 80241824 0260302D */   daddu    $a2, $s3, $zero
-/* 96A9E8 80241828 3C048024 */  lui       $a0, %hi(func_8024240C_96B5CC)
-/* 96A9EC 8024182C 2484240C */  addiu     $a0, $a0, %lo(func_8024240C_96B5CC)
-/* 96A9F0 80241830 3C058024 */  lui       $a1, %hi(func_80242EAC_96C06C)
-/* 96A9F4 80241834 24A52EAC */  addiu     $a1, $a1, %lo(func_80242EAC_96C06C)
-/* 96A9F8 80241838 0C048C56 */  jal       create_dynamic_entity_world
-/* 96A9FC 8024183C 00000000 */   nop
-/* 96AA00 80241840 0240202D */  daddu     $a0, $s2, $zero
-/* 96AA04 80241844 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96AA08 80241848 34A5D487 */  ori       $a1, $a1, 0xd487
-/* 96AA0C 8024184C 0C0B2026 */  jal       set_variable
-/* 96AA10 80241850 0040302D */   daddu    $a2, $v0, $zero
-/* 96AA14 80241854 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 96AA18 80241858 8FB3002C */  lw        $s3, 0x2c($sp)
-/* 96AA1C 8024185C 8FB20028 */  lw        $s2, 0x28($sp)
-/* 96AA20 80241860 8FB10024 */  lw        $s1, 0x24($sp)
-/* 96AA24 80241864 8FB00020 */  lw        $s0, 0x20($sp)
-/* 96AA28 80241868 24020002 */  addiu     $v0, $zero, 2
-/* 96AA2C 8024186C 03E00008 */  jr        $ra
-/* 96AA30 80241870 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241874_96AA34.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241874_96AA34.s
deleted file mode 100644
index 8ab6ae4814..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241874_96AA34.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241874_96AA34
-/* 96AA34 80241874 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96AA38 80241878 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96AA3C 8024187C 0080802D */  daddu     $s0, $a0, $zero
-/* 96AA40 80241880 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96AA44 80241884 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 96AA48 80241888 0C0B1EAF */  jal       get_variable
-/* 96AA4C 8024188C 34A5D480 */   ori      $a1, $a1, 0xd480
-/* 96AA50 80241890 0C04EA15 */  jal       func_8013A854
-/* 96AA54 80241894 0040202D */   daddu    $a0, $v0, $zero
-/* 96AA58 80241898 0200202D */  daddu     $a0, $s0, $zero
-/* 96AA5C 8024189C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96AA60 802418A0 0C0B1EAF */  jal       get_variable
-/* 96AA64 802418A4 34A5D481 */   ori      $a1, $a1, 0xd481
-/* 96AA68 802418A8 0C04EA15 */  jal       func_8013A854
-/* 96AA6C 802418AC 0040202D */   daddu    $a0, $v0, $zero
-/* 96AA70 802418B0 0200202D */  daddu     $a0, $s0, $zero
-/* 96AA74 802418B4 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96AA78 802418B8 0C0B1EAF */  jal       get_variable
-/* 96AA7C 802418BC 34A5D482 */   ori      $a1, $a1, 0xd482
-/* 96AA80 802418C0 0C04EA15 */  jal       func_8013A854
-/* 96AA84 802418C4 0040202D */   daddu    $a0, $v0, $zero
-/* 96AA88 802418C8 0200202D */  daddu     $a0, $s0, $zero
-/* 96AA8C 802418CC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96AA90 802418D0 0C0B1EAF */  jal       get_variable
-/* 96AA94 802418D4 34A5D483 */   ori      $a1, $a1, 0xd483
-/* 96AA98 802418D8 0C04EA15 */  jal       func_8013A854
-/* 96AA9C 802418DC 0040202D */   daddu    $a0, $v0, $zero
-/* 96AAA0 802418E0 0200202D */  daddu     $a0, $s0, $zero
-/* 96AAA4 802418E4 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96AAA8 802418E8 0C0B1EAF */  jal       get_variable
-/* 96AAAC 802418EC 34A5D487 */   ori      $a1, $a1, 0xd487
-/* 96AAB0 802418F0 0C048D70 */  jal       free_dynamic_entity
-/* 96AAB4 802418F4 0040202D */   daddu    $a0, $v0, $zero
-/* 96AAB8 802418F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 96AABC 802418FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96AAC0 80241900 24020002 */  addiu     $v0, $zero, 2
-/* 96AAC4 80241904 03E00008 */  jr        $ra
-/* 96AAC8 80241908 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s
deleted file mode 100644
index 4cc9f81a02..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s
+++ /dev/null
@@ -1,130 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242214_96B3D4
-/* 96B3D4 80242214 27BDFEE8 */  addiu     $sp, $sp, -0x118
-/* 96B3D8 80242218 AFB100E4 */  sw        $s1, 0xe4($sp)
-/* 96B3DC 8024221C 0080882D */  daddu     $s1, $a0, $zero
-/* 96B3E0 80242220 AFB300EC */  sw        $s3, 0xec($sp)
-/* 96B3E4 80242224 00A0982D */  daddu     $s3, $a1, $zero
-/* 96B3E8 80242228 AFB500F4 */  sw        $s5, 0xf4($sp)
-/* 96B3EC 8024222C 00C0A82D */  daddu     $s5, $a2, $zero
-/* 96B3F0 80242230 AFB600F8 */  sw        $s6, 0xf8($sp)
-/* 96B3F4 80242234 00E0B02D */  daddu     $s6, $a3, $zero
-/* 96B3F8 80242238 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96B3FC 8024223C AFB000E0 */  sw        $s0, 0xe0($sp)
-/* 96B400 80242240 3C108025 */  lui       $s0, %hi(D_8024EFCC)
-/* 96B404 80242244 2610EFCC */  addiu     $s0, $s0, %lo(D_8024EFCC)
-/* 96B408 80242248 AFBF00FC */  sw        $ra, 0xfc($sp)
-/* 96B40C 8024224C AFB400F0 */  sw        $s4, 0xf0($sp)
-/* 96B410 80242250 AFB200E8 */  sw        $s2, 0xe8($sp)
-/* 96B414 80242254 F7B80110 */  sdc1      $f24, 0x110($sp)
-/* 96B418 80242258 F7B60108 */  sdc1      $f22, 0x108($sp)
-/* 96B41C 8024225C F7B40100 */  sdc1      $f20, 0x100($sp)
-/* 96B420 80242260 8E040000 */  lw        $a0, ($s0)
-/* 96B424 80242264 8FB40128 */  lw        $s4, 0x128($sp)
-/* 96B428 80242268 0C0B1EAF */  jal       get_variable
-/* 96B42C 8024226C 34A5D484 */   ori      $a1, $a1, 0xd484
-/* 96B430 80242270 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96B434 80242274 8E040000 */  lw        $a0, ($s0)
-/* 96B438 80242278 4482C000 */  mtc1      $v0, $f24
-/* 96B43C 8024227C 00000000 */  nop
-/* 96B440 80242280 4680C620 */  cvt.s.w   $f24, $f24
-/* 96B444 80242284 0C0B1EAF */  jal       get_variable
-/* 96B448 80242288 34A5D485 */   ori      $a1, $a1, 0xd485
-/* 96B44C 8024228C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96B450 80242290 4482A000 */  mtc1      $v0, $f20
-/* 96B454 80242294 00000000 */  nop
-/* 96B458 80242298 4680A520 */  cvt.s.w   $f20, $f20
-/* 96B45C 8024229C 8E040000 */  lw        $a0, ($s0)
-/* 96B460 802422A0 4480B000 */  mtc1      $zero, $f22
-/* 96B464 802422A4 0C0B1EAF */  jal       get_variable
-/* 96B468 802422A8 34A5D486 */   ori      $a1, $a1, 0xd486
-/* 96B46C 802422AC 27B200A0 */  addiu     $s2, $sp, 0xa0
-/* 96B470 802422B0 4405B000 */  mfc1      $a1, $f22
-/* 96B474 802422B4 4407B000 */  mfc1      $a3, $f22
-/* 96B478 802422B8 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
-/* 96B47C 802422BC 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
-/* 96B480 802422C0 3C013F36 */  lui       $at, 0x3f36
-/* 96B484 802422C4 3421DB6E */  ori       $at, $at, 0xdb6e
-/* 96B488 802422C8 44810000 */  mtc1      $at, $f0
-/* 96B48C 802422CC 00041880 */  sll       $v1, $a0, 2
-/* 96B490 802422D0 00641821 */  addu      $v1, $v1, $a0
-/* 96B494 802422D4 00031880 */  sll       $v1, $v1, 2
-/* 96B498 802422D8 00641823 */  subu      $v1, $v1, $a0
-/* 96B49C 802422DC 000320C0 */  sll       $a0, $v1, 3
-/* 96B4A0 802422E0 00641821 */  addu      $v1, $v1, $a0
-/* 96B4A4 802422E4 000318C0 */  sll       $v1, $v1, 3
-/* 96B4A8 802422E8 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 96B4AC 802422EC 00230821 */  addu      $at, $at, $v1
-/* 96B4B0 802422F0 C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
-/* 96B4B4 802422F4 0240202D */  daddu     $a0, $s2, $zero
-/* 96B4B8 802422F8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 96B4BC 802422FC 46001087 */  neg.s     $f2, $f2
-/* 96B4C0 80242300 44061000 */  mfc1      $a2, $f2
-/* 96B4C4 80242304 44820000 */  mtc1      $v0, $f0
-/* 96B4C8 80242308 00000000 */  nop
-/* 96B4CC 8024230C 46800020 */  cvt.s.w   $f0, $f0
-/* 96B4D0 80242310 E7B80014 */  swc1      $f24, 0x14($sp)
-/* 96B4D4 80242314 E7B40018 */  swc1      $f20, 0x18($sp)
-/* 96B4D8 80242318 0C018FC4 */  jal       guPositionF
-/* 96B4DC 8024231C E7A0001C */   swc1     $f0, 0x1c($sp)
-/* 96B4E0 80242320 3C028025 */  lui       $v0, %hi(D_8024F010)
-/* 96B4E4 80242324 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
-/* 96B4E8 80242328 001180C0 */  sll       $s0, $s1, 3
-/* 96B4EC 8024232C 02118021 */  addu      $s0, $s0, $s1
-/* 96B4F0 80242330 00108080 */  sll       $s0, $s0, 2
-/* 96B4F4 80242334 02028021 */  addu      $s0, $s0, $v0
-/* 96B4F8 80242338 27B10060 */  addiu     $s1, $sp, 0x60
-/* 96B4FC 8024233C 8E050004 */  lw        $a1, 4($s0)
-/* 96B500 80242340 8E060008 */  lw        $a2, 8($s0)
-/* 96B504 80242344 8E07000C */  lw        $a3, 0xc($s0)
-/* 96B508 80242348 0C019E40 */  jal       guTranslateF
-/* 96B50C 8024234C 0220202D */   daddu    $a0, $s1, $zero
-/* 96B510 80242350 0220202D */  daddu     $a0, $s1, $zero
-/* 96B514 80242354 0240282D */  daddu     $a1, $s2, $zero
-/* 96B518 80242358 0C019D80 */  jal       guMtxCatF
-/* 96B51C 8024235C 27A60020 */   addiu    $a2, $sp, 0x20
-/* 96B520 80242360 E7B60010 */  swc1      $f22, 0x10($sp)
-/* 96B524 80242364 8E050010 */  lw        $a1, 0x10($s0)
-/* 96B528 80242368 3C013F80 */  lui       $at, 0x3f80
-/* 96B52C 8024236C 4481A000 */  mtc1      $at, $f20
-/* 96B530 80242370 4406B000 */  mfc1      $a2, $f22
-/* 96B534 80242374 4407A000 */  mfc1      $a3, $f20
-/* 96B538 80242378 0C019EC8 */  jal       guRotateF
-/* 96B53C 8024237C 0220202D */   daddu    $a0, $s1, $zero
-/* 96B540 80242380 0220202D */  daddu     $a0, $s1, $zero
-/* 96B544 80242384 27A50020 */  addiu     $a1, $sp, 0x20
-/* 96B548 80242388 0C019D80 */  jal       guMtxCatF
-/* 96B54C 8024238C 00A0302D */   daddu    $a2, $a1, $zero
-/* 96B550 80242390 0220202D */  daddu     $a0, $s1, $zero
-/* 96B554 80242394 4405B000 */  mfc1      $a1, $f22
-/* 96B558 80242398 4407A000 */  mfc1      $a3, $f20
-/* 96B55C 8024239C 0C019E40 */  jal       guTranslateF
-/* 96B560 802423A0 00A0302D */   daddu    $a2, $a1, $zero
-/* 96B564 802423A4 0220202D */  daddu     $a0, $s1, $zero
-/* 96B568 802423A8 27A50020 */  addiu     $a1, $sp, 0x20
-/* 96B56C 802423AC 0C019D80 */  jal       guMtxCatF
-/* 96B570 802423B0 00A0302D */   daddu    $a2, $a1, $zero
-/* 96B574 802423B4 C7A00050 */  lwc1      $f0, 0x50($sp)
-/* 96B578 802423B8 E6600000 */  swc1      $f0, ($s3)
-/* 96B57C 802423BC C7A00054 */  lwc1      $f0, 0x54($sp)
-/* 96B580 802423C0 E6A00000 */  swc1      $f0, ($s5)
-/* 96B584 802423C4 C7A00058 */  lwc1      $f0, 0x58($sp)
-/* 96B588 802423C8 E6C00000 */  swc1      $f0, ($s6)
-/* 96B58C 802423CC 0C00A6C9 */  jal       clamp_angle
-/* 96B590 802423D0 C60C0010 */   lwc1     $f12, 0x10($s0)
-/* 96B594 802423D4 E6800000 */  swc1      $f0, ($s4)
-/* 96B598 802423D8 8FBF00FC */  lw        $ra, 0xfc($sp)
-/* 96B59C 802423DC 8FB600F8 */  lw        $s6, 0xf8($sp)
-/* 96B5A0 802423E0 8FB500F4 */  lw        $s5, 0xf4($sp)
-/* 96B5A4 802423E4 8FB400F0 */  lw        $s4, 0xf0($sp)
-/* 96B5A8 802423E8 8FB300EC */  lw        $s3, 0xec($sp)
-/* 96B5AC 802423EC 8FB200E8 */  lw        $s2, 0xe8($sp)
-/* 96B5B0 802423F0 8FB100E4 */  lw        $s1, 0xe4($sp)
-/* 96B5B4 802423F4 8FB000E0 */  lw        $s0, 0xe0($sp)
-/* 96B5B8 802423F8 D7B80110 */  ldc1      $f24, 0x110($sp)
-/* 96B5BC 802423FC D7B60108 */  ldc1      $f22, 0x108($sp)
-/* 96B5C0 80242400 D7B40100 */  ldc1      $f20, 0x100($sp)
-/* 96B5C4 80242404 03E00008 */  jr        $ra
-/* 96B5C8 80242408 27BD0118 */   addiu    $sp, $sp, 0x118
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s
deleted file mode 100644
index 630b16a6d6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242EAC_96C06C
-/* 96C06C 80242EAC 27BDFF80 */  addiu     $sp, $sp, -0x80
-/* 96C070 80242EB0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96C074 80242EB4 AFB20068 */  sw        $s2, 0x68($sp)
-/* 96C078 80242EB8 3C128025 */  lui       $s2, %hi(D_8024EFCC)
-/* 96C07C 80242EBC 2652EFCC */  addiu     $s2, $s2, %lo(D_8024EFCC)
-/* 96C080 80242EC0 AFBF006C */  sw        $ra, 0x6c($sp)
-/* 96C084 80242EC4 AFB10064 */  sw        $s1, 0x64($sp)
-/* 96C088 80242EC8 AFB00060 */  sw        $s0, 0x60($sp)
-/* 96C08C 80242ECC F7B60078 */  sdc1      $f22, 0x78($sp)
-/* 96C090 80242ED0 F7B40070 */  sdc1      $f20, 0x70($sp)
-/* 96C094 80242ED4 8E440000 */  lw        $a0, ($s2)
-/* 96C098 80242ED8 0C0B1EAF */  jal       get_variable
-/* 96C09C 80242EDC 34A5D484 */   ori      $a1, $a1, 0xd484
-/* 96C0A0 80242EE0 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96C0A4 80242EE4 8E440000 */  lw        $a0, ($s2)
-/* 96C0A8 80242EE8 4482B000 */  mtc1      $v0, $f22
-/* 96C0AC 80242EEC 00000000 */  nop
-/* 96C0B0 80242EF0 4680B5A0 */  cvt.s.w   $f22, $f22
-/* 96C0B4 80242EF4 0C0B1EAF */  jal       get_variable
-/* 96C0B8 80242EF8 34A5D485 */   ori      $a1, $a1, 0xd485
-/* 96C0BC 80242EFC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96C0C0 80242F00 8E440000 */  lw        $a0, ($s2)
-/* 96C0C4 80242F04 4482A000 */  mtc1      $v0, $f20
-/* 96C0C8 80242F08 00000000 */  nop
-/* 96C0CC 80242F0C 4680A520 */  cvt.s.w   $f20, $f20
-/* 96C0D0 80242F10 0C0B1EAF */  jal       get_variable
-/* 96C0D4 80242F14 34A5D486 */   ori      $a1, $a1, 0xd486
-/* 96C0D8 80242F18 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
-/* 96C0DC 80242F1C 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
-/* 96C0E0 80242F20 44800000 */  mtc1      $zero, $f0
-/* 96C0E4 80242F24 00041880 */  sll       $v1, $a0, 2
-/* 96C0E8 80242F28 00641821 */  addu      $v1, $v1, $a0
-/* 96C0EC 80242F2C 00031880 */  sll       $v1, $v1, 2
-/* 96C0F0 80242F30 00641823 */  subu      $v1, $v1, $a0
-/* 96C0F4 80242F34 000320C0 */  sll       $a0, $v1, 3
-/* 96C0F8 80242F38 00641821 */  addu      $v1, $v1, $a0
-/* 96C0FC 80242F3C 000318C0 */  sll       $v1, $v1, 3
-/* 96C100 80242F40 44050000 */  mfc1      $a1, $f0
-/* 96C104 80242F44 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 96C108 80242F48 00230821 */  addu      $at, $at, $v1
-/* 96C10C 80242F4C C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
-/* 96C110 80242F50 3C013F36 */  lui       $at, 0x3f36
-/* 96C114 80242F54 3421DB6E */  ori       $at, $at, 0xdb6e
-/* 96C118 80242F58 44810000 */  mtc1      $at, $f0
-/* 96C11C 80242F5C 27A40020 */  addiu     $a0, $sp, 0x20
-/* 96C120 80242F60 E7B60014 */  swc1      $f22, 0x14($sp)
-/* 96C124 80242F64 E7B40018 */  swc1      $f20, 0x18($sp)
-/* 96C128 80242F68 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 96C12C 80242F6C 44820000 */  mtc1      $v0, $f0
-/* 96C130 80242F70 00000000 */  nop
-/* 96C134 80242F74 46800020 */  cvt.s.w   $f0, $f0
-/* 96C138 80242F78 46001087 */  neg.s     $f2, $f2
-/* 96C13C 80242F7C 44061000 */  mfc1      $a2, $f2
-/* 96C140 80242F80 00A0382D */  daddu     $a3, $a1, $zero
-/* 96C144 80242F84 0C018FC4 */  jal       guPositionF
-/* 96C148 80242F88 E7A0001C */   swc1     $f0, 0x1c($sp)
-/* 96C14C 80242F8C 3C108025 */  lui       $s0, %hi(D_8024F010)
-/* 96C150 80242F90 2610F010 */  addiu     $s0, $s0, %lo(D_8024F010)
-/* 96C154 80242F94 0200202D */  daddu     $a0, $s0, $zero
-/* 96C158 80242F98 0C090643 */  jal       func_8024190C_96AACC
-/* 96C15C 80242F9C 27A50020 */   addiu    $a1, $sp, 0x20
-/* 96C160 80242FA0 26040024 */  addiu     $a0, $s0, 0x24
-/* 96C164 80242FA4 27A50020 */  addiu     $a1, $sp, 0x20
-/* 96C168 80242FA8 0C090643 */  jal       func_8024190C_96AACC
-/* 96C16C 80242FAC 0040882D */   daddu    $s1, $v0, $zero
-/* 96C170 80242FB0 26040048 */  addiu     $a0, $s0, 0x48
-/* 96C174 80242FB4 0C090643 */  jal       func_8024190C_96AACC
-/* 96C178 80242FB8 27A50020 */   addiu    $a1, $sp, 0x20
-/* 96C17C 80242FBC 8E030000 */  lw        $v1, ($s0)
-/* 96C180 80242FC0 24020002 */  addiu     $v0, $zero, 2
-/* 96C184 80242FC4 14620008 */  bne       $v1, $v0, .L80242FE8
-/* 96C188 80242FC8 2622FFFF */   addiu    $v0, $s1, -1
-/* 96C18C 80242FCC 2C420002 */  sltiu     $v0, $v0, 2
-/* 96C190 80242FD0 10400005 */  beqz      $v0, .L80242FE8
-/* 96C194 80242FD4 3C05F4AC */   lui      $a1, 0xf4ac
-/* 96C198 80242FD8 8E440000 */  lw        $a0, ($s2)
-/* 96C19C 80242FDC 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96C1A0 80242FE0 0C0B2026 */  jal       set_variable
-/* 96C1A4 80242FE4 24060003 */   addiu    $a2, $zero, 3
-.L80242FE8:
-/* 96C1A8 80242FE8 3C038025 */  lui       $v1, %hi(D_8024F010)
-/* 96C1AC 80242FEC 8C63F010 */  lw        $v1, %lo(D_8024F010)($v1)
-/* 96C1B0 80242FF0 24020003 */  addiu     $v0, $zero, 3
-/* 96C1B4 80242FF4 14620009 */  bne       $v1, $v0, .L8024301C
-/* 96C1B8 80242FF8 2622FFFF */   addiu    $v0, $s1, -1
-/* 96C1BC 80242FFC 2C420002 */  sltiu     $v0, $v0, 2
-/* 96C1C0 80243000 10400006 */  beqz      $v0, .L8024301C
-/* 96C1C4 80243004 3C05F4AC */   lui      $a1, 0xf4ac
-/* 96C1C8 80243008 3C048025 */  lui       $a0, %hi(D_8024EFCC)
-/* 96C1CC 8024300C 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
-/* 96C1D0 80243010 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96C1D4 80243014 0C0B2026 */  jal       set_variable
-/* 96C1D8 80243018 2406000B */   addiu    $a2, $zero, 0xb
-.L8024301C:
-/* 96C1DC 8024301C 8FBF006C */  lw        $ra, 0x6c($sp)
-/* 96C1E0 80243020 8FB20068 */  lw        $s2, 0x68($sp)
-/* 96C1E4 80243024 8FB10064 */  lw        $s1, 0x64($sp)
-/* 96C1E8 80243028 8FB00060 */  lw        $s0, 0x60($sp)
-/* 96C1EC 8024302C D7B60078 */  ldc1      $f22, 0x78($sp)
-/* 96C1F0 80243030 D7B40070 */  ldc1      $f20, 0x70($sp)
-/* 96C1F4 80243034 03E00008 */  jr        $ra
-/* 96C1F8 80243038 27BD0080 */   addiu    $sp, $sp, 0x80
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s
deleted file mode 100644
index 7649313a57..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024303C_96C1FC
-/* 96C1FC 8024303C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C200 80243040 2404202A */  addiu     $a0, $zero, 0x202a
-/* 96C204 80243044 0000282D */  daddu     $a1, $zero, $zero
-/* 96C208 80243048 24060018 */  addiu     $a2, $zero, 0x18
-/* 96C20C 8024304C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C210 80243050 0C0526AE */  jal       sfx_play_sound_with_params
-/* 96C214 80243054 00A0382D */   daddu    $a3, $a1, $zero
-/* 96C218 80243058 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C21C 8024305C 24020002 */  addiu     $v0, $zero, 2
-/* 96C220 80243060 03E00008 */  jr        $ra
-/* 96C224 80243064 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s
deleted file mode 100644
index c4fa5cf1b8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243068_96C228
-/* 96C228 80243068 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C22C 8024306C 2404202B */  addiu     $a0, $zero, 0x202b
-/* 96C230 80243070 0000282D */  daddu     $a1, $zero, $zero
-/* 96C234 80243074 24060068 */  addiu     $a2, $zero, 0x68
-/* 96C238 80243078 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C23C 8024307C 0C0526AE */  jal       sfx_play_sound_with_params
-/* 96C240 80243080 00A0382D */   daddu    $a3, $a1, $zero
-/* 96C244 80243084 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C248 80243088 24020002 */  addiu     $v0, $zero, 2
-/* 96C24C 8024308C 03E00008 */  jr        $ra
-/* 96C250 80243090 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s
deleted file mode 100644
index 0979c183ac..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802432C0_96C480
-/* 96C480 802432C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C484 802432C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C488 802432C8 10A00003 */  beqz      $a1, .L802432D8
-/* 96C48C 802432CC 8C86000C */   lw       $a2, 0xc($a0)
-/* 96C490 802432D0 3C018025 */  lui       $at, %hi(D_80248780_971940)
-/* 96C494 802432D4 AC208780 */  sw        $zero, %lo(D_80248780_971940)($at)
-.L802432D8:
-/* 96C498 802432D8 3C038025 */  lui       $v1, %hi(D_80248780_971940)
-/* 96C49C 802432DC 24638780 */  addiu     $v1, $v1, %lo(D_80248780_971940)
-/* 96C4A0 802432E0 8C620000 */  lw        $v0, ($v1)
-/* 96C4A4 802432E4 54400003 */  bnel      $v0, $zero, .L802432F4
-/* 96C4A8 802432E8 AC600000 */   sw       $zero, ($v1)
-/* 96C4AC 802432EC 08090CC2 */  j         .L80243308
-/* 96C4B0 802432F0 0000102D */   daddu    $v0, $zero, $zero
-.L802432F4:
-/* 96C4B4 802432F4 8CC50000 */  lw        $a1, ($a2)
-/* 96C4B8 802432F8 3C068025 */  lui       $a2, %hi(D_80248784_971944)
-/* 96C4BC 802432FC 0C0B2026 */  jal       set_variable
-/* 96C4C0 80243300 8CC68784 */   lw       $a2, %lo(D_80248784_971944)($a2)
-/* 96C4C4 80243304 24020002 */  addiu     $v0, $zero, 2
-.L80243308:
-/* 96C4C8 80243308 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C4CC 8024330C 03E00008 */  jr        $ra
-/* 96C4D0 80243310 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s
deleted file mode 100644
index 2a4f054f51..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243314_96C4D4
-/* 96C4D4 80243314 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C4D8 80243318 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C4DC 8024331C 8C82000C */  lw        $v0, 0xc($a0)
-/* 96C4E0 80243320 0C0B1EAF */  jal       get_variable
-/* 96C4E4 80243324 8C450000 */   lw       $a1, ($v0)
-/* 96C4E8 80243328 3C018025 */  lui       $at, %hi(D_80248784_971944)
-/* 96C4EC 8024332C AC228784 */  sw        $v0, %lo(D_80248784_971944)($at)
-/* 96C4F0 80243330 24020002 */  addiu     $v0, $zero, 2
-/* 96C4F4 80243334 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C4F8 80243338 24030001 */  addiu     $v1, $zero, 1
-/* 96C4FC 8024333C 3C018025 */  lui       $at, %hi(D_80248780_971940)
-/* 96C500 80243340 AC238780 */  sw        $v1, %lo(D_80248780_971940)($at)
-/* 96C504 80243344 03E00008 */  jr        $ra
-/* 96C508 80243348 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s
deleted file mode 100644
index f5d527d747..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024334C_96C50C
-/* 96C50C 8024334C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C510 80243350 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C514 80243354 8C82000C */  lw        $v0, 0xc($a0)
-/* 96C518 80243358 0C0B1EAF */  jal       get_variable
-/* 96C51C 8024335C 8C450000 */   lw       $a1, ($v0)
-/* 96C520 80243360 0040182D */  daddu     $v1, $v0, $zero
-/* 96C524 80243364 10600012 */  beqz      $v1, .L802433B0
-/* 96C528 80243368 0000202D */   daddu    $a0, $zero, $zero
-/* 96C52C 8024336C 8C620000 */  lw        $v0, ($v1)
-/* 96C530 80243370 5040000A */  beql      $v0, $zero, .L8024339C
-/* 96C534 80243374 00041080 */   sll      $v0, $a0, 2
-/* 96C538 80243378 3C058025 */  lui       $a1, %hi(D_8024F080)
-/* 96C53C 8024337C 24A5F080 */  addiu     $a1, $a1, %lo(D_8024F080)
-.L80243380:
-/* 96C540 80243380 24630004 */  addiu     $v1, $v1, 4
-/* 96C544 80243384 24840001 */  addiu     $a0, $a0, 1
-/* 96C548 80243388 ACA20000 */  sw        $v0, ($a1)
-/* 96C54C 8024338C 8C620000 */  lw        $v0, ($v1)
-/* 96C550 80243390 1440FFFB */  bnez      $v0, .L80243380
-/* 96C554 80243394 24A50004 */   addiu    $a1, $a1, 4
-/* 96C558 80243398 00041080 */  sll       $v0, $a0, 2
-.L8024339C:
-/* 96C55C 8024339C 3C018025 */  lui       $at, %hi(D_8024F080)
-/* 96C560 802433A0 00220821 */  addu      $at, $at, $v0
-/* 96C564 802433A4 AC20F080 */  sw        $zero, %lo(D_8024F080)($at)
-/* 96C568 802433A8 08090CF6 */  j         .L802433D8
-/* 96C56C 802433AC 00000000 */   nop
-.L802433B0:
-/* 96C570 802433B0 3C038025 */  lui       $v1, %hi(D_8024F080)
-/* 96C574 802433B4 2463F080 */  addiu     $v1, $v1, %lo(D_8024F080)
-/* 96C578 802433B8 0060282D */  daddu     $a1, $v1, $zero
-.L802433BC:
-/* 96C57C 802433BC 24820010 */  addiu     $v0, $a0, 0x10
-/* 96C580 802433C0 AC620000 */  sw        $v0, ($v1)
-/* 96C584 802433C4 24630004 */  addiu     $v1, $v1, 4
-/* 96C588 802433C8 24840001 */  addiu     $a0, $a0, 1
-/* 96C58C 802433CC 28820070 */  slti      $v0, $a0, 0x70
-/* 96C590 802433D0 1440FFFA */  bnez      $v0, .L802433BC
-/* 96C594 802433D4 ACA001C0 */   sw       $zero, 0x1c0($a1)
-.L802433D8:
-/* 96C598 802433D8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C59C 802433DC 24020002 */  addiu     $v0, $zero, 2
-/* 96C5A0 802433E0 03E00008 */  jr        $ra
-/* 96C5A4 802433E4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s
deleted file mode 100644
index 3c4433ac42..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802433E8_96C5A8
-/* 96C5A8 802433E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96C5AC 802433EC AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96C5B0 802433F0 8C82000C */  lw        $v0, 0xc($a0)
-/* 96C5B4 802433F4 0C0B1EAF */  jal       get_variable
-/* 96C5B8 802433F8 8C450000 */   lw       $a1, ($v0)
-/* 96C5BC 802433FC 0040182D */  daddu     $v1, $v0, $zero
-/* 96C5C0 80243400 10600012 */  beqz      $v1, .L8024344C
-/* 96C5C4 80243404 0000202D */   daddu    $a0, $zero, $zero
-/* 96C5C8 80243408 8C620000 */  lw        $v0, ($v1)
-/* 96C5CC 8024340C 5040000A */  beql      $v0, $zero, .L80243438
-/* 96C5D0 80243410 00041080 */   sll      $v0, $a0, 2
-/* 96C5D4 80243414 3C058025 */  lui       $a1, %hi(D_8024F248)
-/* 96C5D8 80243418 24A5F248 */  addiu     $a1, $a1, %lo(D_8024F248)
-.L8024341C:
-/* 96C5DC 8024341C 24630004 */  addiu     $v1, $v1, 4
-/* 96C5E0 80243420 24840001 */  addiu     $a0, $a0, 1
-/* 96C5E4 80243424 ACA20000 */  sw        $v0, ($a1)
-/* 96C5E8 80243428 8C620000 */  lw        $v0, ($v1)
-/* 96C5EC 8024342C 1440FFFB */  bnez      $v0, .L8024341C
-/* 96C5F0 80243430 24A50004 */   addiu    $a1, $a1, 4
-/* 96C5F4 80243434 00041080 */  sll       $v0, $a0, 2
-.L80243438:
-/* 96C5F8 80243438 3C018025 */  lui       $at, %hi(D_8024F248)
-/* 96C5FC 8024343C 00220821 */  addu      $at, $at, $v0
-/* 96C600 80243440 AC20F248 */  sw        $zero, %lo(D_8024F248)($at)
-/* 96C604 80243444 08090D1D */  j         .L80243474
-/* 96C608 80243448 00000000 */   nop
-.L8024344C:
-/* 96C60C 8024344C 3C038025 */  lui       $v1, %hi(D_8024F248)
-/* 96C610 80243450 2463F248 */  addiu     $v1, $v1, %lo(D_8024F248)
-/* 96C614 80243454 0060282D */  daddu     $a1, $v1, $zero
-.L80243458:
-/* 96C618 80243458 24820080 */  addiu     $v0, $a0, 0x80
-/* 96C61C 8024345C AC620000 */  sw        $v0, ($v1)
-/* 96C620 80243460 24630004 */  addiu     $v1, $v1, 4
-/* 96C624 80243464 24840001 */  addiu     $a0, $a0, 1
-/* 96C628 80243468 2882005B */  slti      $v0, $a0, 0x5b
-/* 96C62C 8024346C 1440FFFA */  bnez      $v0, .L80243458
-/* 96C630 80243470 ACA0016C */   sw       $zero, 0x16c($a1)
-.L80243474:
-/* 96C634 80243474 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96C638 80243478 24020002 */  addiu     $v0, $zero, 2
-/* 96C63C 8024347C 03E00008 */  jr        $ra
-/* 96C640 80243480 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s
deleted file mode 100644
index efe47824a2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802434CC_96C68C
-/* 96C68C 802434CC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 96C690 802434D0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 96C694 802434D4 0080882D */  daddu     $s1, $a0, $zero
-/* 96C698 802434D8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 96C69C 802434DC AFB00010 */  sw        $s0, 0x10($sp)
-/* 96C6A0 802434E0 8E30000C */  lw        $s0, 0xc($s1)
-/* 96C6A4 802434E4 8E050000 */  lw        $a1, ($s0)
-/* 96C6A8 802434E8 0C0B1EAF */  jal       get_variable
-/* 96C6AC 802434EC 26100004 */   addiu    $s0, $s0, 4
-/* 96C6B0 802434F0 0220202D */  daddu     $a0, $s1, $zero
-/* 96C6B4 802434F4 8E050000 */  lw        $a1, ($s0)
-/* 96C6B8 802434F8 0C0B1EAF */  jal       get_variable
-/* 96C6BC 802434FC 0040882D */   daddu    $s1, $v0, $zero
-/* 96C6C0 80243500 0000202D */  daddu     $a0, $zero, $zero
-/* 96C6C4 80243504 0080282D */  daddu     $a1, $a0, $zero
-/* 96C6C8 80243508 0040802D */  daddu     $s0, $v0, $zero
-/* 96C6CC 8024350C 240600BE */  addiu     $a2, $zero, 0xbe
-/* 96C6D0 80243510 0C04DF93 */  jal       set_transition_stencil_center
-/* 96C6D4 80243514 24070091 */   addiu    $a3, $zero, 0x91
-/* 96C6D8 80243518 44900000 */  mtc1      $s0, $f0
-/* 96C6DC 8024351C 00000000 */  nop
-/* 96C6E0 80243520 46800020 */  cvt.s.w   $f0, $f0
-/* 96C6E4 80243524 44050000 */  mfc1      $a1, $f0
-/* 96C6E8 80243528 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* 96C6EC 8024352C 322400FF */   andi     $a0, $s1, 0xff
-/* 96C6F0 80243530 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 96C6F4 80243534 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96C6F8 80243538 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96C6FC 8024353C 24020002 */  addiu     $v0, $zero, 2
-/* 96C700 80243540 03E00008 */  jr        $ra
-/* 96C704 80243544 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s
deleted file mode 100644
index 39a72adfd0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243548_96C708
-/* 96C708 80243548 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 96C70C 8024354C AFB10014 */  sw        $s1, 0x14($sp)
-/* 96C710 80243550 0080882D */  daddu     $s1, $a0, $zero
-/* 96C714 80243554 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 96C718 80243558 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96C71C 8024355C 8E30000C */  lw        $s0, 0xc($s1)
-/* 96C720 80243560 8E050000 */  lw        $a1, ($s0)
-/* 96C724 80243564 0C0B1EAF */  jal       get_variable
-/* 96C728 80243568 26100004 */   addiu    $s0, $s0, 4
-/* 96C72C 8024356C 0220202D */  daddu     $a0, $s1, $zero
-/* 96C730 80243570 8E050000 */  lw        $a1, ($s0)
-/* 96C734 80243574 0C0B1EAF */  jal       get_variable
-/* 96C738 80243578 0040802D */   daddu    $s0, $v0, $zero
-/* 96C73C 8024357C 44820000 */  mtc1      $v0, $f0
-/* 96C740 80243580 00000000 */  nop
-/* 96C744 80243584 46800020 */  cvt.s.w   $f0, $f0
-/* 96C748 80243588 24020002 */  addiu     $v0, $zero, 2
-/* 96C74C 8024358C 00501804 */  sllv      $v1, $s0, $v0
-/* 96C750 80243590 00701821 */  addu      $v1, $v1, $s0
-/* 96C754 80243594 00431804 */  sllv      $v1, $v1, $v0
-/* 96C758 80243598 00701823 */  subu      $v1, $v1, $s0
-/* 96C75C 8024359C 000320C0 */  sll       $a0, $v1, 3
-/* 96C760 802435A0 00641821 */  addu      $v1, $v1, $a0
-/* 96C764 802435A4 000318C0 */  sll       $v1, $v1, 3
-/* 96C768 802435A8 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* 96C76C 802435AC 00230821 */  addu      $at, $at, $v1
-/* 96C770 802435B0 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* 96C774 802435B4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 96C778 802435B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96C77C 802435BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96C780 802435C0 03E00008 */  jr        $ra
-/* 96C784 802435C4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s
deleted file mode 100644
index 2c5bdadb2b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243644_96C804
-/* 96C804 80243644 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* 96C808 80243648 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* 96C80C 8024364C AC800088 */  sw        $zero, 0x88($a0)
-/* 96C810 80243650 80A30003 */  lb        $v1, 3($a1)
-/* 96C814 80243654 80A20002 */  lb        $v0, 2($a1)
-/* 96C818 80243658 1462000B */  bne       $v1, $v0, .L80243688
-/* 96C81C 8024365C 00A0302D */   daddu    $a2, $a1, $zero
-/* 96C820 80243660 80A30006 */  lb        $v1, 6($a1)
-/* 96C824 80243664 80A20005 */  lb        $v0, 5($a1)
-/* 96C828 80243668 14620007 */  bne       $v1, $v0, .L80243688
-/* 96C82C 8024366C 00000000 */   nop
-/* 96C830 80243670 80C2028E */  lb        $v0, 0x28e($a2)
-/* 96C834 80243674 84C30290 */  lh        $v1, 0x290($a2)
-/* 96C838 80243678 00021200 */  sll       $v0, $v0, 8
-/* 96C83C 8024367C 14620004 */  bne       $v1, $v0, .L80243690
-/* 96C840 80243680 24020001 */   addiu    $v0, $zero, 1
-/* 96C844 80243684 AC820088 */  sw        $v0, 0x88($a0)
-.L80243688:
-/* 96C848 80243688 03E00008 */  jr        $ra
-/* 96C84C 8024368C 24020002 */   addiu    $v0, $zero, 2
-.L80243690:
-/* 96C850 80243690 03E00008 */  jr        $ra
-/* 96C854 80243694 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s
deleted file mode 100644
index 3636c34097..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243698_96C858
-/* 96C858 80243698 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 96C85C 8024369C AFB10014 */  sw        $s1, 0x14($sp)
-/* 96C860 802436A0 0080882D */  daddu     $s1, $a0, $zero
-/* 96C864 802436A4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 96C868 802436A8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 96C86C 802436AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 96C870 802436B0 8E30000C */  lw        $s0, 0xc($s1)
-/* 96C874 802436B4 8E050000 */  lw        $a1, ($s0)
-/* 96C878 802436B8 0C0B1EAF */  jal       get_variable
-/* 96C87C 802436BC 26100004 */   addiu    $s0, $s0, 4
-/* 96C880 802436C0 8E050000 */  lw        $a1, ($s0)
-/* 96C884 802436C4 26100004 */  addiu     $s0, $s0, 4
-/* 96C888 802436C8 0220202D */  daddu     $a0, $s1, $zero
-/* 96C88C 802436CC 0C0B1EAF */  jal       get_variable
-/* 96C890 802436D0 0040902D */   daddu    $s2, $v0, $zero
-/* 96C894 802436D4 0220202D */  daddu     $a0, $s1, $zero
-/* 96C898 802436D8 8E050000 */  lw        $a1, ($s0)
-/* 96C89C 802436DC 0C0B1EAF */  jal       get_variable
-/* 96C8A0 802436E0 0040802D */   daddu    $s0, $v0, $zero
-/* 96C8A4 802436E4 0000202D */  daddu     $a0, $zero, $zero
-/* 96C8A8 802436E8 324500FF */  andi      $a1, $s2, 0xff
-/* 96C8AC 802436EC 320600FF */  andi      $a2, $s0, 0xff
-/* 96C8B0 802436F0 0C04DF84 */  jal       set_transition_stencil_color
-/* 96C8B4 802436F4 304700FF */   andi     $a3, $v0, 0xff
-/* 96C8B8 802436F8 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 96C8BC 802436FC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 96C8C0 80243700 8FB10014 */  lw        $s1, 0x14($sp)
-/* 96C8C4 80243704 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96C8C8 80243708 24020002 */  addiu     $v0, $zero, 2
-/* 96C8CC 8024370C 03E00008 */  jr        $ra
-/* 96C8D0 80243710 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778_96C938.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778_96C938.s
deleted file mode 100644
index dda3b213d2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778_96C938.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243778_96C938
-/* 96C938 80243778 03E00008 */  jr        $ra
-/* 96C93C 8024377C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s
deleted file mode 100644
index 4c3e9ee4be..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802439FC_96CBBC
-/* 96CBBC 802439FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96CBC0 80243A00 AFB00010 */  sw        $s0, 0x10($sp)
-/* 96CBC4 80243A04 0080802D */  daddu     $s0, $a0, $zero
-/* 96CBC8 80243A08 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 96CBCC 80243A0C 0C00EABB */  jal       get_npc_unsafe
-/* 96CBD0 80243A10 8E04008C */   lw       $a0, 0x8c($s0)
-/* 96CBD4 80243A14 0040282D */  daddu     $a1, $v0, $zero
-/* 96CBD8 80243A18 8E040094 */  lw        $a0, 0x94($s0)
-/* 96CBDC 80243A1C 8CA30028 */  lw        $v1, 0x28($a1)
-/* 96CBE0 80243A20 ACA40028 */  sw        $a0, 0x28($a1)
-/* 96CBE4 80243A24 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 96CBE8 80243A28 8FB00010 */  lw        $s0, 0x10($sp)
-/* 96CBEC 80243A2C 24020002 */  addiu     $v0, $zero, 2
-/* 96CBF0 80243A30 3C018025 */  lui       $at, %hi(D_8024F3B8)
-/* 96CBF4 80243A34 AC23F3B8 */  sw        $v1, %lo(D_8024F3B8)($at)
-/* 96CBF8 80243A38 03E00008 */  jr        $ra
-/* 96CBFC 80243A3C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s
deleted file mode 100644
index e781c8b483..0000000000
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243A40_96CC00
-/* 96CC00 80243A40 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96CC04 80243A44 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 96CC08 80243A48 0C00EABB */  jal       get_npc_unsafe
-/* 96CC0C 80243A4C 8C84008C */   lw       $a0, 0x8c($a0)
-/* 96CC10 80243A50 3C038025 */  lui       $v1, %hi(D_8024F3B8)
-/* 96CC14 80243A54 8C63F3B8 */  lw        $v1, %lo(D_8024F3B8)($v1)
-/* 96CC18 80243A58 AC430028 */  sw        $v1, 0x28($v0)
-/* 96CC1C 80243A5C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 96CC20 80243A60 24020002 */  addiu     $v0, $zero, 2
-/* 96CC24 80243A64 03E00008 */  jr        $ra
-/* 96CC28 80243A68 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 96CC2C 80243A6C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s b/ver/us/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s
deleted file mode 100644
index c62a265fd2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242CF0_E08050
-/* E08050 80242CF0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* E08054 80242CF4 AFB10014 */  sw        $s1, 0x14($sp)
-/* E08058 80242CF8 0080882D */  daddu     $s1, $a0, $zero
-/* E0805C 80242CFC AFBF001C */  sw        $ra, 0x1c($sp)
-/* E08060 80242D00 AFB20018 */  sw        $s2, 0x18($sp)
-/* E08064 80242D04 AFB00010 */  sw        $s0, 0x10($sp)
-/* E08068 80242D08 8E30000C */  lw        $s0, 0xc($s1)
-/* E0806C 80242D0C 8E050000 */  lw        $a1, ($s0)
-/* E08070 80242D10 0C0B1EAF */  jal       get_variable
-/* E08074 80242D14 26100004 */   addiu    $s0, $s0, 4
-/* E08078 80242D18 8E050000 */  lw        $a1, ($s0)
-/* E0807C 80242D1C 26100004 */  addiu     $s0, $s0, 4
-/* E08080 80242D20 0220202D */  daddu     $a0, $s1, $zero
-/* E08084 80242D24 0C0B1EAF */  jal       get_variable
-/* E08088 80242D28 0040902D */   daddu    $s2, $v0, $zero
-/* E0808C 80242D2C 0220202D */  daddu     $a0, $s1, $zero
-/* E08090 80242D30 8E050000 */  lw        $a1, ($s0)
-/* E08094 80242D34 0C0B1EAF */  jal       get_variable
-/* E08098 80242D38 0040802D */   daddu    $s0, $v0, $zero
-/* E0809C 80242D3C 0040882D */  daddu     $s1, $v0, $zero
-/* E080A0 80242D40 2402FFFF */  addiu     $v0, $zero, -1
-/* E080A4 80242D44 16020005 */  bne       $s0, $v0, .L80242D5C
-/* E080A8 80242D48 24020001 */   addiu    $v0, $zero, 1
-/* E080AC 80242D4C 0C04760B */  jal       func_8011D82C
-/* E080B0 80242D50 0220202D */   daddu    $a0, $s1, $zero
-/* E080B4 80242D54 08090B7F */  j         .L80242DFC
-/* E080B8 80242D58 24020002 */   addiu    $v0, $zero, 2
-.L80242D5C:
-/* E080BC 80242D5C 12420018 */  beq       $s2, $v0, .L80242DC0
-/* E080C0 80242D60 2A420002 */   slti     $v0, $s2, 2
-/* E080C4 80242D64 10400005 */  beqz      $v0, .L80242D7C
-/* E080C8 80242D68 24020002 */   addiu    $v0, $zero, 2
-/* E080CC 80242D6C 12400007 */  beqz      $s2, .L80242D8C
-/* E080D0 80242D70 3412FFFF */   ori      $s2, $zero, 0xffff
-/* E080D4 80242D74 08090B7F */  j         .L80242DFC
-/* E080D8 80242D78 00000000 */   nop
-.L80242D7C:
-/* E080DC 80242D7C 1242001B */  beq       $s2, $v0, .L80242DEC
-/* E080E0 80242D80 24020002 */   addiu    $v0, $zero, 2
-/* E080E4 80242D84 08090B7F */  j         .L80242DFC
-/* E080E8 80242D88 00000000 */   nop
-.L80242D8C:
-/* E080EC 80242D8C 8E040000 */  lw        $a0, ($s0)
-/* E080F0 80242D90 1092001A */  beq       $a0, $s2, .L80242DFC
-/* E080F4 80242D94 24020002 */   addiu    $v0, $zero, 2
-/* E080F8 80242D98 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* E080FC 80242D9C 26100004 */   addiu    $s0, $s0, 4
-/* E08100 80242DA0 0C046B4C */  jal       get_model_from_list_index
-/* E08104 80242DA4 0040202D */   daddu    $a0, $v0, $zero
-/* E08108 80242DA8 0040202D */  daddu     $a0, $v0, $zero
-/* E0810C 80242DAC 2405FFFF */  addiu     $a1, $zero, -1
-/* E08110 80242DB0 0C046F1F */  jal       func_8011BC7C
-/* E08114 80242DB4 0220302D */   daddu    $a2, $s1, $zero
-/* E08118 80242DB8 08090B63 */  j         .L80242D8C
-/* E0811C 80242DBC 00000000 */   nop
-.L80242DC0:
-/* E08120 80242DC0 3412FFFF */  ori       $s2, $zero, 0xffff
-.L80242DC4:
-/* E08124 80242DC4 8E020000 */  lw        $v0, ($s0)
-/* E08128 80242DC8 1052000B */  beq       $v0, $s2, .L80242DF8
-/* E0812C 80242DCC 2405FFFF */   addiu    $a1, $zero, -1
-/* E08130 80242DD0 96040002 */  lhu       $a0, 2($s0)
-/* E08134 80242DD4 0220302D */  daddu     $a2, $s1, $zero
-/* E08138 80242DD8 26100004 */  addiu     $s0, $s0, 4
-/* E0813C 80242DDC 0C046E54 */  jal       func_8011B950
-/* E08140 80242DE0 0000382D */   daddu    $a3, $zero, $zero
-/* E08144 80242DE4 08090B71 */  j         .L80242DC4
-/* E08148 80242DE8 00000000 */   nop
-.L80242DEC:
-/* E0814C 80242DEC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* E08150 80242DF0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* E08154 80242DF4 A0510000 */  sb        $s1, ($v0)
-.L80242DF8:
-/* E08158 80242DF8 24020002 */  addiu     $v0, $zero, 2
-.L80242DFC:
-/* E0815C 80242DFC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* E08160 80242E00 8FB20018 */  lw        $s2, 0x18($sp)
-/* E08164 80242E04 8FB10014 */  lw        $s1, 0x14($sp)
-/* E08168 80242E08 8FB00010 */  lw        $s0, 0x10($sp)
-/* E0816C 80242E0C 03E00008 */  jr        $ra
-/* E08170 80242E10 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s b/ver/us/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s
deleted file mode 100644
index 9b58666fc6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242E14_E08174
-/* E08174 80242E14 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* E08178 80242E18 AFB10034 */  sw        $s1, 0x34($sp)
-/* E0817C 80242E1C 0080882D */  daddu     $s1, $a0, $zero
-/* E08180 80242E20 AFBF0054 */  sw        $ra, 0x54($sp)
-/* E08184 80242E24 AFBE0050 */  sw        $fp, 0x50($sp)
-/* E08188 80242E28 AFB7004C */  sw        $s7, 0x4c($sp)
-/* E0818C 80242E2C AFB60048 */  sw        $s6, 0x48($sp)
-/* E08190 80242E30 AFB50044 */  sw        $s5, 0x44($sp)
-/* E08194 80242E34 AFB40040 */  sw        $s4, 0x40($sp)
-/* E08198 80242E38 AFB3003C */  sw        $s3, 0x3c($sp)
-/* E0819C 80242E3C AFB20038 */  sw        $s2, 0x38($sp)
-/* E081A0 80242E40 AFB00030 */  sw        $s0, 0x30($sp)
-/* E081A4 80242E44 8E30000C */  lw        $s0, 0xc($s1)
-/* E081A8 80242E48 8E050000 */  lw        $a1, ($s0)
-/* E081AC 80242E4C 0C0B1EAF */  jal       get_variable
-/* E081B0 80242E50 26100004 */   addiu    $s0, $s0, 4
-/* E081B4 80242E54 8E050000 */  lw        $a1, ($s0)
-/* E081B8 80242E58 26100004 */  addiu     $s0, $s0, 4
-/* E081BC 80242E5C 0220202D */  daddu     $a0, $s1, $zero
-/* E081C0 80242E60 0C0B1EAF */  jal       get_variable
-/* E081C4 80242E64 0040982D */   daddu    $s3, $v0, $zero
-/* E081C8 80242E68 8E050000 */  lw        $a1, ($s0)
-/* E081CC 80242E6C 26100004 */  addiu     $s0, $s0, 4
-/* E081D0 80242E70 0220202D */  daddu     $a0, $s1, $zero
-/* E081D4 80242E74 0C0B1EAF */  jal       get_variable
-/* E081D8 80242E78 0040B02D */   daddu    $s6, $v0, $zero
-/* E081DC 80242E7C 8E050000 */  lw        $a1, ($s0)
-/* E081E0 80242E80 26100004 */  addiu     $s0, $s0, 4
-/* E081E4 80242E84 0220202D */  daddu     $a0, $s1, $zero
-/* E081E8 80242E88 0C0B1EAF */  jal       get_variable
-/* E081EC 80242E8C 0040A82D */   daddu    $s5, $v0, $zero
-/* E081F0 80242E90 8E050000 */  lw        $a1, ($s0)
-/* E081F4 80242E94 26100004 */  addiu     $s0, $s0, 4
-/* E081F8 80242E98 0220202D */  daddu     $a0, $s1, $zero
-/* E081FC 80242E9C 0C0B1EAF */  jal       get_variable
-/* E08200 80242EA0 0040A02D */   daddu    $s4, $v0, $zero
-/* E08204 80242EA4 8E050000 */  lw        $a1, ($s0)
-/* E08208 80242EA8 26100004 */  addiu     $s0, $s0, 4
-/* E0820C 80242EAC 0220202D */  daddu     $a0, $s1, $zero
-/* E08210 80242EB0 0C0B1EAF */  jal       get_variable
-/* E08214 80242EB4 0040902D */   daddu    $s2, $v0, $zero
-/* E08218 80242EB8 8E050000 */  lw        $a1, ($s0)
-/* E0821C 80242EBC 26100004 */  addiu     $s0, $s0, 4
-/* E08220 80242EC0 0220202D */  daddu     $a0, $s1, $zero
-/* E08224 80242EC4 0C0B1EAF */  jal       get_variable
-/* E08228 80242EC8 AFA20028 */   sw       $v0, 0x28($sp)
-/* E0822C 80242ECC 8E050000 */  lw        $a1, ($s0)
-/* E08230 80242ED0 26100004 */  addiu     $s0, $s0, 4
-/* E08234 80242ED4 0220202D */  daddu     $a0, $s1, $zero
-/* E08238 80242ED8 0C0B1EAF */  jal       get_variable
-/* E0823C 80242EDC 0040F02D */   daddu    $fp, $v0, $zero
-/* E08240 80242EE0 8E050000 */  lw        $a1, ($s0)
-/* E08244 80242EE4 26100004 */  addiu     $s0, $s0, 4
-/* E08248 80242EE8 0220202D */  daddu     $a0, $s1, $zero
-/* E0824C 80242EEC 0C0B1EAF */  jal       get_variable
-/* E08250 80242EF0 0040B82D */   daddu    $s7, $v0, $zero
-/* E08254 80242EF4 0220202D */  daddu     $a0, $s1, $zero
-/* E08258 80242EF8 8E050000 */  lw        $a1, ($s0)
-/* E0825C 80242EFC 0C0B1EAF */  jal       get_variable
-/* E08260 80242F00 0040802D */   daddu    $s0, $v0, $zero
-/* E08264 80242F04 0040182D */  daddu     $v1, $v0, $zero
-/* E08268 80242F08 24020002 */  addiu     $v0, $zero, 2
-/* E0826C 80242F0C 12620012 */  beq       $s3, $v0, .L80242F58
-/* E08270 80242F10 2A620003 */   slti     $v0, $s3, 3
-/* E08274 80242F14 10400005 */  beqz      $v0, .L80242F2C
-/* E08278 80242F18 24020001 */   addiu    $v0, $zero, 1
-/* E0827C 80242F1C 12620008 */  beq       $s3, $v0, .L80242F40
-/* E08280 80242F20 32C400FF */   andi     $a0, $s6, 0xff
-/* E08284 80242F24 08090BED */  j         .L80242FB4
-/* E08288 80242F28 00000000 */   nop
-.L80242F2C:
-/* E0828C 80242F2C 24020003 */  addiu     $v0, $zero, 3
-/* E08290 80242F30 12620018 */  beq       $s3, $v0, .L80242F94
-/* E08294 80242F34 32C400FF */   andi     $a0, $s6, 0xff
-/* E08298 80242F38 08090BED */  j         .L80242FB4
-/* E0829C 80242F3C 00000000 */   nop
-.L80242F40:
-/* E082A0 80242F40 32A500FF */  andi      $a1, $s5, 0xff
-/* E082A4 80242F44 328600FF */  andi      $a2, $s4, 0xff
-/* E082A8 80242F48 0C046F97 */  jal       set_background_color_blend
-/* E082AC 80242F4C 324700FF */   andi     $a3, $s2, 0xff
-/* E082B0 80242F50 08090BED */  j         .L80242FB4
-/* E082B4 80242F54 00000000 */   nop
-.L80242F58:
-/* E082B8 80242F58 32C400FF */  andi      $a0, $s6, 0xff
-/* E082BC 80242F5C 32A500FF */  andi      $a1, $s5, 0xff
-/* E082C0 80242F60 328600FF */  andi      $a2, $s4, 0xff
-/* E082C4 80242F64 324700FF */  andi      $a3, $s2, 0xff
-/* E082C8 80242F68 93A2002B */  lbu       $v0, 0x2b($sp)
-/* E082CC 80242F6C AFB0001C */  sw        $s0, 0x1c($sp)
-/* E082D0 80242F70 AFA30020 */  sw        $v1, 0x20($sp)
-/* E082D4 80242F74 AFA20010 */  sw        $v0, 0x10($sp)
-/* E082D8 80242F78 33C200FF */  andi      $v0, $fp, 0xff
-/* E082DC 80242F7C AFA20014 */  sw        $v0, 0x14($sp)
-/* E082E0 80242F80 32E200FF */  andi      $v0, $s7, 0xff
-/* E082E4 80242F84 0C046FAD */  jal       func_8011BEB4
-/* E082E8 80242F88 AFA20018 */   sw       $v0, 0x18($sp)
-/* E082EC 80242F8C 08090BED */  j         .L80242FB4
-/* E082F0 80242F90 00000000 */   nop
-.L80242F94:
-/* E082F4 80242F94 32A500FF */  andi      $a1, $s5, 0xff
-/* E082F8 80242F98 328600FF */  andi      $a2, $s4, 0xff
-/* E082FC 80242F9C 324700FF */  andi      $a3, $s2, 0xff
-/* E08300 80242FA0 93A2002B */  lbu       $v0, 0x2b($sp)
-/* E08304 80242FA4 AFA20010 */  sw        $v0, 0x10($sp)
-/* E08308 80242FA8 33C200FF */  andi      $v0, $fp, 0xff
-/* E0830C 80242FAC 0C046FE6 */  jal       func_8011BF98
-/* E08310 80242FB0 AFA20014 */   sw       $v0, 0x14($sp)
-.L80242FB4:
-/* E08314 80242FB4 8FBF0054 */  lw        $ra, 0x54($sp)
-/* E08318 80242FB8 8FBE0050 */  lw        $fp, 0x50($sp)
-/* E0831C 80242FBC 8FB7004C */  lw        $s7, 0x4c($sp)
-/* E08320 80242FC0 8FB60048 */  lw        $s6, 0x48($sp)
-/* E08324 80242FC4 8FB50044 */  lw        $s5, 0x44($sp)
-/* E08328 80242FC8 8FB40040 */  lw        $s4, 0x40($sp)
-/* E0832C 80242FCC 8FB3003C */  lw        $s3, 0x3c($sp)
-/* E08330 80242FD0 8FB20038 */  lw        $s2, 0x38($sp)
-/* E08334 80242FD4 8FB10034 */  lw        $s1, 0x34($sp)
-/* E08338 80242FD8 8FB00030 */  lw        $s0, 0x30($sp)
-/* E0833C 80242FDC 24020002 */  addiu     $v0, $zero, 2
-/* E08340 80242FE0 03E00008 */  jr        $ra
-/* E08344 80242FE4 27BD0058 */   addiu    $sp, $sp, 0x58
-/* E08348 80242FE8 00000000 */  nop
-/* E0834C 80242FEC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF20/func_80240000_C9DF20.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF20/func_80240000_C9DF20.s
deleted file mode 100644
index a86c7b95c4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF20/func_80240000_C9DF20.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_C9DF20
-/* C9DF20 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* C9DF24 80240004 0000202D */  daddu     $a0, $zero, $zero
-/* C9DF28 80240008 0080282D */  daddu     $a1, $a0, $zero
-/* C9DF2C 8024000C 0080302D */  daddu     $a2, $a0, $zero
-/* C9DF30 80240010 0080382D */  daddu     $a3, $a0, $zero
-/* C9DF34 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* C9DF38 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* C9DF3C 8024001C 0C01CA54 */  jal       func_80072950
-/* C9DF40 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* C9DF44 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* C9DF48 80240028 24020002 */  addiu     $v0, $zero, 2
-/* C9DF4C 8024002C 03E00008 */  jr        $ra
-/* C9DF50 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* C9DF54 80240034 00000000 */  nop
-/* C9DF58 80240038 00000000 */  nop
-/* C9DF5C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s
deleted file mode 100644
index aabee2943d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s
+++ /dev/null
@@ -1,95 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_C9DF60
-/* C9DF60 80240040 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* C9DF64 80240044 AFB50024 */  sw        $s5, 0x24($sp)
-/* C9DF68 80240048 0080A82D */  daddu     $s5, $a0, $zero
-/* C9DF6C 8024004C AFBF002C */  sw        $ra, 0x2c($sp)
-/* C9DF70 80240050 AFB60028 */  sw        $s6, 0x28($sp)
-/* C9DF74 80240054 AFB40020 */  sw        $s4, 0x20($sp)
-/* C9DF78 80240058 AFB3001C */  sw        $s3, 0x1c($sp)
-/* C9DF7C 8024005C AFB20018 */  sw        $s2, 0x18($sp)
-/* C9DF80 80240060 AFB10014 */  sw        $s1, 0x14($sp)
-/* C9DF84 80240064 AFB00010 */  sw        $s0, 0x10($sp)
-/* C9DF88 80240068 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* C9DF8C 8024006C F7B60038 */  sdc1      $f22, 0x38($sp)
-/* C9DF90 80240070 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* C9DF94 80240074 8EB30148 */  lw        $s3, 0x148($s5)
-/* C9DF98 80240078 86640008 */  lh        $a0, 8($s3)
-/* C9DF9C 8024007C 0C00EABB */  jal       get_npc_unsafe
-/* C9DFA0 80240080 00A0B02D */   daddu    $s6, $a1, $zero
-/* C9DFA4 80240084 0040A02D */  daddu     $s4, $v0, $zero
-/* C9DFA8 80240088 AEA00074 */  sw        $zero, 0x74($s5)
-/* C9DFAC 8024008C C6980038 */  lwc1      $f24, 0x38($s4)
-/* C9DFB0 80240090 C6960040 */  lwc1      $f22, 0x40($s4)
-/* C9DFB4 80240094 0000902D */  daddu     $s2, $zero, $zero
-/* C9DFB8 80240098 AEA00078 */  sw        $zero, 0x78($s5)
-/* C9DFBC 8024009C 8E6300D0 */  lw        $v1, 0xd0($s3)
-/* C9DFC0 802400A0 8C620000 */  lw        $v0, ($v1)
-/* C9DFC4 802400A4 3C0146FF */  lui       $at, 0x46ff
-/* C9DFC8 802400A8 3421FE00 */  ori       $at, $at, 0xfe00
-/* C9DFCC 802400AC 4481A000 */  mtc1      $at, $f20
-/* C9DFD0 802400B0 18400018 */  blez      $v0, .L80240114
-/* C9DFD4 802400B4 0240802D */   daddu    $s0, $s2, $zero
-/* C9DFD8 802400B8 0240882D */  daddu     $s1, $s2, $zero
-.L802400BC:
-/* C9DFDC 802400BC 02231021 */  addu      $v0, $s1, $v1
-/* C9DFE0 802400C0 4600C306 */  mov.s     $f12, $f24
-/* C9DFE4 802400C4 C4440004 */  lwc1      $f4, 4($v0)
-/* C9DFE8 802400C8 46802120 */  cvt.s.w   $f4, $f4
-/* C9DFEC 802400CC 44062000 */  mfc1      $a2, $f4
-/* C9DFF0 802400D0 C444000C */  lwc1      $f4, 0xc($v0)
-/* C9DFF4 802400D4 46802120 */  cvt.s.w   $f4, $f4
-/* C9DFF8 802400D8 44072000 */  mfc1      $a3, $f4
-/* C9DFFC 802400DC 0C00A7B5 */  jal       dist2D
-/* C9E000 802400E0 4600B386 */   mov.s    $f14, $f22
-/* C9E004 802400E4 4614003C */  c.lt.s    $f0, $f20
-/* C9E008 802400E8 00000000 */  nop
-/* C9E00C 802400EC 45000003 */  bc1f      .L802400FC
-/* C9E010 802400F0 2631000C */   addiu    $s1, $s1, 0xc
-/* C9E014 802400F4 46000506 */  mov.s     $f20, $f0
-/* C9E018 802400F8 AEB20078 */  sw        $s2, 0x78($s5)
-.L802400FC:
-/* C9E01C 802400FC 8E6300D0 */  lw        $v1, 0xd0($s3)
-/* C9E020 80240100 26100001 */  addiu     $s0, $s0, 1
-/* C9E024 80240104 8C620000 */  lw        $v0, ($v1)
-/* C9E028 80240108 0202102A */  slt       $v0, $s0, $v0
-/* C9E02C 8024010C 1440FFEB */  bnez      $v0, .L802400BC
-/* C9E030 80240110 26520001 */   addiu    $s2, $s2, 1
-.L80240114:
-/* C9E034 80240114 8E6200CC */  lw        $v0, 0xcc($s3)
-/* C9E038 80240118 8C420004 */  lw        $v0, 4($v0)
-/* C9E03C 8024011C AE820028 */  sw        $v0, 0x28($s4)
-/* C9E040 80240120 8E6200D0 */  lw        $v0, 0xd0($s3)
-/* C9E044 80240124 8C42007C */  lw        $v0, 0x7c($v0)
-/* C9E048 80240128 04410004 */  bgez      $v0, .L8024013C
-/* C9E04C 8024012C 00000000 */   nop
-/* C9E050 80240130 C6C00000 */  lwc1      $f0, ($s6)
-/* C9E054 80240134 08090057 */  j         .L8024015C
-/* C9E058 80240138 E6800018 */   swc1     $f0, 0x18($s4)
-.L8024013C:
-/* C9E05C 8024013C 3C018025 */  lui       $at, %hi(D_802491C0_CA70E0)
-/* C9E060 80240140 D42291C0 */  ldc1      $f2, %lo(D_802491C0_CA70E0)($at)
-/* C9E064 80240144 44820000 */  mtc1      $v0, $f0
-/* C9E068 80240148 00000000 */  nop
-/* C9E06C 8024014C 46800021 */  cvt.d.w   $f0, $f0
-/* C9E070 80240150 46220003 */  div.d     $f0, $f0, $f2
-/* C9E074 80240154 46200020 */  cvt.s.d   $f0, $f0
-/* C9E078 80240158 E6800018 */  swc1      $f0, 0x18($s4)
-.L8024015C:
-/* C9E07C 8024015C 24020001 */  addiu     $v0, $zero, 1
-/* C9E080 80240160 AEA20070 */  sw        $v0, 0x70($s5)
-/* C9E084 80240164 8FBF002C */  lw        $ra, 0x2c($sp)
-/* C9E088 80240168 8FB60028 */  lw        $s6, 0x28($sp)
-/* C9E08C 8024016C 8FB50024 */  lw        $s5, 0x24($sp)
-/* C9E090 80240170 8FB40020 */  lw        $s4, 0x20($sp)
-/* C9E094 80240174 8FB3001C */  lw        $s3, 0x1c($sp)
-/* C9E098 80240178 8FB20018 */  lw        $s2, 0x18($sp)
-/* C9E09C 8024017C 8FB10014 */  lw        $s1, 0x14($sp)
-/* C9E0A0 80240180 8FB00010 */  lw        $s0, 0x10($sp)
-/* C9E0A4 80240184 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* C9E0A8 80240188 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* C9E0AC 8024018C D7B40030 */  ldc1      $f20, 0x30($sp)
-/* C9E0B0 80240190 03E00008 */  jr        $ra
-/* C9E0B4 80240194 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s
deleted file mode 100644
index 5bf9372fb2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406BC_C9E5DC
-/* C9E5DC 802406BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* C9E5E0 802406C0 AFB10014 */  sw        $s1, 0x14($sp)
-/* C9E5E4 802406C4 0080882D */  daddu     $s1, $a0, $zero
-/* C9E5E8 802406C8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* C9E5EC 802406CC AFB20018 */  sw        $s2, 0x18($sp)
-/* C9E5F0 802406D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* C9E5F4 802406D4 8E300148 */  lw        $s0, 0x148($s1)
-/* C9E5F8 802406D8 86040008 */  lh        $a0, 8($s0)
-/* C9E5FC 802406DC 0C00EABB */  jal       get_npc_unsafe
-/* C9E600 802406E0 00A0902D */   daddu    $s2, $a1, $zero
-/* C9E604 802406E4 8E230078 */  lw        $v1, 0x78($s1)
-/* C9E608 802406E8 24630001 */  addiu     $v1, $v1, 1
-/* C9E60C 802406EC AE230078 */  sw        $v1, 0x78($s1)
-/* C9E610 802406F0 8E0400D0 */  lw        $a0, 0xd0($s0)
-/* C9E614 802406F4 8C840000 */  lw        $a0, ($a0)
-/* C9E618 802406F8 0064182A */  slt       $v1, $v1, $a0
-/* C9E61C 802406FC 14600002 */  bnez      $v1, .L80240708
-/* C9E620 80240700 0040282D */   daddu    $a1, $v0, $zero
-/* C9E624 80240704 AE200078 */  sw        $zero, 0x78($s1)
-.L80240708:
-/* C9E628 80240708 8E0200CC */  lw        $v0, 0xcc($s0)
-/* C9E62C 8024070C 8C420004 */  lw        $v0, 4($v0)
-/* C9E630 80240710 ACA20028 */  sw        $v0, 0x28($a1)
-/* C9E634 80240714 8E0200D0 */  lw        $v0, 0xd0($s0)
-/* C9E638 80240718 8C42007C */  lw        $v0, 0x7c($v0)
-/* C9E63C 8024071C 04410004 */  bgez      $v0, .L80240730
-/* C9E640 80240720 00000000 */   nop
-/* C9E644 80240724 C6400000 */  lwc1      $f0, ($s2)
-/* C9E648 80240728 080901D4 */  j         .L80240750
-/* C9E64C 8024072C E4A00018 */   swc1     $f0, 0x18($a1)
-.L80240730:
-/* C9E650 80240730 3C018025 */  lui       $at, %hi(D_802491C8_CA70E8)
-/* C9E654 80240734 D42291C8 */  ldc1      $f2, %lo(D_802491C8_CA70E8)($at)
-/* C9E658 80240738 44820000 */  mtc1      $v0, $f0
-/* C9E65C 8024073C 00000000 */  nop
-/* C9E660 80240740 46800021 */  cvt.d.w   $f0, $f0
-/* C9E664 80240744 46220003 */  div.d     $f0, $f0, $f2
-/* C9E668 80240748 46200020 */  cvt.s.d   $f0, $f0
-/* C9E66C 8024074C E4A00018 */  swc1      $f0, 0x18($a1)
-.L80240750:
-/* C9E670 80240750 24020001 */  addiu     $v0, $zero, 1
-/* C9E674 80240754 AE220070 */  sw        $v0, 0x70($s1)
-/* C9E678 80240758 8FBF001C */  lw        $ra, 0x1c($sp)
-/* C9E67C 8024075C 8FB20018 */  lw        $s2, 0x18($sp)
-/* C9E680 80240760 8FB10014 */  lw        $s1, 0x14($sp)
-/* C9E684 80240764 8FB00010 */  lw        $s0, 0x10($sp)
-/* C9E688 80240768 03E00008 */  jr        $ra
-/* C9E68C 8024076C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s
deleted file mode 100644
index 3d30b852b1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s
+++ /dev/null
@@ -1,214 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BD4_C9EAF4
-/* C9EAF4 80240BD4 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* C9EAF8 80240BD8 AFB40058 */  sw        $s4, 0x58($sp)
-/* C9EAFC 80240BDC 0080A02D */  daddu     $s4, $a0, $zero
-/* C9EB00 80240BE0 AFBF0060 */  sw        $ra, 0x60($sp)
-/* C9EB04 80240BE4 AFB5005C */  sw        $s5, 0x5c($sp)
-/* C9EB08 80240BE8 AFB30054 */  sw        $s3, 0x54($sp)
-/* C9EB0C 80240BEC AFB20050 */  sw        $s2, 0x50($sp)
-/* C9EB10 80240BF0 AFB1004C */  sw        $s1, 0x4c($sp)
-/* C9EB14 80240BF4 AFB00048 */  sw        $s0, 0x48($sp)
-/* C9EB18 80240BF8 8E910148 */  lw        $s1, 0x148($s4)
-/* C9EB1C 80240BFC 86240008 */  lh        $a0, 8($s1)
-/* C9EB20 80240C00 0C00EABB */  jal       get_npc_unsafe
-/* C9EB24 80240C04 00A0802D */   daddu    $s0, $a1, $zero
-/* C9EB28 80240C08 8E83000C */  lw        $v1, 0xc($s4)
-/* C9EB2C 80240C0C 0280202D */  daddu     $a0, $s4, $zero
-/* C9EB30 80240C10 8C650000 */  lw        $a1, ($v1)
-/* C9EB34 80240C14 0C0B1EAF */  jal       get_variable
-/* C9EB38 80240C18 0040902D */   daddu    $s2, $v0, $zero
-/* C9EB3C 80240C1C AFA00018 */  sw        $zero, 0x18($sp)
-/* C9EB40 80240C20 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* C9EB44 80240C24 8C630094 */  lw        $v1, 0x94($v1)
-/* C9EB48 80240C28 AFA3001C */  sw        $v1, 0x1c($sp)
-/* C9EB4C 80240C2C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* C9EB50 80240C30 8C630080 */  lw        $v1, 0x80($v1)
-/* C9EB54 80240C34 AFA30020 */  sw        $v1, 0x20($sp)
-/* C9EB58 80240C38 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* C9EB5C 80240C3C 8C630088 */  lw        $v1, 0x88($v1)
-/* C9EB60 80240C40 AFA30024 */  sw        $v1, 0x24($sp)
-/* C9EB64 80240C44 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* C9EB68 80240C48 8C63008C */  lw        $v1, 0x8c($v1)
-/* C9EB6C 80240C4C 27B50018 */  addiu     $s5, $sp, 0x18
-/* C9EB70 80240C50 AFA30028 */  sw        $v1, 0x28($sp)
-/* C9EB74 80240C54 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* C9EB78 80240C58 3C014282 */  lui       $at, 0x4282
-/* C9EB7C 80240C5C 44810000 */  mtc1      $at, $f0
-/* C9EB80 80240C60 8C630090 */  lw        $v1, 0x90($v1)
-/* C9EB84 80240C64 0040982D */  daddu     $s3, $v0, $zero
-/* C9EB88 80240C68 E7A00030 */  swc1      $f0, 0x30($sp)
-/* C9EB8C 80240C6C A7A00034 */  sh        $zero, 0x34($sp)
-/* C9EB90 80240C70 16000005 */  bnez      $s0, .L80240C88
-/* C9EB94 80240C74 AFA3002C */   sw       $v1, 0x2c($sp)
-/* C9EB98 80240C78 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* C9EB9C 80240C7C 30420004 */  andi      $v0, $v0, 4
-/* C9EBA0 80240C80 10400044 */  beqz      $v0, .L80240D94
-/* C9EBA4 80240C84 00000000 */   nop
-.L80240C88:
-/* C9EBA8 80240C88 2404F7FF */  addiu     $a0, $zero, -0x801
-/* C9EBAC 80240C8C AE800070 */  sw        $zero, 0x70($s4)
-/* C9EBB0 80240C90 A640008E */  sh        $zero, 0x8e($s2)
-/* C9EBB4 80240C94 8E2200CC */  lw        $v0, 0xcc($s1)
-/* C9EBB8 80240C98 8E430000 */  lw        $v1, ($s2)
-/* C9EBBC 80240C9C 8C420000 */  lw        $v0, ($v0)
-/* C9EBC0 80240CA0 00641824 */  and       $v1, $v1, $a0
-/* C9EBC4 80240CA4 AE430000 */  sw        $v1, ($s2)
-/* C9EBC8 80240CA8 AE420028 */  sw        $v0, 0x28($s2)
-/* C9EBCC 80240CAC 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* C9EBD0 80240CB0 8C420098 */  lw        $v0, 0x98($v0)
-/* C9EBD4 80240CB4 54400005 */  bnel      $v0, $zero, .L80240CCC
-/* C9EBD8 80240CB8 2402FDFF */   addiu    $v0, $zero, -0x201
-/* C9EBDC 80240CBC 34620200 */  ori       $v0, $v1, 0x200
-/* C9EBE0 80240CC0 2403FFF7 */  addiu     $v1, $zero, -9
-/* C9EBE4 80240CC4 08090335 */  j         .L80240CD4
-/* C9EBE8 80240CC8 00431024 */   and      $v0, $v0, $v1
-.L80240CCC:
-/* C9EBEC 80240CCC 00621024 */  and       $v0, $v1, $v0
-/* C9EBF0 80240CD0 34420008 */  ori       $v0, $v0, 8
-.L80240CD4:
-/* C9EBF4 80240CD4 AE420000 */  sw        $v0, ($s2)
-/* C9EBF8 80240CD8 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* C9EBFC 80240CDC 30420004 */  andi      $v0, $v0, 4
-/* C9EC00 80240CE0 10400008 */  beqz      $v0, .L80240D04
-/* C9EC04 80240CE4 24020063 */   addiu    $v0, $zero, 0x63
-/* C9EC08 80240CE8 AE820070 */  sw        $v0, 0x70($s4)
-/* C9EC0C 80240CEC AE800074 */  sw        $zero, 0x74($s4)
-/* C9EC10 80240CF0 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* C9EC14 80240CF4 2403FFFB */  addiu     $v1, $zero, -5
-/* C9EC18 80240CF8 00431024 */  and       $v0, $v0, $v1
-/* C9EC1C 80240CFC 0809034C */  j         .L80240D30
-/* C9EC20 80240D00 AE2200B0 */   sw       $v0, 0xb0($s1)
-.L80240D04:
-/* C9EC24 80240D04 8E220000 */  lw        $v0, ($s1)
-/* C9EC28 80240D08 3C034000 */  lui       $v1, 0x4000
-/* C9EC2C 80240D0C 00431024 */  and       $v0, $v0, $v1
-/* C9EC30 80240D10 10400007 */  beqz      $v0, .L80240D30
-/* C9EC34 80240D14 3C03BFFF */   lui      $v1, 0xbfff
-/* C9EC38 80240D18 2402000C */  addiu     $v0, $zero, 0xc
-/* C9EC3C 80240D1C AE820070 */  sw        $v0, 0x70($s4)
-/* C9EC40 80240D20 8E220000 */  lw        $v0, ($s1)
-/* C9EC44 80240D24 3463FFFF */  ori       $v1, $v1, 0xffff
-/* C9EC48 80240D28 00431024 */  and       $v0, $v0, $v1
-/* C9EC4C 80240D2C AE220000 */  sw        $v0, ($s1)
-.L80240D30:
-/* C9EC50 80240D30 27A50038 */  addiu     $a1, $sp, 0x38
-/* C9EC54 80240D34 27A6003C */  addiu     $a2, $sp, 0x3c
-/* C9EC58 80240D38 C6400038 */  lwc1      $f0, 0x38($s2)
-/* C9EC5C 80240D3C 864200A8 */  lh        $v0, 0xa8($s2)
-/* C9EC60 80240D40 3C0142C8 */  lui       $at, 0x42c8
-/* C9EC64 80240D44 44812000 */  mtc1      $at, $f4
-/* C9EC68 80240D48 44823000 */  mtc1      $v0, $f6
-/* C9EC6C 80240D4C 00000000 */  nop
-/* C9EC70 80240D50 468031A0 */  cvt.s.w   $f6, $f6
-/* C9EC74 80240D54 27A20044 */  addiu     $v0, $sp, 0x44
-/* C9EC78 80240D58 E7A00038 */  swc1      $f0, 0x38($sp)
-/* C9EC7C 80240D5C C640003C */  lwc1      $f0, 0x3c($s2)
-/* C9EC80 80240D60 C6420040 */  lwc1      $f2, 0x40($s2)
-/* C9EC84 80240D64 46060000 */  add.s     $f0, $f0, $f6
-/* C9EC88 80240D68 E7A40044 */  swc1      $f4, 0x44($sp)
-/* C9EC8C 80240D6C E7A20040 */  swc1      $f2, 0x40($sp)
-/* C9EC90 80240D70 E7A0003C */  swc1      $f0, 0x3c($sp)
-/* C9EC94 80240D74 AFA20010 */  sw        $v0, 0x10($sp)
-/* C9EC98 80240D78 8E440080 */  lw        $a0, 0x80($s2)
-/* C9EC9C 80240D7C 0C0372DF */  jal       func_800DCB7C
-/* C9ECA0 80240D80 27A70040 */   addiu    $a3, $sp, 0x40
-/* C9ECA4 80240D84 10400003 */  beqz      $v0, .L80240D94
-/* C9ECA8 80240D88 00000000 */   nop
-/* C9ECAC 80240D8C C7A0003C */  lwc1      $f0, 0x3c($sp)
-/* C9ECB0 80240D90 E640003C */  swc1      $f0, 0x3c($s2)
-.L80240D94:
-/* C9ECB4 80240D94 8E830070 */  lw        $v1, 0x70($s4)
-/* C9ECB8 80240D98 2C620064 */  sltiu     $v0, $v1, 0x64
-/* C9ECBC 80240D9C 10400042 */  beqz      $v0, L80240EA8_C9EDC8
-/* C9ECC0 80240DA0 00031080 */   sll      $v0, $v1, 2
-/* C9ECC4 80240DA4 3C018025 */  lui       $at, %hi(jtbl_802491D0_CA70F0)
-/* C9ECC8 80240DA8 00220821 */  addu      $at, $at, $v0
-/* C9ECCC 80240DAC 8C2291D0 */  lw        $v0, %lo(jtbl_802491D0_CA70F0)($at)
-/* C9ECD0 80240DB0 00400008 */  jr        $v0
-/* C9ECD4 80240DB4 00000000 */   nop
-glabel L80240DB8_C9ECD8
-/* C9ECD8 80240DB8 0280202D */  daddu     $a0, $s4, $zero
-/* C9ECDC 80240DBC 0260282D */  daddu     $a1, $s3, $zero
-/* C9ECE0 80240DC0 0C090010 */  jal       func_80240040_C9DF60
-/* C9ECE4 80240DC4 02A0302D */   daddu    $a2, $s5, $zero
-glabel L80240DC8_C9ECE8
-/* C9ECE8 80240DC8 0280202D */  daddu     $a0, $s4, $zero
-/* C9ECEC 80240DCC 0260282D */  daddu     $a1, $s3, $zero
-/* C9ECF0 80240DD0 0C090066 */  jal       flo_00_UnkFunc13
-/* C9ECF4 80240DD4 02A0302D */   daddu    $a2, $s5, $zero
-/* C9ECF8 80240DD8 080903AA */  j         L80240EA8_C9EDC8
-/* C9ECFC 80240DDC 00000000 */   nop
-glabel L80240DE0_C9ED00
-/* C9ED00 80240DE0 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED04 80240DE4 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED08 80240DE8 0C090110 */  jal       flo_00_UnkNpcAIFunc1
-/* C9ED0C 80240DEC 02A0302D */   daddu    $a2, $s5, $zero
-glabel L80240DF0_C9ED10
-/* C9ED10 80240DF0 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED14 80240DF4 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED18 80240DF8 0C090140 */  jal       flo_00_UnkFunc14
-/* C9ED1C 80240DFC 02A0302D */   daddu    $a2, $s5, $zero
-/* C9ED20 80240E00 080903AA */  j         L80240EA8_C9EDC8
-/* C9ED24 80240E04 00000000 */   nop
-glabel L80240E08_C9ED28
-/* C9ED28 80240E08 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED2C 80240E0C 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED30 80240E10 0C0901AF */  jal       func_802406BC_C9E5DC
-/* C9ED34 80240E14 02A0302D */   daddu    $a2, $s5, $zero
-/* C9ED38 80240E18 080903AA */  j         L80240EA8_C9EDC8
-/* C9ED3C 80240E1C 00000000 */   nop
-glabel L80240E20_C9ED40
-/* C9ED40 80240E20 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED44 80240E24 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED48 80240E28 0C0901DC */  jal       flo_00_NpcJumpFunc2
-/* C9ED4C 80240E2C 02A0302D */   daddu    $a2, $s5, $zero
-glabel L80240E30_C9ED50
-/* C9ED50 80240E30 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED54 80240E34 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED58 80240E38 0C0901F9 */  jal       flo_00_NpcJumpFunc
-/* C9ED5C 80240E3C 02A0302D */   daddu    $a2, $s5, $zero
-/* C9ED60 80240E40 080903AA */  j         L80240EA8_C9EDC8
-/* C9ED64 80240E44 00000000 */   nop
-glabel L80240E48_C9ED68
-/* C9ED68 80240E48 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED6C 80240E4C 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED70 80240E50 0C090217 */  jal       flo_00_UnkNpcAIFunc13
-/* C9ED74 80240E54 02A0302D */   daddu    $a2, $s5, $zero
-glabel L80240E58_C9ED78
-/* C9ED78 80240E58 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED7C 80240E5C 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED80 80240E60 0C090263 */  jal       flo_00_UnkFunc15
-/* C9ED84 80240E64 02A0302D */   daddu    $a2, $s5, $zero
-/* C9ED88 80240E68 080903AA */  j         L80240EA8_C9EDC8
-/* C9ED8C 80240E6C 00000000 */   nop
-glabel L80240E70_C9ED90
-/* C9ED90 80240E70 0280202D */  daddu     $a0, $s4, $zero
-/* C9ED94 80240E74 0260282D */  daddu     $a1, $s3, $zero
-/* C9ED98 80240E78 0C0902AB */  jal       flo_00_UnkNpcDurationFlagFunc
-/* C9ED9C 80240E7C 02A0302D */   daddu    $a2, $s5, $zero
-/* C9EDA0 80240E80 080903AA */  j         L80240EA8_C9EDC8
-/* C9EDA4 80240E84 00000000 */   nop
-glabel L80240E88_C9EDA8
-/* C9EDA8 80240E88 0280202D */  daddu     $a0, $s4, $zero
-/* C9EDAC 80240E8C 0260282D */  daddu     $a1, $s3, $zero
-/* C9EDB0 80240E90 0C0902C5 */  jal       flo_00_UnkFunc16
-/* C9EDB4 80240E94 02A0302D */   daddu    $a2, $s5, $zero
-/* C9EDB8 80240E98 080903AA */  j         L80240EA8_C9EDC8
-/* C9EDBC 80240E9C 00000000 */   nop
-glabel L80240EA0_C9EDC0
-/* C9EDC0 80240EA0 0C0129CF */  jal       func_8004A73C
-/* C9EDC4 80240EA4 0280202D */   daddu    $a0, $s4, $zero
-glabel L80240EA8_C9EDC8
-/* C9EDC8 80240EA8 8FBF0060 */  lw        $ra, 0x60($sp)
-/* C9EDCC 80240EAC 8FB5005C */  lw        $s5, 0x5c($sp)
-/* C9EDD0 80240EB0 8FB40058 */  lw        $s4, 0x58($sp)
-/* C9EDD4 80240EB4 8FB30054 */  lw        $s3, 0x54($sp)
-/* C9EDD8 80240EB8 8FB20050 */  lw        $s2, 0x50($sp)
-/* C9EDDC 80240EBC 8FB1004C */  lw        $s1, 0x4c($sp)
-/* C9EDE0 80240EC0 8FB00048 */  lw        $s0, 0x48($sp)
-/* C9EDE4 80240EC4 0000102D */  daddu     $v0, $zero, $zero
-/* C9EDE8 80240EC8 03E00008 */  jr        $ra
-/* C9EDEC 80240ECC 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F10_C9EE30.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F10_C9EE30.s
deleted file mode 100644
index e1c9689626..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F10_C9EE30.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F10_C9EE30
-/* C9EE30 80240F10 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* C9EE34 80240F14 AFB00010 */  sw        $s0, 0x10($sp)
-/* C9EE38 80240F18 0080802D */  daddu     $s0, $a0, $zero
-/* C9EE3C 80240F1C AFB20018 */  sw        $s2, 0x18($sp)
-/* C9EE40 80240F20 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* C9EE44 80240F24 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* C9EE48 80240F28 AFBF001C */  sw        $ra, 0x1c($sp)
-/* C9EE4C 80240F2C AFB10014 */  sw        $s1, 0x14($sp)
-/* C9EE50 80240F30 C64000A8 */  lwc1      $f0, 0xa8($s2)
-/* C9EE54 80240F34 8E02000C */  lw        $v0, 0xc($s0)
-/* C9EE58 80240F38 4600008D */  trunc.w.s $f2, $f0
-/* C9EE5C 80240F3C 44061000 */  mfc1      $a2, $f2
-/* C9EE60 80240F40 8C450000 */  lw        $a1, ($v0)
-/* C9EE64 80240F44 0C0B2026 */  jal       set_variable
-/* C9EE68 80240F48 8C510004 */   lw       $s1, 4($v0)
-/* C9EE6C 80240F4C 0200202D */  daddu     $a0, $s0, $zero
-/* C9EE70 80240F50 C6400080 */  lwc1      $f0, 0x80($s2)
-/* C9EE74 80240F54 4600008D */  trunc.w.s $f2, $f0
-/* C9EE78 80240F58 44061000 */  mfc1      $a2, $f2
-/* C9EE7C 80240F5C 0C0B2026 */  jal       set_variable
-/* C9EE80 80240F60 0220282D */   daddu    $a1, $s1, $zero
-/* C9EE84 80240F64 8FBF001C */  lw        $ra, 0x1c($sp)
-/* C9EE88 80240F68 8FB20018 */  lw        $s2, 0x18($sp)
-/* C9EE8C 80240F6C 8FB10014 */  lw        $s1, 0x14($sp)
-/* C9EE90 80240F70 8FB00010 */  lw        $s0, 0x10($sp)
-/* C9EE94 80240F74 24020002 */  addiu     $v0, $zero, 2
-/* C9EE98 80240F78 03E00008 */  jr        $ra
-/* C9EE9C 80240F7C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F80_C9EEA0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F80_C9EEA0.s
deleted file mode 100644
index 9ad4978354..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_80240F80_C9EEA0.s
+++ /dev/null
@@ -1,81 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F80_C9EEA0
-/* C9EEA0 80240F80 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* C9EEA4 80240F84 AFB00010 */  sw        $s0, 0x10($sp)
-/* C9EEA8 80240F88 0080802D */  daddu     $s0, $a0, $zero
-/* C9EEAC 80240F8C AFBF0018 */  sw        $ra, 0x18($sp)
-/* C9EEB0 80240F90 AFB10014 */  sw        $s1, 0x14($sp)
-/* C9EEB4 80240F94 F7BA0038 */  sdc1      $f26, 0x38($sp)
-/* C9EEB8 80240F98 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* C9EEBC 80240F9C F7B60028 */  sdc1      $f22, 0x28($sp)
-/* C9EEC0 80240FA0 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* C9EEC4 80240FA4 8E05008C */  lw        $a1, 0x8c($s0)
-/* C9EEC8 80240FA8 0C0B1EAF */  jal       get_variable
-/* C9EECC 80240FAC 0000202D */   daddu    $a0, $zero, $zero
-/* C9EED0 80240FB0 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* C9EED4 80240FB4 468010A0 */  cvt.s.w   $f2, $f2
-/* C9EED8 80240FB8 44061000 */  mfc1      $a2, $f2
-/* C9EEDC 80240FBC C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* C9EEE0 80240FC0 468010A0 */  cvt.s.w   $f2, $f2
-/* C9EEE4 80240FC4 4482A000 */  mtc1      $v0, $f20
-/* C9EEE8 80240FC8 00000000 */  nop
-/* C9EEEC 80240FCC 4680A520 */  cvt.s.w   $f20, $f20
-/* C9EEF0 80240FD0 3C01C2A6 */  lui       $at, 0xc2a6
-/* C9EEF4 80240FD4 4481C000 */  mtc1      $at, $f24
-/* C9EEF8 80240FD8 3C0142AE */  lui       $at, 0x42ae
-/* C9EEFC 80240FDC 4481D000 */  mtc1      $at, $f26
-/* C9EF00 80240FE0 44071000 */  mfc1      $a3, $f2
-/* C9EF04 80240FE4 4600C306 */  mov.s     $f12, $f24
-/* C9EF08 80240FE8 0C00A7B5 */  jal       dist2D
-/* C9EF0C 80240FEC 4600D386 */   mov.s    $f14, $f26
-/* C9EF10 80240FF0 4600C306 */  mov.s     $f12, $f24
-/* C9EF14 80240FF4 4600D386 */  mov.s     $f14, $f26
-/* C9EF18 80240FF8 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* C9EF1C 80240FFC 468010A0 */  cvt.s.w   $f2, $f2
-/* C9EF20 80241000 44061000 */  mfc1      $a2, $f2
-/* C9EF24 80241004 C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* C9EF28 80241008 468010A0 */  cvt.s.w   $f2, $f2
-/* C9EF2C 8024100C 44071000 */  mfc1      $a3, $f2
-/* C9EF30 80241010 0C00A720 */  jal       atan2
-/* C9EF34 80241014 46000586 */   mov.s    $f22, $f0
-/* C9EF38 80241018 0C00A6C9 */  jal       clamp_angle
-/* C9EF3C 8024101C 46140301 */   sub.s    $f12, $f0, $f20
-/* C9EF40 80241020 46000506 */  mov.s     $f20, $f0
-/* C9EF44 80241024 0C00A8BB */  jal       sin_deg
-/* C9EF48 80241028 4600A306 */   mov.s    $f12, $f20
-/* C9EF4C 8024102C 4600B002 */  mul.s     $f0, $f22, $f0
-/* C9EF50 80241030 00000000 */  nop
-/* C9EF54 80241034 46180000 */  add.s     $f0, $f0, $f24
-/* C9EF58 80241038 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* C9EF5C 8024103C 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* C9EF60 80241040 E6200028 */  swc1      $f0, 0x28($s1)
-/* C9EF64 80241044 8E0500AC */  lw        $a1, 0xac($s0)
-/* C9EF68 80241048 0C0B1EAF */  jal       get_variable
-/* C9EF6C 8024104C 0000202D */   daddu    $a0, $zero, $zero
-/* C9EF70 80241050 0000202D */  daddu     $a0, $zero, $zero
-/* C9EF74 80241054 8E050090 */  lw        $a1, 0x90($s0)
-/* C9EF78 80241058 0C0B1EAF */  jal       get_variable
-/* C9EF7C 8024105C 0040802D */   daddu    $s0, $v0, $zero
-/* C9EF80 80241060 4600A306 */  mov.s     $f12, $f20
-/* C9EF84 80241064 02028021 */  addu      $s0, $s0, $v0
-/* C9EF88 80241068 44900000 */  mtc1      $s0, $f0
-/* C9EF8C 8024106C 00000000 */  nop
-/* C9EF90 80241070 46800020 */  cvt.s.w   $f0, $f0
-/* C9EF94 80241074 0C00A8D4 */  jal       cos_deg
-/* C9EF98 80241078 E620002C */   swc1     $f0, 0x2c($s1)
-/* C9EF9C 8024107C 4600B582 */  mul.s     $f22, $f22, $f0
-/* C9EFA0 80241080 00000000 */  nop
-/* C9EFA4 80241084 4616D681 */  sub.s     $f26, $f26, $f22
-/* C9EFA8 80241088 E63A0030 */  swc1      $f26, 0x30($s1)
-/* C9EFAC 8024108C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* C9EFB0 80241090 8FB10014 */  lw        $s1, 0x14($sp)
-/* C9EFB4 80241094 8FB00010 */  lw        $s0, 0x10($sp)
-/* C9EFB8 80241098 D7BA0038 */  ldc1      $f26, 0x38($sp)
-/* C9EFBC 8024109C D7B80030 */  ldc1      $f24, 0x30($sp)
-/* C9EFC0 802410A0 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* C9EFC4 802410A4 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* C9EFC8 802410A8 24020002 */  addiu     $v0, $zero, 2
-/* C9EFCC 802410AC 03E00008 */  jr        $ra
-/* C9EFD0 802410B0 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802410B4_C9EFD4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802410B4_C9EFD4.s
deleted file mode 100644
index 1575cecfbe..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802410B4_C9EFD4.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802410B4_C9EFD4
-/* C9EFD4 802410B4 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* C9EFD8 802410B8 AFB00010 */  sw        $s0, 0x10($sp)
-/* C9EFDC 802410BC 0080802D */  daddu     $s0, $a0, $zero
-/* C9EFE0 802410C0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* C9EFE4 802410C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* C9EFE8 802410C8 F7BA0038 */  sdc1      $f26, 0x38($sp)
-/* C9EFEC 802410CC F7B80030 */  sdc1      $f24, 0x30($sp)
-/* C9EFF0 802410D0 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* C9EFF4 802410D4 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* C9EFF8 802410D8 0C00E2B7 */  jal       get_npc_by_index
-/* C9EFFC 802410DC 0000202D */   daddu    $a0, $zero, $zero
-/* C9F000 802410E0 0000202D */  daddu     $a0, $zero, $zero
-/* C9F004 802410E4 8E05008C */  lw        $a1, 0x8c($s0)
-/* C9F008 802410E8 0C0B1EAF */  jal       get_variable
-/* C9F00C 802410EC 0040882D */   daddu    $s1, $v0, $zero
-/* C9F010 802410F0 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* C9F014 802410F4 468010A0 */  cvt.s.w   $f2, $f2
-/* C9F018 802410F8 44061000 */  mfc1      $a2, $f2
-/* C9F01C 802410FC C60200BC */  lwc1      $f2, 0xbc($s0)
-/* C9F020 80241100 468010A0 */  cvt.s.w   $f2, $f2
-/* C9F024 80241104 4482A000 */  mtc1      $v0, $f20
-/* C9F028 80241108 00000000 */  nop
-/* C9F02C 8024110C 4680A520 */  cvt.s.w   $f20, $f20
-/* C9F030 80241110 3C01C2A6 */  lui       $at, 0xc2a6
-/* C9F034 80241114 4481C000 */  mtc1      $at, $f24
-/* C9F038 80241118 3C0142AE */  lui       $at, 0x42ae
-/* C9F03C 8024111C 4481D000 */  mtc1      $at, $f26
-/* C9F040 80241120 44071000 */  mfc1      $a3, $f2
-/* C9F044 80241124 4600C306 */  mov.s     $f12, $f24
-/* C9F048 80241128 0C00A7B5 */  jal       dist2D
-/* C9F04C 8024112C 4600D386 */   mov.s    $f14, $f26
-/* C9F050 80241130 4600C306 */  mov.s     $f12, $f24
-/* C9F054 80241134 4600D386 */  mov.s     $f14, $f26
-/* C9F058 80241138 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* C9F05C 8024113C 468010A0 */  cvt.s.w   $f2, $f2
-/* C9F060 80241140 44061000 */  mfc1      $a2, $f2
-/* C9F064 80241144 C60200BC */  lwc1      $f2, 0xbc($s0)
-/* C9F068 80241148 468010A0 */  cvt.s.w   $f2, $f2
-/* C9F06C 8024114C 44071000 */  mfc1      $a3, $f2
-/* C9F070 80241150 0C00A720 */  jal       atan2
-/* C9F074 80241154 46000586 */   mov.s    $f22, $f0
-/* C9F078 80241158 0C00A6C9 */  jal       clamp_angle
-/* C9F07C 8024115C 46140301 */   sub.s    $f12, $f0, $f20
-/* C9F080 80241160 46000506 */  mov.s     $f20, $f0
-/* C9F084 80241164 0C00A8BB */  jal       sin_deg
-/* C9F088 80241168 4600A306 */   mov.s    $f12, $f20
-/* C9F08C 8024116C 4600B002 */  mul.s     $f0, $f22, $f0
-/* C9F090 80241170 00000000 */  nop
-/* C9F094 80241174 46180000 */  add.s     $f0, $f0, $f24
-/* C9F098 80241178 E6200038 */  swc1      $f0, 0x38($s1)
-/* C9F09C 8024117C 8E0500B8 */  lw        $a1, 0xb8($s0)
-/* C9F0A0 80241180 0C0B1EAF */  jal       get_variable
-/* C9F0A4 80241184 0000202D */   daddu    $a0, $zero, $zero
-/* C9F0A8 80241188 0000202D */  daddu     $a0, $zero, $zero
-/* C9F0AC 8024118C 8E050090 */  lw        $a1, 0x90($s0)
-/* C9F0B0 80241190 0C0B1EAF */  jal       get_variable
-/* C9F0B4 80241194 0040802D */   daddu    $s0, $v0, $zero
-/* C9F0B8 80241198 4600A306 */  mov.s     $f12, $f20
-/* C9F0BC 8024119C 02028021 */  addu      $s0, $s0, $v0
-/* C9F0C0 802411A0 44900000 */  mtc1      $s0, $f0
-/* C9F0C4 802411A4 00000000 */  nop
-/* C9F0C8 802411A8 46800020 */  cvt.s.w   $f0, $f0
-/* C9F0CC 802411AC 0C00A8D4 */  jal       cos_deg
-/* C9F0D0 802411B0 E620003C */   swc1     $f0, 0x3c($s1)
-/* C9F0D4 802411B4 4600B582 */  mul.s     $f22, $f22, $f0
-/* C9F0D8 802411B8 00000000 */  nop
-/* C9F0DC 802411BC 4616D681 */  sub.s     $f26, $f26, $f22
-/* C9F0E0 802411C0 E63A0040 */  swc1      $f26, 0x40($s1)
-/* C9F0E4 802411C4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* C9F0E8 802411C8 8FB10014 */  lw        $s1, 0x14($sp)
-/* C9F0EC 802411CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* C9F0F0 802411D0 D7BA0038 */  ldc1      $f26, 0x38($sp)
-/* C9F0F4 802411D4 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* C9F0F8 802411D8 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* C9F0FC 802411DC D7B40020 */  ldc1      $f20, 0x20($sp)
-/* C9F100 802411E0 24020002 */  addiu     $v0, $zero, 2
-/* C9F104 802411E4 03E00008 */  jr        $ra
-/* C9F108 802411E8 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024139C_C9F2BC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024139C_C9F2BC.s
deleted file mode 100644
index 102bdbb716..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024139C_C9F2BC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024139C_C9F2BC
-/* C9F2BC 8024139C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C9F2C0 802413A0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C9F2C4 802413A4 0C03A6D5 */  jal       increment_status_menu_disabled
-/* C9F2C8 802413A8 00000000 */   nop
-/* C9F2CC 802413AC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C9F2D0 802413B0 24020002 */  addiu     $v0, $zero, 2
-/* C9F2D4 802413B4 03E00008 */  jr        $ra
-/* C9F2D8 802413B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s
deleted file mode 100644
index 96e9d2b228..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802413BC_C9F2DC
-/* C9F2DC 802413BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C9F2E0 802413C0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C9F2E4 802413C4 0C03A6CC */  jal       decrement_status_menu_disabled
-/* C9F2E8 802413C8 00000000 */   nop
-/* C9F2EC 802413CC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C9F2F0 802413D0 24020002 */  addiu     $v0, $zero, 2
-/* C9F2F4 802413D4 03E00008 */  jr        $ra
-/* C9F2F8 802413D8 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C9F2FC 802413DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72A0/func_80240000_CA72A0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72A0/func_80240000_CA72A0.s
deleted file mode 100644
index 2b9071deae..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72A0/func_80240000_CA72A0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CA72A0
-/* CA72A0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CA72A4 80240004 24040001 */  addiu     $a0, $zero, 1
-/* CA72A8 80240008 0000282D */  daddu     $a1, $zero, $zero
-/* CA72AC 8024000C 00A0302D */  daddu     $a2, $a1, $zero
-/* CA72B0 80240010 00A0382D */  daddu     $a3, $a1, $zero
-/* CA72B4 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CA72B8 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CA72BC 8024001C 0C01CA54 */  jal       func_80072950
-/* CA72C0 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CA72C4 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CA72C8 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CA72CC 8024002C 03E00008 */  jr        $ra
-/* CA72D0 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CA72D4 80240034 00000000 */  nop
-/* CA72D8 80240038 00000000 */  nop
-/* CA72DC 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s
deleted file mode 100644
index c2847568c0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CA72E0
-/* CA72E0 80240040 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CA72E4 80240044 AFB00010 */  sw        $s0, 0x10($sp)
-/* CA72E8 80240048 3C108024 */  lui       $s0, %hi(D_80240F08_CA81A8)
-/* CA72EC 8024004C 26100F08 */  addiu     $s0, $s0, %lo(D_80240F08_CA81A8)
-/* CA72F0 80240050 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CA72F4 80240054 AFB10014 */  sw        $s1, 0x14($sp)
-/* CA72F8 80240058 8E020000 */  lw        $v0, ($s0)
-/* CA72FC 8024005C 14400010 */  bnez      $v0, .L802400A0
-/* CA7300 80240060 0080882D */   daddu    $s1, $a0, $zero
-/* CA7304 80240064 0C00AB39 */  jal       heap_malloc
-/* CA7308 80240068 24040040 */   addiu    $a0, $zero, 0x40
-/* CA730C 8024006C AE020000 */  sw        $v0, ($s0)
-/* CA7310 80240070 0000182D */  daddu     $v1, $zero, $zero
-/* CA7314 80240074 0040282D */  daddu     $a1, $v0, $zero
-/* CA7318 80240078 0220202D */  daddu     $a0, $s1, $zero
-.L8024007C:
-/* CA731C 8024007C 8C820084 */  lw        $v0, 0x84($a0)
-/* CA7320 80240080 24840004 */  addiu     $a0, $a0, 4
-/* CA7324 80240084 24630001 */  addiu     $v1, $v1, 1
-/* CA7328 80240088 ACA20000 */  sw        $v0, ($a1)
-/* CA732C 8024008C 28620010 */  slti      $v0, $v1, 0x10
-/* CA7330 80240090 1440FFFA */  bnez      $v0, .L8024007C
-/* CA7334 80240094 24A50004 */   addiu    $a1, $a1, 4
-/* CA7338 80240098 08090037 */  j         .L802400DC
-/* CA733C 8024009C 00000000 */   nop
-.L802400A0:
-/* CA7340 802400A0 0000182D */  daddu     $v1, $zero, $zero
-/* CA7344 802400A4 0040282D */  daddu     $a1, $v0, $zero
-/* CA7348 802400A8 0220202D */  daddu     $a0, $s1, $zero
-.L802400AC:
-/* CA734C 802400AC 8CA20000 */  lw        $v0, ($a1)
-/* CA7350 802400B0 24A50004 */  addiu     $a1, $a1, 4
-/* CA7354 802400B4 24630001 */  addiu     $v1, $v1, 1
-/* CA7358 802400B8 AC820084 */  sw        $v0, 0x84($a0)
-/* CA735C 802400BC 28620010 */  slti      $v0, $v1, 0x10
-/* CA7360 802400C0 1440FFFA */  bnez      $v0, .L802400AC
-/* CA7364 802400C4 24840004 */   addiu    $a0, $a0, 4
-/* CA7368 802400C8 3C108024 */  lui       $s0, %hi(D_80240F08_CA81A8)
-/* CA736C 802400CC 26100F08 */  addiu     $s0, $s0, %lo(D_80240F08_CA81A8)
-/* CA7370 802400D0 0C00AB4B */  jal       heap_free
-/* CA7374 802400D4 8E040000 */   lw       $a0, ($s0)
-/* CA7378 802400D8 AE000000 */  sw        $zero, ($s0)
-.L802400DC:
-/* CA737C 802400DC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CA7380 802400E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* CA7384 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CA7388 802400E8 24020002 */  addiu     $v0, $zero, 2
-/* CA738C 802400EC 03E00008 */  jr        $ra
-/* CA7390 802400F0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s
deleted file mode 100644
index b9ba0ef050..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s
+++ /dev/null
@@ -1,179 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240158_CA73F8
-/* CA73F8 80240158 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* CA73FC 8024015C AFBF0020 */  sw        $ra, 0x20($sp)
-/* CA7400 80240160 AFB1001C */  sw        $s1, 0x1c($sp)
-/* CA7404 80240164 AFB00018 */  sw        $s0, 0x18($sp)
-/* CA7408 80240168 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* CA740C 8024016C F7B80038 */  sdc1      $f24, 0x38($sp)
-/* CA7410 80240170 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* CA7414 80240174 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* CA7418 80240178 8C910148 */  lw        $s1, 0x148($a0)
-/* CA741C 8024017C 0C00EABB */  jal       get_npc_unsafe
-/* CA7420 80240180 86240008 */   lh       $a0, 8($s1)
-/* CA7424 80240184 3C038011 */  lui       $v1, %hi(gPlayerStatus)
-/* CA7428 80240188 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
-/* CA742C 8024018C 0040802D */  daddu     $s0, $v0, $zero
-/* CA7430 80240190 3C01C352 */  lui       $at, 0xc352
-/* CA7434 80240194 4481B000 */  mtc1      $at, $f22
-/* CA7438 80240198 3C01C337 */  lui       $at, 0xc337
-/* CA743C 8024019C 4481C000 */  mtc1      $at, $f24
-/* CA7440 802401A0 8C660028 */  lw        $a2, 0x28($v1)
-/* CA7444 802401A4 8C670030 */  lw        $a3, 0x30($v1)
-/* CA7448 802401A8 3C014334 */  lui       $at, 0x4334
-/* CA744C 802401AC 4481D000 */  mtc1      $at, $f26
-/* CA7450 802401B0 4600B306 */  mov.s     $f12, $f22
-/* CA7454 802401B4 0C00A720 */  jal       atan2
-/* CA7458 802401B8 4600C386 */   mov.s    $f14, $f24
-/* CA745C 802401BC 0C00A6C9 */  jal       clamp_angle
-/* CA7460 802401C0 461A0300 */   add.s    $f12, $f0, $f26
-/* CA7464 802401C4 27A40010 */  addiu     $a0, $sp, 0x10
-/* CA7468 802401C8 3C064238 */  lui       $a2, 0x4238
-/* CA746C 802401CC 44070000 */  mfc1      $a3, $f0
-/* CA7470 802401D0 27A50014 */  addiu     $a1, $sp, 0x14
-/* CA7474 802401D4 E7B60010 */  swc1      $f22, 0x10($sp)
-/* CA7478 802401D8 0C00A7E7 */  jal       add_vec2D_polar
-/* CA747C 802401DC E7B80014 */   swc1     $f24, 0x14($sp)
-/* CA7480 802401E0 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CA7484 802401E4 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CA7488 802401E8 8FA60010 */  lw        $a2, 0x10($sp)
-/* CA748C 802401EC 0C00A7B5 */  jal       dist2D
-/* CA7490 802401F0 8FA70014 */   lw       $a3, 0x14($sp)
-/* CA7494 802401F4 3C014000 */  lui       $at, 0x4000
-/* CA7498 802401F8 44811800 */  mtc1      $at, $f3
-/* CA749C 802401FC 44801000 */  mtc1      $zero, $f2
-/* CA74A0 80240200 46000121 */  cvt.d.s   $f4, $f0
-/* CA74A4 80240204 4624103C */  c.lt.d    $f2, $f4
-/* CA74A8 80240208 00000000 */  nop
-/* CA74AC 8024020C 45000053 */  bc1f      .L8024035C
-/* CA74B0 80240210 4600B306 */   mov.s    $f12, $f22
-/* CA74B4 80240214 8E060038 */  lw        $a2, 0x38($s0)
-/* CA74B8 80240218 8E070040 */  lw        $a3, 0x40($s0)
-/* CA74BC 8024021C 0C00A720 */  jal       atan2
-/* CA74C0 80240220 4600C386 */   mov.s    $f14, $f24
-/* CA74C4 80240224 0C00A6C9 */  jal       clamp_angle
-/* CA74C8 80240228 46000306 */   mov.s    $f12, $f0
-/* CA74CC 8024022C 4600B306 */  mov.s     $f12, $f22
-/* CA74D0 80240230 4600C386 */  mov.s     $f14, $f24
-/* CA74D4 80240234 8FA60010 */  lw        $a2, 0x10($sp)
-/* CA74D8 80240238 8FA70014 */  lw        $a3, 0x14($sp)
-/* CA74DC 8024023C 0C00A720 */  jal       atan2
-/* CA74E0 80240240 46000506 */   mov.s    $f20, $f0
-/* CA74E4 80240244 0C00A6C9 */  jal       clamp_angle
-/* CA74E8 80240248 46000306 */   mov.s    $f12, $f0
-/* CA74EC 8024024C 4600A101 */  sub.s     $f4, $f20, $f0
-/* CA74F0 80240250 4600218D */  trunc.w.s $f6, $f4
-/* CA74F4 80240254 44023000 */  mfc1      $v0, $f6
-/* CA74F8 80240258 00000000 */  nop
-/* CA74FC 8024025C 04420001 */  bltzl     $v0, .L80240264
-/* CA7500 80240260 00021023 */   negu     $v0, $v0
-.L80240264:
-/* CA7504 80240264 28420015 */  slti      $v0, $v0, 0x15
-/* CA7508 80240268 1440002D */  bnez      $v0, .L80240320
-/* CA750C 8024026C 00000000 */   nop
-/* CA7510 80240270 4604D03E */  c.le.s    $f26, $f4
-/* CA7514 80240274 00000000 */  nop
-/* CA7518 80240278 45000005 */  bc1f      .L80240290
-/* CA751C 8024027C 46002086 */   mov.s    $f2, $f4
-/* CA7520 80240280 3C0143B4 */  lui       $at, 0x43b4
-/* CA7524 80240284 44810000 */  mtc1      $at, $f0
-/* CA7528 80240288 00000000 */  nop
-/* CA752C 8024028C 46002081 */  sub.s     $f2, $f4, $f0
-.L80240290:
-/* CA7530 80240290 3C01C334 */  lui       $at, 0xc334
-/* CA7534 80240294 44810000 */  mtc1      $at, $f0
-/* CA7538 80240298 00000000 */  nop
-/* CA753C 8024029C 4600103E */  c.le.s    $f2, $f0
-/* CA7540 802402A0 00000000 */  nop
-/* CA7544 802402A4 45000005 */  bc1f      .L802402BC
-/* CA7548 802402A8 00000000 */   nop
-/* CA754C 802402AC 3C0143B4 */  lui       $at, 0x43b4
-/* CA7550 802402B0 44810000 */  mtc1      $at, $f0
-/* CA7554 802402B4 00000000 */  nop
-/* CA7558 802402B8 46001080 */  add.s     $f2, $f2, $f0
-.L802402BC:
-/* CA755C 802402BC 46022032 */  c.eq.s    $f4, $f2
-/* CA7560 802402C0 00000000 */  nop
-/* CA7564 802402C4 45000016 */  bc1f      .L80240320
-/* CA7568 802402C8 00000000 */   nop
-/* CA756C 802402CC 44800000 */  mtc1      $zero, $f0
-/* CA7570 802402D0 E7B60010 */  swc1      $f22, 0x10($sp)
-/* CA7574 802402D4 4604003E */  c.le.s    $f0, $f4
-/* CA7578 802402D8 00000000 */  nop
-/* CA757C 802402DC 45000005 */  bc1f      .L802402F4
-/* CA7580 802402E0 E7B80014 */   swc1     $f24, 0x14($sp)
-/* CA7584 802402E4 3C0141A0 */  lui       $at, 0x41a0
-/* CA7588 802402E8 44816000 */  mtc1      $at, $f12
-/* CA758C 802402EC 080900C1 */  j         .L80240304
-/* CA7590 802402F0 460CA301 */   sub.s    $f12, $f20, $f12
-.L802402F4:
-/* CA7594 802402F4 3C0141A0 */  lui       $at, 0x41a0
-/* CA7598 802402F8 44816000 */  mtc1      $at, $f12
-/* CA759C 802402FC 00000000 */  nop
-/* CA75A0 80240300 460CA300 */  add.s     $f12, $f20, $f12
-.L80240304:
-/* CA75A4 80240304 0C00A6C9 */  jal       clamp_angle
-/* CA75A8 80240308 00000000 */   nop
-/* CA75AC 8024030C 27A40010 */  addiu     $a0, $sp, 0x10
-/* CA75B0 80240310 3C064238 */  lui       $a2, 0x4238
-/* CA75B4 80240314 44070000 */  mfc1      $a3, $f0
-/* CA75B8 80240318 0C00A7E7 */  jal       add_vec2D_polar
-/* CA75BC 8024031C 27A50014 */   addiu    $a1, $sp, 0x14
-.L80240320:
-/* CA75C0 80240320 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CA75C4 80240324 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CA75C8 80240328 8FA60010 */  lw        $a2, 0x10($sp)
-/* CA75CC 8024032C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CA75D0 80240330 8FA70014 */  lw        $a3, 0x14($sp)
-/* CA75D4 80240334 8C420008 */  lw        $v0, 8($v0)
-/* CA75D8 80240338 0C00A720 */  jal       atan2
-/* CA75DC 8024033C AE020028 */   sw       $v0, 0x28($s0)
-/* CA75E0 80240340 3C054000 */  lui       $a1, 0x4000
-/* CA75E4 80240344 44060000 */  mfc1      $a2, $f0
-/* CA75E8 80240348 0200202D */  daddu     $a0, $s0, $zero
-/* CA75EC 8024034C 0C00EA95 */  jal       npc_move_heading
-/* CA75F0 80240350 AC86000C */   sw       $a2, 0xc($a0)
-/* CA75F4 80240354 080900F2 */  j         .L802403C8
-/* CA75F8 80240358 00000000 */   nop
-.L8024035C:
-/* CA75FC 8024035C 3C018024 */  lui       $at, %hi(D_80244F48_CAC1E8)
-/* CA7600 80240360 D4204F48 */  ldc1      $f0, %lo(D_80244F48_CAC1E8)($at)
-/* CA7604 80240364 4624003C */  c.lt.d    $f0, $f4
-/* CA7608 80240368 00000000 */  nop
-/* CA760C 8024036C 4500000F */  bc1f      .L802403AC
-/* CA7610 80240370 00000000 */   nop
-/* CA7614 80240374 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CA7618 80240378 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CA761C 8024037C 8FA60010 */  lw        $a2, 0x10($sp)
-/* CA7620 80240380 0C00A720 */  jal       atan2
-/* CA7624 80240384 8FA70014 */   lw       $a3, 0x14($sp)
-/* CA7628 80240388 C7A20010 */  lwc1      $f2, 0x10($sp)
-/* CA762C 8024038C C7A40014 */  lwc1      $f4, 0x14($sp)
-/* CA7630 80240390 E600000C */  swc1      $f0, 0xc($s0)
-/* CA7634 80240394 E6020038 */  swc1      $f2, 0x38($s0)
-/* CA7638 80240398 E6040040 */  swc1      $f4, 0x40($s0)
-/* CA763C 8024039C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CA7640 802403A0 8C420004 */  lw        $v0, 4($v0)
-/* CA7644 802403A4 080900F2 */  j         .L802403C8
-/* CA7648 802403A8 AE020028 */   sw       $v0, 0x28($s0)
-.L802403AC:
-/* CA764C 802403AC C7A00010 */  lwc1      $f0, 0x10($sp)
-/* CA7650 802403B0 C7A20014 */  lwc1      $f2, 0x14($sp)
-/* CA7654 802403B4 E6000038 */  swc1      $f0, 0x38($s0)
-/* CA7658 802403B8 E6020040 */  swc1      $f2, 0x40($s0)
-/* CA765C 802403BC 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CA7660 802403C0 8C420000 */  lw        $v0, ($v0)
-/* CA7664 802403C4 AE020028 */  sw        $v0, 0x28($s0)
-.L802403C8:
-/* CA7668 802403C8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CA766C 802403CC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* CA7670 802403D0 8FB00018 */  lw        $s0, 0x18($sp)
-/* CA7674 802403D4 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* CA7678 802403D8 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* CA767C 802403DC D7B60030 */  ldc1      $f22, 0x30($sp)
-/* CA7680 802403E0 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* CA7684 802403E4 0000102D */  daddu     $v0, $zero, $zero
-/* CA7688 802403E8 03E00008 */  jr        $ra
-/* CA768C 802403EC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240344_CAC534.s b/ver/us/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240344_CAC534.s
deleted file mode 100644
index 1f94945178..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_07/CAC1F0/func_80240344_CAC534.s
+++ /dev/null
@@ -1,43 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240344_CAC534
-/* CAC534 80240344 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* CAC538 80240348 24020008 */  addiu     $v0, $zero, 8
-/* CAC53C 8024034C 3C014348 */  lui       $at, 0x4348
-/* CAC540 80240350 44810000 */  mtc1      $at, $f0
-/* CAC544 80240354 3C0142F0 */  lui       $at, 0x42f0
-/* CAC548 80240358 44811000 */  mtc1      $at, $f2
-/* CAC54C 8024035C 3C014080 */  lui       $at, 0x4080
-/* CAC550 80240360 44812000 */  mtc1      $at, $f4
-/* CAC554 80240364 3C05C388 */  lui       $a1, 0xc388
-/* CAC558 80240368 3C0642A0 */  lui       $a2, 0x42a0
-/* CAC55C 8024036C 3C0741A0 */  lui       $a3, 0x41a0
-/* CAC560 80240370 24040003 */  addiu     $a0, $zero, 3
-/* CAC564 80240374 AFBF0028 */  sw        $ra, 0x28($sp)
-/* CAC568 80240378 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CAC56C 8024037C AFA00020 */  sw        $zero, 0x20($sp)
-/* CAC570 80240380 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CAC574 80240384 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CAC578 80240388 0C01C8D4 */  jal       func_80072350
-/* CAC57C 8024038C E7A40018 */   swc1     $f4, 0x18($sp)
-/* CAC580 80240390 8C43000C */  lw        $v1, 0xc($v0)
-/* CAC584 80240394 240500F0 */  addiu     $a1, $zero, 0xf0
-/* CAC588 80240398 AC650038 */  sw        $a1, 0x38($v1)
-/* CAC58C 8024039C 8C43000C */  lw        $v1, 0xc($v0)
-/* CAC590 802403A0 AC65003C */  sw        $a1, 0x3c($v1)
-/* CAC594 802403A4 8C43000C */  lw        $v1, 0xc($v0)
-/* CAC598 802403A8 AC650040 */  sw        $a1, 0x40($v1)
-/* CAC59C 802403AC 8C43000C */  lw        $v1, 0xc($v0)
-/* CAC5A0 802403B0 240400E6 */  addiu     $a0, $zero, 0xe6
-/* CAC5A4 802403B4 AC640048 */  sw        $a0, 0x48($v1)
-/* CAC5A8 802403B8 8C43000C */  lw        $v1, 0xc($v0)
-/* CAC5AC 802403BC AC64004C */  sw        $a0, 0x4c($v1)
-/* CAC5B0 802403C0 8C43000C */  lw        $v1, 0xc($v0)
-/* CAC5B4 802403C4 AC650050 */  sw        $a1, 0x50($v1)
-/* CAC5B8 802403C8 8FBF0028 */  lw        $ra, 0x28($sp)
-/* CAC5BC 802403CC 24020002 */  addiu     $v0, $zero, 2
-/* CAC5C0 802403D0 03E00008 */  jr        $ra
-/* CAC5C4 802403D4 27BD0030 */   addiu    $sp, $sp, 0x30
-/* CAC5C8 802403D8 00000000 */  nop
-/* CAC5CC 802403DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s
deleted file mode 100644
index 6affb5b384..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024061C_CAC80C
-/* CAC80C 8024061C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CAC810 80240620 AFB00010 */  sw        $s0, 0x10($sp)
-/* CAC814 80240624 3C108024 */  lui       $s0, %hi(D_80241BB0_CADDA0)
-/* CAC818 80240628 26101BB0 */  addiu     $s0, $s0, %lo(D_80241BB0_CADDA0)
-/* CAC81C 8024062C AFBF0018 */  sw        $ra, 0x18($sp)
-/* CAC820 80240630 AFB10014 */  sw        $s1, 0x14($sp)
-/* CAC824 80240634 8E020000 */  lw        $v0, ($s0)
-/* CAC828 80240638 14400010 */  bnez      $v0, .L8024067C
-/* CAC82C 8024063C 0080882D */   daddu    $s1, $a0, $zero
-/* CAC830 80240640 0C00AB39 */  jal       heap_malloc
-/* CAC834 80240644 24040040 */   addiu    $a0, $zero, 0x40
-/* CAC838 80240648 AE020000 */  sw        $v0, ($s0)
-/* CAC83C 8024064C 0000182D */  daddu     $v1, $zero, $zero
-/* CAC840 80240650 0040282D */  daddu     $a1, $v0, $zero
-/* CAC844 80240654 0220202D */  daddu     $a0, $s1, $zero
-.L80240658:
-/* CAC848 80240658 8C820084 */  lw        $v0, 0x84($a0)
-/* CAC84C 8024065C 24840004 */  addiu     $a0, $a0, 4
-/* CAC850 80240660 24630001 */  addiu     $v1, $v1, 1
-/* CAC854 80240664 ACA20000 */  sw        $v0, ($a1)
-/* CAC858 80240668 28620010 */  slti      $v0, $v1, 0x10
-/* CAC85C 8024066C 1440FFFA */  bnez      $v0, .L80240658
-/* CAC860 80240670 24A50004 */   addiu    $a1, $a1, 4
-/* CAC864 80240674 080901AE */  j         .L802406B8
-/* CAC868 80240678 00000000 */   nop
-.L8024067C:
-/* CAC86C 8024067C 0000182D */  daddu     $v1, $zero, $zero
-/* CAC870 80240680 0040282D */  daddu     $a1, $v0, $zero
-/* CAC874 80240684 0220202D */  daddu     $a0, $s1, $zero
-.L80240688:
-/* CAC878 80240688 8CA20000 */  lw        $v0, ($a1)
-/* CAC87C 8024068C 24A50004 */  addiu     $a1, $a1, 4
-/* CAC880 80240690 24630001 */  addiu     $v1, $v1, 1
-/* CAC884 80240694 AC820084 */  sw        $v0, 0x84($a0)
-/* CAC888 80240698 28620010 */  slti      $v0, $v1, 0x10
-/* CAC88C 8024069C 1440FFFA */  bnez      $v0, .L80240688
-/* CAC890 802406A0 24840004 */   addiu    $a0, $a0, 4
-/* CAC894 802406A4 3C108024 */  lui       $s0, %hi(D_80241BB0_CADDA0)
-/* CAC898 802406A8 26101BB0 */  addiu     $s0, $s0, %lo(D_80241BB0_CADDA0)
-/* CAC89C 802406AC 0C00AB4B */  jal       heap_free
-/* CAC8A0 802406B0 8E040000 */   lw       $a0, ($s0)
-/* CAC8A4 802406B4 AE000000 */  sw        $zero, ($s0)
-.L802406B8:
-/* CAC8A8 802406B8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CAC8AC 802406BC 8FB10014 */  lw        $s1, 0x14($sp)
-/* CAC8B0 802406C0 8FB00010 */  lw        $s0, 0x10($sp)
-/* CAC8B4 802406C4 24020002 */  addiu     $v0, $zero, 2
-/* CAC8B8 802406C8 03E00008 */  jr        $ra
-/* CAC8BC 802406CC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s
similarity index 94%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s
index fb7f5af603..7d946e5881 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/flo_08_func_802401CC_CAEF0C.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802401CC_CAEF0C
+glabel flo_08_func_802401CC_CAEF0C
 /* CAEF0C 802401CC 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* CAEF10 802401D0 AFB5002C */  sw        $s5, 0x2c($sp)
 /* CAEF14 802401D4 0080A82D */  daddu     $s5, $a0, $zero
@@ -22,12 +22,12 @@ glabel func_802401CC_CAEF0C
 /* CAEF50 80240210 0040982D */  daddu     $s3, $v0, $zero
 /* CAEF54 80240214 0000B02D */  daddu     $s6, $zero, $zero
 /* CAEF58 80240218 02C0902D */  daddu     $s2, $s6, $zero
-/* CAEF5C 8024021C 3C148024 */  lui       $s4, %hi(D_80241FB8_CB0CF8)
-/* CAEF60 80240220 26941FB8 */  addiu     $s4, $s4, %lo(D_80241FB8_CB0CF8)
+/* CAEF5C 8024021C 3C148024 */  lui       $s4, %hi(flo_08_D_80241FB8_CB0CF8)
+/* CAEF60 80240220 26941FB8 */  addiu     $s4, $s4, %lo(flo_08_D_80241FB8_CB0CF8)
 /* CAEF64 80240224 0260882D */  daddu     $s1, $s3, $zero
 /* CAEF68 80240228 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* CAEF6C 8024022C 3C038024 */  lui       $v1, %hi(D_80241FB0_CB0CF0)
-/* CAEF70 80240230 24631FB0 */  addiu     $v1, $v1, %lo(D_80241FB0_CB0CF0)
+/* CAEF6C 8024022C 3C038024 */  lui       $v1, %hi(flo_08_D_80241FB0_CB0CF0)
+/* CAEF70 80240230 24631FB0 */  addiu     $v1, $v1, %lo(flo_08_D_80241FB0_CB0CF0)
 /* CAEF74 80240234 AEB30078 */  sw        $s3, 0x78($s5)
 /* CAEF78 80240238 00021027 */  nor       $v0, $zero, $v0
 /* CAEF7C 8024023C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -49,7 +49,7 @@ glabel func_802401CC_CAEF0C
 /* CAEFB8 80240278 AE300108 */  sw        $s0, 0x108($s1)
 /* CAEFBC 8024027C 8C420000 */  lw        $v0, ($v0)
 /* CAEFC0 80240280 02E0282D */  daddu     $a1, $s7, $zero
-/* CAEFC4 80240284 0C090035 */  jal       func_802400D4_CAEE14
+/* CAEFC4 80240284 0C090035 */  jal       flo_08_UnkFunc37
 /* CAEFC8 80240288 AE220084 */   sw       $v0, 0x84($s1)
 /* CAEFCC 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* CAEFD0 80240290 04800011 */  bltz      $a0, .L802402D8
@@ -61,8 +61,8 @@ glabel func_802401CC_CAEF0C
 /* CAEFE8 802402A8 24020001 */  addiu     $v0, $zero, 1
 /* CAEFEC 802402AC AE22018C */  sw        $v0, 0x18c($s1)
 /* CAEFF0 802402B0 00041080 */  sll       $v0, $a0, 2
-/* CAEFF4 802402B4 3C068024 */  lui       $a2, %hi(D_80241FC8_CB0D08)
-/* CAEFF8 802402B8 24C61FC8 */  addiu     $a2, $a2, %lo(D_80241FC8_CB0D08)
+/* CAEFF4 802402B4 3C068024 */  lui       $a2, %hi(flo_08_D_80241FC8_CB0D08)
+/* CAEFF8 802402B8 24C61FC8 */  addiu     $a2, $a2, %lo(flo_08_D_80241FC8_CB0D08)
 /* CAEFFC 802402BC AE230000 */  sw        $v1, ($s1)
 /* CAF000 802402C0 001218C0 */  sll       $v1, $s2, 3
 /* CAF004 802402C4 00431021 */  addu      $v0, $v0, $v1
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024003C_CAED7C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024003C_CAED7C.s
deleted file mode 100644
index 4d00d78a6d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024003C_CAED7C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024003C_CAED7C
-/* CAED7C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CAED80 80240040 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CAED84 80240044 8C82000C */  lw        $v0, 0xc($a0)
-/* CAED88 80240048 0C0B1EAF */  jal       get_variable
-/* CAED8C 8024004C 8C450000 */   lw       $a1, ($v0)
-/* CAED90 80240050 0C0B95A4 */  jal       func_802E5690
-/* CAED94 80240054 0040202D */   daddu    $a0, $v0, $zero
-/* CAED98 80240058 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CAED9C 8024005C 24020002 */  addiu     $v0, $zero, 2
-/* CAEDA0 80240060 03E00008 */  jr        $ra
-/* CAEDA4 80240064 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802400D4_CAEE14.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802400D4_CAEE14.s
deleted file mode 100644
index 6aeb4fdc3a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802400D4_CAEE14.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400D4_CAEE14
-/* CAEE14 802400D4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* CAEE18 802400D8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* CAEE1C 802400DC 000420C0 */  sll       $a0, $a0, 3
-/* CAEE20 802400E0 00822021 */  addu      $a0, $a0, $v0
-/* CAEE24 802400E4 90820014 */  lbu       $v0, 0x14($a0)
-/* CAEE28 802400E8 10400009 */  beqz      $v0, .L80240110
-/* CAEE2C 802400EC 00000000 */   nop
-/* CAEE30 802400F0 90820015 */  lbu       $v0, 0x15($a0)
-/* CAEE34 802400F4 00022600 */  sll       $a0, $v0, 0x18
-/* CAEE38 802400F8 00041E03 */  sra       $v1, $a0, 0x18
-/* CAEE3C 802400FC 00051400 */  sll       $v0, $a1, 0x10
-/* CAEE40 80240100 00021403 */  sra       $v0, $v0, 0x10
-/* CAEE44 80240104 0043102A */  slt       $v0, $v0, $v1
-/* CAEE48 80240108 10400003 */  beqz      $v0, .L80240118
-/* CAEE4C 8024010C 00000000 */   nop
-.L80240110:
-/* CAEE50 80240110 03E00008 */  jr        $ra
-/* CAEE54 80240114 2402FFFF */   addiu    $v0, $zero, -1
-.L80240118:
-/* CAEE58 80240118 03E00008 */  jr        $ra
-/* CAEE5C 8024011C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s
deleted file mode 100644
index fda576323c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240120_CAEE60
-/* CAEE60 80240120 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* CAEE64 80240124 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CAEE68 80240128 0080982D */  daddu     $s3, $a0, $zero
-/* CAEE6C 8024012C AFB00010 */  sw        $s0, 0x10($sp)
-/* CAEE70 80240130 24100001 */  addiu     $s0, $zero, 1
-/* CAEE74 80240134 AFB40020 */  sw        $s4, 0x20($sp)
-/* CAEE78 80240138 2414FFFF */  addiu     $s4, $zero, -1
-/* CAEE7C 8024013C AFB50024 */  sw        $s5, 0x24($sp)
-/* CAEE80 80240140 0200A82D */  daddu     $s5, $s0, $zero
-/* CAEE84 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* CAEE88 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* CAEE8C 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* CAEE90 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
-/* CAEE94 80240154 AFB20018 */  sw        $s2, 0x18($sp)
-/* CAEE98 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* CAEE9C 8024015C 0280182D */  daddu     $v1, $s4, $zero
-/* CAEEA0 80240160 AE630084 */  sw        $v1, 0x84($s3)
-/* CAEEA4 80240164 00021027 */  nor       $v0, $zero, $v0
-/* CAEEA8 80240168 000217C2 */  srl       $v0, $v0, 0x1f
-/* CAEEAC 8024016C 00029400 */  sll       $s2, $v0, 0x10
-.L80240170:
-/* CAEEB0 80240170 92220014 */  lbu       $v0, 0x14($s1)
-/* CAEEB4 80240174 50400008 */  beql      $v0, $zero, .L80240198
-/* CAEEB8 80240178 26100001 */   addiu    $s0, $s0, 1
-/* CAEEBC 8024017C 0200202D */  daddu     $a0, $s0, $zero
-/* CAEEC0 80240180 0C090035 */  jal       func_802400D4_CAEE14
-/* CAEEC4 80240184 00122C03 */   sra      $a1, $s2, 0x10
-/* CAEEC8 80240188 10540003 */  beq       $v0, $s4, .L80240198
-/* CAEECC 8024018C 26100001 */   addiu    $s0, $s0, 1
-/* CAEED0 80240190 08090069 */  j         .L802401A4
-/* CAEED4 80240194 AE750084 */   sw       $s5, 0x84($s3)
-.L80240198:
-/* CAEED8 80240198 2A02000C */  slti      $v0, $s0, 0xc
-/* CAEEDC 8024019C 1440FFF4 */  bnez      $v0, .L80240170
-/* CAEEE0 802401A0 26310008 */   addiu    $s1, $s1, 8
-.L802401A4:
-/* CAEEE4 802401A4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* CAEEE8 802401A8 8FB50024 */  lw        $s5, 0x24($sp)
-/* CAEEEC 802401AC 8FB40020 */  lw        $s4, 0x20($sp)
-/* CAEEF0 802401B0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CAEEF4 802401B4 8FB20018 */  lw        $s2, 0x18($sp)
-/* CAEEF8 802401B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* CAEEFC 802401BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* CAEF00 802401C0 24020002 */  addiu     $v0, $zero, 2
-/* CAEF04 802401C4 03E00008 */  jr        $ra
-/* CAEF08 802401C8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024041C_CAF15C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024041C_CAF15C.s
deleted file mode 100644
index f089cee433..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024041C_CAF15C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024041C_CAF15C
-/* CAF15C 8024041C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CAF160 80240420 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CAF164 80240424 8C82000C */  lw        $v0, 0xc($a0)
-/* CAF168 80240428 0C0B1EAF */  jal       get_variable
-/* CAF16C 8024042C 8C450000 */   lw       $a1, ($v0)
-/* CAF170 80240430 0C03AC5A */  jal       func_800EB168
-/* CAF174 80240434 0040202D */   daddu    $a0, $v0, $zero
-/* CAF178 80240438 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CAF17C 8024043C 24020002 */  addiu     $v0, $zero, 2
-/* CAF180 80240440 03E00008 */  jr        $ra
-/* CAF184 80240444 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240510_CAF250.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240510_CAF250.s
deleted file mode 100644
index 7dc30db3c8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240510_CAF250.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240510_CAF250
-/* CAF250 80240510 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CAF254 80240514 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CAF258 80240518 8C82000C */  lw        $v0, 0xc($a0)
-/* CAF25C 8024051C 0C0B1EAF */  jal       get_variable
-/* CAF260 80240520 8C450000 */   lw       $a1, ($v0)
-/* CAF264 80240524 0040202D */  daddu     $a0, $v0, $zero
-/* CAF268 80240528 8C830000 */  lw        $v1, ($a0)
-/* CAF26C 8024052C 34630010 */  ori       $v1, $v1, 0x10
-/* CAF270 80240530 AC830000 */  sw        $v1, ($a0)
-/* CAF274 80240534 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CAF278 80240538 24020002 */  addiu     $v0, $zero, 2
-/* CAF27C 8024053C 03E00008 */  jr        $ra
-/* CAF280 80240540 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s
deleted file mode 100644
index 1f242ad2a2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s
+++ /dev/null
@@ -1,356 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240600_CAF340
-/* CAF340 80240600 27BDFFA0 */  addiu     $sp, $sp, -0x60
-/* CAF344 80240604 AFB60040 */  sw        $s6, 0x40($sp)
-/* CAF348 80240608 0080B02D */  daddu     $s6, $a0, $zero
-/* CAF34C 8024060C AFB00028 */  sw        $s0, 0x28($sp)
-/* CAF350 80240610 00A0802D */  daddu     $s0, $a1, $zero
-/* CAF354 80240614 AFBF0044 */  sw        $ra, 0x44($sp)
-/* CAF358 80240618 AFB5003C */  sw        $s5, 0x3c($sp)
-/* CAF35C 8024061C AFB40038 */  sw        $s4, 0x38($sp)
-/* CAF360 80240620 AFB30034 */  sw        $s3, 0x34($sp)
-/* CAF364 80240624 AFB20030 */  sw        $s2, 0x30($sp)
-/* CAF368 80240628 AFB1002C */  sw        $s1, 0x2c($sp)
-/* CAF36C 8024062C F7B80058 */  sdc1      $f24, 0x58($sp)
-/* CAF370 80240630 F7B60050 */  sdc1      $f22, 0x50($sp)
-/* CAF374 80240634 F7B40048 */  sdc1      $f20, 0x48($sp)
-/* CAF378 80240638 8ED3000C */  lw        $s3, 0xc($s6)
-/* CAF37C 8024063C 0C00EAD2 */  jal       get_npc_safe
-/* CAF380 80240640 2404FFFC */   addiu    $a0, $zero, -4
-/* CAF384 80240644 27A50018 */  addiu     $a1, $sp, 0x18
-/* CAF388 80240648 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
-/* CAF38C 8024064C 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
-/* CAF390 80240650 27A6001C */  addiu     $a2, $sp, 0x1c
-/* CAF394 80240654 00041880 */  sll       $v1, $a0, 2
-/* CAF398 80240658 00641821 */  addu      $v1, $v1, $a0
-/* CAF39C 8024065C 00031880 */  sll       $v1, $v1, 2
-/* CAF3A0 80240660 00641823 */  subu      $v1, $v1, $a0
-/* CAF3A4 80240664 000320C0 */  sll       $a0, $v1, 3
-/* CAF3A8 80240668 00641821 */  addu      $v1, $v1, $a0
-/* CAF3AC 8024066C 000318C0 */  sll       $v1, $v1, 3
-/* CAF3B0 80240670 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* CAF3B4 80240674 00230821 */  addu      $at, $at, $v1
-/* CAF3B8 80240678 C42C1DEC */  lwc1      $f12, %lo(gCameras+0x6C)($at)
-/* CAF3BC 8024067C 0C00A88D */  jal       sin_cos_deg
-/* CAF3C0 80240680 0040A82D */   daddu    $s5, $v0, $zero
-/* CAF3C4 80240684 1200005D */  beqz      $s0, .L802407FC
-/* CAF3C8 80240688 00000000 */   nop
-/* CAF3CC 8024068C 0C00AB0A */  jal       general_heap_malloc
-/* CAF3D0 80240690 24040068 */   addiu    $a0, $zero, 0x68
-/* CAF3D4 80240694 0040902D */  daddu     $s2, $v0, $zero
-/* CAF3D8 80240698 02C0202D */  daddu     $a0, $s6, $zero
-/* CAF3DC 8024069C 0000882D */  daddu     $s1, $zero, $zero
-/* CAF3E0 802406A0 2414FFFF */  addiu     $s4, $zero, -1
-/* CAF3E4 802406A4 AED20060 */  sw        $s2, 0x60($s6)
-/* CAF3E8 802406A8 8E650000 */  lw        $a1, ($s3)
-/* CAF3EC 802406AC 3C014148 */  lui       $at, 0x4148
-/* CAF3F0 802406B0 4481C000 */  mtc1      $at, $f24
-/* CAF3F4 802406B4 3C013F80 */  lui       $at, 0x3f80
-/* CAF3F8 802406B8 4481B000 */  mtc1      $at, $f22
-/* CAF3FC 802406BC 4480A000 */  mtc1      $zero, $f20
-/* CAF400 802406C0 0C0B1EAF */  jal       get_variable
-/* CAF404 802406C4 0240802D */   daddu    $s0, $s2, $zero
-/* CAF408 802406C8 0C04417A */  jal       get_entity_by_index
-/* CAF40C 802406CC 0040202D */   daddu    $a0, $v0, $zero
-/* CAF410 802406D0 AE42005C */  sw        $v0, 0x5c($s2)
-.L802406D4:
-/* CAF414 802406D4 8E42005C */  lw        $v0, 0x5c($s2)
-/* CAF418 802406D8 C440004C */  lwc1      $f0, 0x4c($v0)
-/* CAF41C 802406DC 0000202D */  daddu     $a0, $zero, $zero
-/* CAF420 802406E0 E7B60010 */  swc1      $f22, 0x10($sp)
-/* CAF424 802406E4 AFB40014 */  sw        $s4, 0x14($sp)
-/* CAF428 802406E8 46180000 */  add.s     $f0, $f0, $f24
-/* CAF42C 802406EC 8C450048 */  lw        $a1, 0x48($v0)
-/* CAF430 802406F0 8C470050 */  lw        $a3, 0x50($v0)
-/* CAF434 802406F4 44060000 */  mfc1      $a2, $f0
-/* CAF438 802406F8 0C01C5BC */  jal       func_800716F0
-/* CAF43C 802406FC 26310001 */   addiu    $s1, $s1, 1
-/* CAF440 80240700 AE020008 */  sw        $v0, 8($s0)
-/* CAF444 80240704 E614002C */  swc1      $f20, 0x2c($s0)
-/* CAF448 80240708 E6140020 */  swc1      $f20, 0x20($s0)
-/* CAF44C 8024070C E6140014 */  swc1      $f20, 0x14($s0)
-/* CAF450 80240710 E6140050 */  swc1      $f20, 0x50($s0)
-/* CAF454 80240714 E6140044 */  swc1      $f20, 0x44($s0)
-/* CAF458 80240718 E6140038 */  swc1      $f20, 0x38($s0)
-/* CAF45C 8024071C 2A220003 */  slti      $v0, $s1, 3
-/* CAF460 80240720 1440FFEC */  bnez      $v0, .L802406D4
-/* CAF464 80240724 26100004 */   addiu    $s0, $s0, 4
-/* CAF468 80240728 0000882D */  daddu     $s1, $zero, $zero
-/* CAF46C 8024072C 0240802D */  daddu     $s0, $s2, $zero
-/* CAF470 80240730 3C148024 */  lui       $s4, %hi(D_80242008_CB0D48)
-/* CAF474 80240734 26942008 */  addiu     $s4, $s4, %lo(D_80242008_CB0D48)
-/* CAF478 80240738 3C014248 */  lui       $at, 0x4248
-/* CAF47C 8024073C 4481A000 */  mtc1      $at, $f20
-/* CAF480 80240740 24130044 */  addiu     $s3, $zero, 0x44
-/* CAF484 80240744 AE400000 */  sw        $zero, ($s2)
-/* CAF488 80240748 AE400004 */  sw        $zero, 4($s2)
-/* CAF48C 8024074C AE400060 */  sw        $zero, 0x60($s2)
-/* CAF490 80240750 AE400064 */  sw        $zero, 0x64($s2)
-.L80240754:
-/* CAF494 80240754 27A40020 */  addiu     $a0, $sp, 0x20
-/* CAF498 80240758 4406A000 */  mfc1      $a2, $f20
-/* CAF49C 8024075C 8E870000 */  lw        $a3, ($s4)
-/* CAF4A0 80240760 02532821 */  addu      $a1, $s2, $s3
-/* CAF4A4 80240764 0C00A7E7 */  jal       add_vec2D_polar
-/* CAF4A8 80240768 AFA00020 */   sw       $zero, 0x20($sp)
-/* CAF4AC 8024076C C7A2001C */  lwc1      $f2, 0x1c($sp)
-/* CAF4B0 80240770 C7A40020 */  lwc1      $f4, 0x20($sp)
-/* CAF4B4 80240774 46041082 */  mul.s     $f2, $f2, $f4
-/* CAF4B8 80240778 00000000 */  nop
-/* CAF4BC 8024077C C7A00018 */  lwc1      $f0, 0x18($sp)
-/* CAF4C0 80240780 46040002 */  mul.s     $f0, $f0, $f4
-/* CAF4C4 80240784 00000000 */  nop
-/* CAF4C8 80240788 E6020038 */  swc1      $f2, 0x38($s0)
-/* CAF4CC 8024078C E6000050 */  swc1      $f0, 0x50($s0)
-/* CAF4D0 80240790 8E42005C */  lw        $v0, 0x5c($s2)
-/* CAF4D4 80240794 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CAF4D8 80240798 C4420048 */  lwc1      $f2, 0x48($v0)
-/* CAF4DC 8024079C 46001080 */  add.s     $f2, $f2, $f0
-/* CAF4E0 802407A0 C6A00038 */  lwc1      $f0, 0x38($s5)
-/* CAF4E4 802407A4 46020001 */  sub.s     $f0, $f0, $f2
-/* CAF4E8 802407A8 E6000038 */  swc1      $f0, 0x38($s0)
-/* CAF4EC 802407AC 8E42005C */  lw        $v0, 0x5c($s2)
-/* CAF4F0 802407B0 C6000044 */  lwc1      $f0, 0x44($s0)
-/* CAF4F4 802407B4 C442004C */  lwc1      $f2, 0x4c($v0)
-/* CAF4F8 802407B8 46001080 */  add.s     $f2, $f2, $f0
-/* CAF4FC 802407BC C6A0003C */  lwc1      $f0, 0x3c($s5)
-/* CAF500 802407C0 46020001 */  sub.s     $f0, $f0, $f2
-/* CAF504 802407C4 E6000044 */  swc1      $f0, 0x44($s0)
-/* CAF508 802407C8 8E42005C */  lw        $v0, 0x5c($s2)
-/* CAF50C 802407CC C6000050 */  lwc1      $f0, 0x50($s0)
-/* CAF510 802407D0 C4420050 */  lwc1      $f2, 0x50($v0)
-/* CAF514 802407D4 26940004 */  addiu     $s4, $s4, 4
-/* CAF518 802407D8 46001080 */  add.s     $f2, $f2, $f0
-/* CAF51C 802407DC C6A00040 */  lwc1      $f0, 0x40($s5)
-/* CAF520 802407E0 26730004 */  addiu     $s3, $s3, 4
-/* CAF524 802407E4 46020001 */  sub.s     $f0, $f0, $f2
-/* CAF528 802407E8 26310001 */  addiu     $s1, $s1, 1
-/* CAF52C 802407EC 2A220003 */  slti      $v0, $s1, 3
-/* CAF530 802407F0 E6000050 */  swc1      $f0, 0x50($s0)
-/* CAF534 802407F4 1440FFD7 */  bnez      $v0, .L80240754
-/* CAF538 802407F8 26100004 */   addiu    $s0, $s0, 4
-.L802407FC:
-/* CAF53C 802407FC 8ED20060 */  lw        $s2, 0x60($s6)
-/* CAF540 80240800 8E430000 */  lw        $v1, ($s2)
-/* CAF544 80240804 24020001 */  addiu     $v0, $zero, 1
-/* CAF548 80240808 10620038 */  beq       $v1, $v0, .L802408EC
-/* CAF54C 8024080C 28620002 */   slti     $v0, $v1, 2
-/* CAF550 80240810 50400005 */  beql      $v0, $zero, .L80240828
-/* CAF554 80240814 24020002 */   addiu    $v0, $zero, 2
-/* CAF558 80240818 10600007 */  beqz      $v1, .L80240838
-/* CAF55C 8024081C 24040005 */   addiu    $a0, $zero, 5
-/* CAF560 80240820 08090274 */  j         .L802409D0
-/* CAF564 80240824 00000000 */   nop
-.L80240828:
-/* CAF568 80240828 10620058 */  beq       $v1, $v0, .L8024098C
-/* CAF56C 8024082C 00000000 */   nop
-/* CAF570 80240830 08090274 */  j         .L802409D0
-/* CAF574 80240834 00000000 */   nop
-.L80240838:
-/* CAF578 80240838 0000882D */  daddu     $s1, $zero, $zero
-/* CAF57C 8024083C 3C148024 */  lui       $s4, %hi(D_80242008_CB0D48)
-/* CAF580 80240840 26942008 */  addiu     $s4, $s4, %lo(D_80242008_CB0D48)
-/* CAF584 80240844 24130020 */  addiu     $s3, $zero, 0x20
-/* CAF588 80240848 3C064248 */  lui       $a2, 0x4248
-/* CAF58C 8024084C 44800000 */  mtc1      $zero, $f0
-/* CAF590 80240850 24020014 */  addiu     $v0, $zero, 0x14
-/* CAF594 80240854 AFA20010 */  sw        $v0, 0x10($sp)
-/* CAF598 80240858 44050000 */  mfc1      $a1, $f0
-/* CAF59C 8024085C 8E470060 */  lw        $a3, 0x60($s2)
-/* CAF5A0 80240860 4485B000 */  mtc1      $a1, $f22
-/* CAF5A4 80240864 0C00A8ED */  jal       update_lerp
-/* CAF5A8 80240868 0240802D */   daddu    $s0, $s2, $zero
-/* CAF5AC 8024086C 46000506 */  mov.s     $f20, $f0
-.L80240870:
-/* CAF5B0 80240870 4406A000 */  mfc1      $a2, $f20
-/* CAF5B4 80240874 27A40020 */  addiu     $a0, $sp, 0x20
-/* CAF5B8 80240878 E6160020 */  swc1      $f22, 0x20($s0)
-/* CAF5BC 8024087C 8E870000 */  lw        $a3, ($s4)
-/* CAF5C0 80240880 02532821 */  addu      $a1, $s2, $s3
-/* CAF5C4 80240884 0C00A7E7 */  jal       add_vec2D_polar
-/* CAF5C8 80240888 E7B60020 */   swc1     $f22, 0x20($sp)
-/* CAF5CC 8024088C C7A4001C */  lwc1      $f4, 0x1c($sp)
-/* CAF5D0 80240890 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* CAF5D4 80240894 46002102 */  mul.s     $f4, $f4, $f0
-/* CAF5D8 80240898 00000000 */  nop
-/* CAF5DC 8024089C C7A20018 */  lwc1      $f2, 0x18($sp)
-/* CAF5E0 802408A0 26940004 */  addiu     $s4, $s4, 4
-/* CAF5E4 802408A4 46001082 */  mul.s     $f2, $f2, $f0
-/* CAF5E8 802408A8 00000000 */  nop
-/* CAF5EC 802408AC 26730004 */  addiu     $s3, $s3, 4
-/* CAF5F0 802408B0 26310001 */  addiu     $s1, $s1, 1
-/* CAF5F4 802408B4 2A220003 */  slti      $v0, $s1, 3
-/* CAF5F8 802408B8 E6040014 */  swc1      $f4, 0x14($s0)
-/* CAF5FC 802408BC E602002C */  swc1      $f2, 0x2c($s0)
-/* CAF600 802408C0 1440FFEB */  bnez      $v0, .L80240870
-/* CAF604 802408C4 26100004 */   addiu    $s0, $s0, 4
-/* CAF608 802408C8 8E420060 */  lw        $v0, 0x60($s2)
-/* CAF60C 802408CC 24420001 */  addiu     $v0, $v0, 1
-/* CAF610 802408D0 AE420060 */  sw        $v0, 0x60($s2)
-/* CAF614 802408D4 28420015 */  slti      $v0, $v0, 0x15
-/* CAF618 802408D8 1440003D */  bnez      $v0, .L802409D0
-/* CAF61C 802408DC 24020001 */   addiu    $v0, $zero, 1
-/* CAF620 802408E0 AE420000 */  sw        $v0, ($s2)
-/* CAF624 802408E4 08090274 */  j         .L802409D0
-/* CAF628 802408E8 AE400060 */   sw       $zero, 0x60($s2)
-.L802408EC:
-/* CAF62C 802408EC 0000882D */  daddu     $s1, $zero, $zero
-/* CAF630 802408F0 3C148024 */  lui       $s4, %hi(D_80242008_CB0D48)
-/* CAF634 802408F4 26942008 */  addiu     $s4, $s4, %lo(D_80242008_CB0D48)
-/* CAF638 802408F8 24130020 */  addiu     $s3, $zero, 0x20
-/* CAF63C 802408FC 0240802D */  daddu     $s0, $s2, $zero
-/* CAF640 80240900 3C014248 */  lui       $at, 0x4248
-/* CAF644 80240904 4481A000 */  mtc1      $at, $f20
-/* CAF648 80240908 4480B000 */  mtc1      $zero, $f22
-.L8024090C:
-/* CAF64C 8024090C 4406A000 */  mfc1      $a2, $f20
-/* CAF650 80240910 27A40020 */  addiu     $a0, $sp, 0x20
-/* CAF654 80240914 E6160020 */  swc1      $f22, 0x20($s0)
-/* CAF658 80240918 8E870000 */  lw        $a3, ($s4)
-/* CAF65C 8024091C 02532821 */  addu      $a1, $s2, $s3
-/* CAF660 80240920 0C00A7E7 */  jal       add_vec2D_polar
-/* CAF664 80240924 E7B60020 */   swc1     $f22, 0x20($sp)
-/* CAF668 80240928 C7A4001C */  lwc1      $f4, 0x1c($sp)
-/* CAF66C 8024092C C7A00020 */  lwc1      $f0, 0x20($sp)
-/* CAF670 80240930 46002102 */  mul.s     $f4, $f4, $f0
-/* CAF674 80240934 00000000 */  nop
-/* CAF678 80240938 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* CAF67C 8024093C 26940004 */  addiu     $s4, $s4, 4
-/* CAF680 80240940 46001082 */  mul.s     $f2, $f2, $f0
-/* CAF684 80240944 00000000 */  nop
-/* CAF688 80240948 26730004 */  addiu     $s3, $s3, 4
-/* CAF68C 8024094C 26310001 */  addiu     $s1, $s1, 1
-/* CAF690 80240950 2A220003 */  slti      $v0, $s1, 3
-/* CAF694 80240954 E6040014 */  swc1      $f4, 0x14($s0)
-/* CAF698 80240958 E602002C */  swc1      $f2, 0x2c($s0)
-/* CAF69C 8024095C 1440FFEB */  bnez      $v0, .L8024090C
-/* CAF6A0 80240960 26100004 */   addiu    $s0, $s0, 4
-/* CAF6A4 80240964 8E420060 */  lw        $v0, 0x60($s2)
-/* CAF6A8 80240968 24420001 */  addiu     $v0, $v0, 1
-/* CAF6AC 8024096C AE420060 */  sw        $v0, 0x60($s2)
-/* CAF6B0 80240970 28420010 */  slti      $v0, $v0, 0x10
-/* CAF6B4 80240974 14400016 */  bnez      $v0, .L802409D0
-/* CAF6B8 80240978 2402000F */   addiu    $v0, $zero, 0xf
-/* CAF6BC 8024097C AE420060 */  sw        $v0, 0x60($s2)
-/* CAF6C0 80240980 24020002 */  addiu     $v0, $zero, 2
-/* CAF6C4 80240984 08090274 */  j         .L802409D0
-/* CAF6C8 80240988 AE420000 */   sw       $v0, ($s2)
-.L8024098C:
-/* CAF6CC 8024098C 8E420060 */  lw        $v0, 0x60($s2)
-/* CAF6D0 80240990 24420001 */  addiu     $v0, $v0, 1
-/* CAF6D4 80240994 AE420060 */  sw        $v0, 0x60($s2)
-/* CAF6D8 80240998 2842001F */  slti      $v0, $v0, 0x1f
-/* CAF6DC 8024099C 1440000C */  bnez      $v0, .L802409D0
-/* CAF6E0 802409A0 0000882D */   daddu    $s1, $zero, $zero
-/* CAF6E4 802409A4 0240282D */  daddu     $a1, $s2, $zero
-.L802409A8:
-/* CAF6E8 802409A8 8CA20008 */  lw        $v0, 8($a1)
-/* CAF6EC 802409AC 8C430000 */  lw        $v1, ($v0)
-/* CAF6F0 802409B0 26310001 */  addiu     $s1, $s1, 1
-/* CAF6F4 802409B4 34630010 */  ori       $v1, $v1, 0x10
-/* CAF6F8 802409B8 AC430000 */  sw        $v1, ($v0)
-/* CAF6FC 802409BC 2A220003 */  slti      $v0, $s1, 3
-/* CAF700 802409C0 1440FFF9 */  bnez      $v0, .L802409A8
-/* CAF704 802409C4 24A50004 */   addiu    $a1, $a1, 4
-/* CAF708 802409C8 080902C1 */  j         .L80240B04
-/* CAF70C 802409CC 24020002 */   addiu    $v0, $zero, 2
-.L802409D0:
-/* CAF710 802409D0 8E430004 */  lw        $v1, 4($s2)
-/* CAF714 802409D4 10600005 */  beqz      $v1, .L802409EC
-/* CAF718 802409D8 24020001 */   addiu    $v0, $zero, 1
-/* CAF71C 802409DC 1062000B */  beq       $v1, $v0, .L80240A0C
-/* CAF720 802409E0 0000882D */   daddu    $s1, $zero, $zero
-/* CAF724 802409E4 080902B0 */  j         .L80240AC0
-/* CAF728 802409E8 0240282D */   daddu    $a1, $s2, $zero
-.L802409EC:
-/* CAF72C 802409EC 8E420064 */  lw        $v0, 0x64($s2)
-/* CAF730 802409F0 24420001 */  addiu     $v0, $v0, 1
-/* CAF734 802409F4 AE420064 */  sw        $v0, 0x64($s2)
-/* CAF738 802409F8 28420010 */  slti      $v0, $v0, 0x10
-/* CAF73C 802409FC 1440002F */  bnez      $v0, .L80240ABC
-/* CAF740 80240A00 0000882D */   daddu    $s1, $zero, $zero
-/* CAF744 80240A04 080902AC */  j         .L80240AB0
-/* CAF748 80240A08 24020001 */   addiu    $v0, $zero, 1
-.L80240A0C:
-/* CAF74C 80240A0C 4480A000 */  mtc1      $zero, $f20
-/* CAF750 80240A10 24130014 */  addiu     $s3, $zero, 0x14
-/* CAF754 80240A14 0240802D */  daddu     $s0, $s2, $zero
-.L80240A18:
-/* CAF758 80240A18 4405A000 */  mfc1      $a1, $f20
-/* CAF75C 80240A1C AFB30010 */  sw        $s3, 0x10($sp)
-/* CAF760 80240A20 8E060038 */  lw        $a2, 0x38($s0)
-/* CAF764 80240A24 8E470064 */  lw        $a3, 0x64($s2)
-/* CAF768 80240A28 0C00A8ED */  jal       update_lerp
-/* CAF76C 80240A2C 24040001 */   addiu    $a0, $zero, 1
-/* CAF770 80240A30 C6020014 */  lwc1      $f2, 0x14($s0)
-/* CAF774 80240A34 46001080 */  add.s     $f2, $f2, $f0
-/* CAF778 80240A38 4405A000 */  mfc1      $a1, $f20
-/* CAF77C 80240A3C E6020014 */  swc1      $f2, 0x14($s0)
-/* CAF780 80240A40 AFB30010 */  sw        $s3, 0x10($sp)
-/* CAF784 80240A44 8E060044 */  lw        $a2, 0x44($s0)
-/* CAF788 80240A48 8E470064 */  lw        $a3, 0x64($s2)
-/* CAF78C 80240A4C 0C00A8ED */  jal       update_lerp
-/* CAF790 80240A50 24040001 */   addiu    $a0, $zero, 1
-/* CAF794 80240A54 C6020020 */  lwc1      $f2, 0x20($s0)
-/* CAF798 80240A58 46001080 */  add.s     $f2, $f2, $f0
-/* CAF79C 80240A5C 4405A000 */  mfc1      $a1, $f20
-/* CAF7A0 80240A60 E6020020 */  swc1      $f2, 0x20($s0)
-/* CAF7A4 80240A64 AFB30010 */  sw        $s3, 0x10($sp)
-/* CAF7A8 80240A68 8E060050 */  lw        $a2, 0x50($s0)
-/* CAF7AC 80240A6C 8E470064 */  lw        $a3, 0x64($s2)
-/* CAF7B0 80240A70 0C00A8ED */  jal       update_lerp
-/* CAF7B4 80240A74 24040001 */   addiu    $a0, $zero, 1
-/* CAF7B8 80240A78 C602002C */  lwc1      $f2, 0x2c($s0)
-/* CAF7BC 80240A7C 46001080 */  add.s     $f2, $f2, $f0
-/* CAF7C0 80240A80 26310001 */  addiu     $s1, $s1, 1
-/* CAF7C4 80240A84 2A220003 */  slti      $v0, $s1, 3
-/* CAF7C8 80240A88 E602002C */  swc1      $f2, 0x2c($s0)
-/* CAF7CC 80240A8C 1440FFE2 */  bnez      $v0, .L80240A18
-/* CAF7D0 80240A90 26100004 */   addiu    $s0, $s0, 4
-/* CAF7D4 80240A94 8E420064 */  lw        $v0, 0x64($s2)
-/* CAF7D8 80240A98 24420001 */  addiu     $v0, $v0, 1
-/* CAF7DC 80240A9C AE420064 */  sw        $v0, 0x64($s2)
-/* CAF7E0 80240AA0 28420015 */  slti      $v0, $v0, 0x15
-/* CAF7E4 80240AA4 14400005 */  bnez      $v0, .L80240ABC
-/* CAF7E8 80240AA8 0000882D */   daddu    $s1, $zero, $zero
-/* CAF7EC 80240AAC 24020002 */  addiu     $v0, $zero, 2
-.L80240AB0:
-/* CAF7F0 80240AB0 AE420004 */  sw        $v0, 4($s2)
-/* CAF7F4 80240AB4 AE400064 */  sw        $zero, 0x64($s2)
-/* CAF7F8 80240AB8 0000882D */  daddu     $s1, $zero, $zero
-.L80240ABC:
-/* CAF7FC 80240ABC 0240282D */  daddu     $a1, $s2, $zero
-.L80240AC0:
-/* CAF800 80240AC0 8CA20008 */  lw        $v0, 8($a1)
-/* CAF804 80240AC4 C4A00014 */  lwc1      $f0, 0x14($a1)
-/* CAF808 80240AC8 8C42000C */  lw        $v0, 0xc($v0)
-/* CAF80C 80240ACC E4400010 */  swc1      $f0, 0x10($v0)
-/* CAF810 80240AD0 8CA20008 */  lw        $v0, 8($a1)
-/* CAF814 80240AD4 C4A00020 */  lwc1      $f0, 0x20($a1)
-/* CAF818 80240AD8 8C42000C */  lw        $v0, 0xc($v0)
-/* CAF81C 80240ADC 26310001 */  addiu     $s1, $s1, 1
-/* CAF820 80240AE0 E4400014 */  swc1      $f0, 0x14($v0)
-/* CAF824 80240AE4 8CA20008 */  lw        $v0, 8($a1)
-/* CAF828 80240AE8 C4A0002C */  lwc1      $f0, 0x2c($a1)
-/* CAF82C 80240AEC 8C42000C */  lw        $v0, 0xc($v0)
-/* CAF830 80240AF0 E4400018 */  swc1      $f0, 0x18($v0)
-/* CAF834 80240AF4 2A220003 */  slti      $v0, $s1, 3
-/* CAF838 80240AF8 1440FFF1 */  bnez      $v0, .L80240AC0
-/* CAF83C 80240AFC 24A50004 */   addiu    $a1, $a1, 4
-/* CAF840 80240B00 0000102D */  daddu     $v0, $zero, $zero
-.L80240B04:
-/* CAF844 80240B04 8FBF0044 */  lw        $ra, 0x44($sp)
-/* CAF848 80240B08 8FB60040 */  lw        $s6, 0x40($sp)
-/* CAF84C 80240B0C 8FB5003C */  lw        $s5, 0x3c($sp)
-/* CAF850 80240B10 8FB40038 */  lw        $s4, 0x38($sp)
-/* CAF854 80240B14 8FB30034 */  lw        $s3, 0x34($sp)
-/* CAF858 80240B18 8FB20030 */  lw        $s2, 0x30($sp)
-/* CAF85C 80240B1C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* CAF860 80240B20 8FB00028 */  lw        $s0, 0x28($sp)
-/* CAF864 80240B24 D7B80058 */  ldc1      $f24, 0x58($sp)
-/* CAF868 80240B28 D7B60050 */  ldc1      $f22, 0x50($sp)
-/* CAF86C 80240B2C D7B40048 */  ldc1      $f20, 0x48($sp)
-/* CAF870 80240B30 03E00008 */  jr        $ra
-/* CAF874 80240B34 27BD0060 */   addiu    $sp, $sp, 0x60
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240D08_CAFA48.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240D08_CAFA48.s
deleted file mode 100644
index 8e676fbd21..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240D08_CAFA48.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D08_CAFA48
-/* CAFA48 80240D08 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* CAFA4C 80240D0C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* CAFA50 80240D10 AC800084 */  sw        $zero, 0x84($a0)
-/* CAFA54 80240D14 80620000 */  lb        $v0, ($v1)
-/* CAFA58 80240D18 10400005 */  beqz      $v0, .L80240D30
-/* CAFA5C 80240D1C 24020003 */   addiu    $v0, $zero, 3
-/* CAFA60 80240D20 80630003 */  lb        $v1, 3($v1)
-/* CAFA64 80240D24 14620002 */  bne       $v1, $v0, .L80240D30
-/* CAFA68 80240D28 24020001 */   addiu    $v0, $zero, 1
-/* CAFA6C 80240D2C AC820084 */  sw        $v0, 0x84($a0)
-.L80240D30:
-/* CAFA70 80240D30 03E00008 */  jr        $ra
-/* CAFA74 80240D34 24020002 */   addiu    $v0, $zero, 2
-/* CAFA78 80240D38 00000000 */  nop
-/* CAFA7C 80240D3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFA80/func_80240D40_CAFA80.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFA80/func_80240D40_CAFA80.s
deleted file mode 100644
index 02b3b8368b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFA80/func_80240D40_CAFA80.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D40_CAFA80
-/* CAFA80 80240D40 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CAFA84 80240D44 24040001 */  addiu     $a0, $zero, 1
-/* CAFA88 80240D48 0000282D */  daddu     $a1, $zero, $zero
-/* CAFA8C 80240D4C 00A0302D */  daddu     $a2, $a1, $zero
-/* CAFA90 80240D50 00A0382D */  daddu     $a3, $a1, $zero
-/* CAFA94 80240D54 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CAFA98 80240D58 AFA00010 */  sw        $zero, 0x10($sp)
-/* CAFA9C 80240D5C 0C01CA54 */  jal       func_80072950
-/* CAFAA0 80240D60 AFA00014 */   sw       $zero, 0x14($sp)
-/* CAFAA4 80240D64 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CAFAA8 80240D68 24020002 */  addiu     $v0, $zero, 2
-/* CAFAAC 80240D6C 03E00008 */  jr        $ra
-/* CAFAB0 80240D70 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CAFAB4 80240D74 00000000 */  nop
-/* CAFAB8 80240D78 00000000 */  nop
-/* CAFABC 80240D7C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80240D80_CAFAC0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80240D80_CAFAC0.s
deleted file mode 100644
index 7ab6c6272e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80240D80_CAFAC0.s
+++ /dev/null
@@ -1,401 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D80_CAFAC0
-/* CAFAC0 80240D80 27BDFF68 */  addiu     $sp, $sp, -0x98
-/* CAFAC4 80240D84 AFB60060 */  sw        $s6, 0x60($sp)
-/* CAFAC8 80240D88 0080B02D */  daddu     $s6, $a0, $zero
-/* CAFACC 80240D8C AFBF0064 */  sw        $ra, 0x64($sp)
-/* CAFAD0 80240D90 AFB5005C */  sw        $s5, 0x5c($sp)
-/* CAFAD4 80240D94 AFB40058 */  sw        $s4, 0x58($sp)
-/* CAFAD8 80240D98 AFB30054 */  sw        $s3, 0x54($sp)
-/* CAFADC 80240D9C AFB20050 */  sw        $s2, 0x50($sp)
-/* CAFAE0 80240DA0 AFB1004C */  sw        $s1, 0x4c($sp)
-/* CAFAE4 80240DA4 AFB00048 */  sw        $s0, 0x48($sp)
-/* CAFAE8 80240DA8 F7BE0090 */  sdc1      $f30, 0x90($sp)
-/* CAFAEC 80240DAC F7BC0088 */  sdc1      $f28, 0x88($sp)
-/* CAFAF0 80240DB0 F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* CAFAF4 80240DB4 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* CAFAF8 80240DB8 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* CAFAFC 80240DBC F7B40068 */  sdc1      $f20, 0x68($sp)
-/* CAFB00 80240DC0 8ED20148 */  lw        $s2, 0x148($s6)
-/* CAFB04 80240DC4 00A0882D */  daddu     $s1, $a1, $zero
-/* CAFB08 80240DC8 86440008 */  lh        $a0, 8($s2)
-/* CAFB0C 80240DCC 0C00EABB */  jal       get_npc_unsafe
-/* CAFB10 80240DD0 00C0A82D */   daddu    $s5, $a2, $zero
-/* CAFB14 80240DD4 8E240020 */  lw        $a0, 0x20($s1)
-/* CAFB18 80240DD8 0040802D */  daddu     $s0, $v0, $zero
-/* CAFB1C 80240DDC 00041FC2 */  srl       $v1, $a0, 0x1f
-/* CAFB20 80240DE0 00832021 */  addu      $a0, $a0, $v1
-/* CAFB24 80240DE4 00042043 */  sra       $a0, $a0, 1
-/* CAFB28 80240DE8 0C00A67F */  jal       rand_int
-/* CAFB2C 80240DEC 24840001 */   addiu    $a0, $a0, 1
-/* CAFB30 80240DF0 8E230020 */  lw        $v1, 0x20($s1)
-/* CAFB34 80240DF4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFB38 80240DF8 000327C2 */  srl       $a0, $v1, 0x1f
-/* CAFB3C 80240DFC 00641821 */  addu      $v1, $v1, $a0
-/* CAFB40 80240E00 00031843 */  sra       $v1, $v1, 1
-/* CAFB44 80240E04 00621821 */  addu      $v1, $v1, $v0
-/* CAFB48 80240E08 A603008E */  sh        $v1, 0x8e($s0)
-/* CAFB4C 80240E0C 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CAFB50 80240E10 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFB54 80240E14 8C42000C */  lw        $v0, 0xc($v0)
-/* CAFB58 80240E18 AE020028 */  sw        $v0, 0x28($s0)
-/* CAFB5C 80240E1C C6200018 */  lwc1      $f0, 0x18($s1)
-/* CAFB60 80240E20 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CAFB64 80240E24 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CAFB68 80240E28 E6000018 */  swc1      $f0, 0x18($s0)
-/* CAFB6C 80240E2C 8C460028 */  lw        $a2, 0x28($v0)
-/* CAFB70 80240E30 8C470030 */  lw        $a3, 0x30($v0)
-/* CAFB74 80240E34 0C00A720 */  jal       atan2
-/* CAFB78 80240E38 0000982D */   daddu    $s3, $zero, $zero
-/* CAFB7C 80240E3C 3C014334 */  lui       $at, 0x4334
-/* CAFB80 80240E40 44816000 */  mtc1      $at, $f12
-/* CAFB84 80240E44 0C00A6C9 */  jal       clamp_angle
-/* CAFB88 80240E48 460C0300 */   add.s    $f12, $f0, $f12
-/* CAFB8C 80240E4C 46000506 */  mov.s     $f20, $f0
-/* CAFB90 80240E50 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CAFB94 80240E54 0C00A70A */  jal       get_clamped_angle_diff
-/* CAFB98 80240E58 4600A386 */   mov.s    $f14, $f20
-/* CAFB9C 80240E5C 46000086 */  mov.s     $f2, $f0
-/* CAFBA0 80240E60 8E22001C */  lw        $v0, 0x1c($s1)
-/* CAFBA4 80240E64 46001005 */  abs.s     $f0, $f2
-/* CAFBA8 80240E68 44822000 */  mtc1      $v0, $f4
-/* CAFBAC 80240E6C 00000000 */  nop
-/* CAFBB0 80240E70 46802120 */  cvt.s.w   $f4, $f4
-/* CAFBB4 80240E74 4600203C */  c.lt.s    $f4, $f0
-/* CAFBB8 80240E78 00000000 */  nop
-/* CAFBBC 80240E7C 4500000D */  bc1f      .L80240EB4
-/* CAFBC0 80240E80 00000000 */   nop
-/* CAFBC4 80240E84 44800000 */  mtc1      $zero, $f0
-/* CAFBC8 80240E88 C614000C */  lwc1      $f20, 0xc($s0)
-/* CAFBCC 80240E8C 4600103C */  c.lt.s    $f2, $f0
-/* CAFBD0 80240E90 00000000 */  nop
-/* CAFBD4 80240E94 45000006 */  bc1f      .L80240EB0
-/* CAFBD8 80240E98 00021023 */   negu     $v0, $v0
-/* CAFBDC 80240E9C 44820000 */  mtc1      $v0, $f0
-/* CAFBE0 80240EA0 00000000 */  nop
-/* CAFBE4 80240EA4 46800020 */  cvt.s.w   $f0, $f0
-/* CAFBE8 80240EA8 080903AD */  j         .L80240EB4
-/* CAFBEC 80240EAC 4600A500 */   add.s    $f20, $f20, $f0
-.L80240EB0:
-/* CAFBF0 80240EB0 4604A500 */  add.s     $f20, $f20, $f4
-.L80240EB4:
-/* CAFBF4 80240EB4 0C00A6C9 */  jal       clamp_angle
-/* CAFBF8 80240EB8 4600A306 */   mov.s    $f12, $f20
-/* CAFBFC 80240EBC 3C14800F */  lui       $s4, %hi(gPlayerStatusPtr)
-/* CAFC00 80240EC0 26947B30 */  addiu     $s4, $s4, %lo(gPlayerStatusPtr)
-/* CAFC04 80240EC4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFC08 80240EC8 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFC0C 80240ECC 8E820000 */  lw        $v0, ($s4)
-/* CAFC10 80240ED0 C602003C */  lwc1      $f2, 0x3c($s0)
-/* CAFC14 80240ED4 E600000C */  swc1      $f0, 0xc($s0)
-/* CAFC18 80240ED8 46006006 */  mov.s     $f0, $f12
-/* CAFC1C 80240EDC 8C460028 */  lw        $a2, 0x28($v0)
-/* CAFC20 80240EE0 8C470030 */  lw        $a3, 0x30($v0)
-/* CAFC24 80240EE4 46007106 */  mov.s     $f4, $f14
-/* CAFC28 80240EE8 E7A00020 */  swc1      $f0, 0x20($sp)
-/* CAFC2C 80240EEC E7A20024 */  swc1      $f2, 0x24($sp)
-/* CAFC30 80240EF0 0C00A720 */  jal       atan2
-/* CAFC34 80240EF4 E7A40028 */   swc1     $f4, 0x28($sp)
-/* CAFC38 80240EF8 3C014334 */  lui       $at, 0x4334
-/* CAFC3C 80240EFC 44816000 */  mtc1      $at, $f12
-/* CAFC40 80240F00 0C00A6C9 */  jal       clamp_angle
-/* CAFC44 80240F04 460C0300 */   add.s    $f12, $f0, $f12
-/* CAFC48 80240F08 C6020018 */  lwc1      $f2, 0x18($s0)
-/* CAFC4C 80240F0C 3C014012 */  lui       $at, 0x4012
-/* CAFC50 80240F10 4481E800 */  mtc1      $at, $f29
-/* CAFC54 80240F14 4480E000 */  mtc1      $zero, $f28
-/* CAFC58 80240F18 460010A1 */  cvt.d.s   $f2, $f2
-/* CAFC5C 80240F1C 463C1082 */  mul.d     $f2, $f2, $f28
-/* CAFC60 80240F20 00000000 */  nop
-/* CAFC64 80240F24 46000506 */  mov.s     $f20, $f0
-/* CAFC68 80240F28 27A50020 */  addiu     $a1, $sp, 0x20
-/* CAFC6C 80240F2C 27A60024 */  addiu     $a2, $sp, 0x24
-/* CAFC70 80240F30 27A70028 */  addiu     $a3, $sp, 0x28
-/* CAFC74 80240F34 E7B40014 */  swc1      $f20, 0x14($sp)
-/* CAFC78 80240F38 462010A0 */  cvt.s.d   $f2, $f2
-/* CAFC7C 80240F3C E7A20010 */  swc1      $f2, 0x10($sp)
-/* CAFC80 80240F40 860200A8 */  lh        $v0, 0xa8($s0)
-/* CAFC84 80240F44 4480B000 */  mtc1      $zero, $f22
-/* CAFC88 80240F48 44820000 */  mtc1      $v0, $f0
-/* CAFC8C 80240F4C 00000000 */  nop
-/* CAFC90 80240F50 46800020 */  cvt.s.w   $f0, $f0
-/* CAFC94 80240F54 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CAFC98 80240F58 860200A6 */  lh        $v0, 0xa6($s0)
-/* CAFC9C 80240F5C 4600B606 */  mov.s     $f24, $f22
-/* CAFCA0 80240F60 44820000 */  mtc1      $v0, $f0
-/* CAFCA4 80240F64 00000000 */  nop
-/* CAFCA8 80240F68 46800020 */  cvt.s.w   $f0, $f0
-/* CAFCAC 80240F6C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* CAFCB0 80240F70 8E040080 */  lw        $a0, 0x80($s0)
-/* CAFCB4 80240F74 0C03773B */  jal       func_800DDCEC
-/* CAFCB8 80240F78 4600C686 */   mov.s    $f26, $f24
-/* CAFCBC 80240F7C 104000E1 */  beqz      $v0, .L80241304
-/* CAFCC0 80240F80 00000000 */   nop
-/* CAFCC4 80240F84 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFCC8 80240F88 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFCCC 80240F8C 8FA60020 */  lw        $a2, 0x20($sp)
-/* CAFCD0 80240F90 0C00A7B5 */  jal       dist2D
-/* CAFCD4 80240F94 8FA70028 */   lw       $a3, 0x28($sp)
-/* CAFCD8 80240F98 46000586 */  mov.s     $f22, $f0
-/* CAFCDC 80240F9C C6020038 */  lwc1      $f2, 0x38($s0)
-/* CAFCE0 80240FA0 C604003C */  lwc1      $f4, 0x3c($s0)
-/* CAFCE4 80240FA4 3C01420C */  lui       $at, 0x420c
-/* CAFCE8 80240FA8 4481F000 */  mtc1      $at, $f30
-/* CAFCEC 80240FAC C6000040 */  lwc1      $f0, 0x40($s0)
-/* CAFCF0 80240FB0 461EA300 */  add.s     $f12, $f20, $f30
-/* CAFCF4 80240FB4 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* CAFCF8 80240FB8 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CAFCFC 80240FBC 0C00A6C9 */  jal       clamp_angle
-/* CAFD00 80240FC0 E7A00034 */   swc1     $f0, 0x34($sp)
-/* CAFD04 80240FC4 C6020018 */  lwc1      $f2, 0x18($s0)
-/* CAFD08 80240FC8 460010A1 */  cvt.d.s   $f2, $f2
-/* CAFD0C 80240FCC 463C1082 */  mul.d     $f2, $f2, $f28
-/* CAFD10 80240FD0 00000000 */  nop
-/* CAFD14 80240FD4 E7A00014 */  swc1      $f0, 0x14($sp)
-/* CAFD18 80240FD8 462010A0 */  cvt.s.d   $f2, $f2
-/* CAFD1C 80240FDC E7A20010 */  swc1      $f2, 0x10($sp)
-/* CAFD20 80240FE0 860200A8 */  lh        $v0, 0xa8($s0)
-/* CAFD24 80240FE4 27A5002C */  addiu     $a1, $sp, 0x2c
-/* CAFD28 80240FE8 44820000 */  mtc1      $v0, $f0
-/* CAFD2C 80240FEC 00000000 */  nop
-/* CAFD30 80240FF0 46800020 */  cvt.s.w   $f0, $f0
-/* CAFD34 80240FF4 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CAFD38 80240FF8 860200A6 */  lh        $v0, 0xa6($s0)
-/* CAFD3C 80240FFC 27A60030 */  addiu     $a2, $sp, 0x30
-/* CAFD40 80241000 44820000 */  mtc1      $v0, $f0
-/* CAFD44 80241004 00000000 */  nop
-/* CAFD48 80241008 46800020 */  cvt.s.w   $f0, $f0
-/* CAFD4C 8024100C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* CAFD50 80241010 8E040080 */  lw        $a0, 0x80($s0)
-/* CAFD54 80241014 0C03773B */  jal       func_800DDCEC
-/* CAFD58 80241018 27A70034 */   addiu    $a3, $sp, 0x34
-/* CAFD5C 8024101C 10400007 */  beqz      $v0, .L8024103C
-/* CAFD60 80241020 00000000 */   nop
-/* CAFD64 80241024 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFD68 80241028 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFD6C 8024102C 8FA6002C */  lw        $a2, 0x2c($sp)
-/* CAFD70 80241030 0C00A7B5 */  jal       dist2D
-/* CAFD74 80241034 8FA70034 */   lw       $a3, 0x34($sp)
-/* CAFD78 80241038 46000606 */  mov.s     $f24, $f0
-.L8024103C:
-/* CAFD7C 8024103C C6000038 */  lwc1      $f0, 0x38($s0)
-/* CAFD80 80241040 C602003C */  lwc1      $f2, 0x3c($s0)
-/* CAFD84 80241044 C6040040 */  lwc1      $f4, 0x40($s0)
-/* CAFD88 80241048 461EA301 */  sub.s     $f12, $f20, $f30
-/* CAFD8C 8024104C E7A00038 */  swc1      $f0, 0x38($sp)
-/* CAFD90 80241050 E7A2003C */  swc1      $f2, 0x3c($sp)
-/* CAFD94 80241054 0C00A6C9 */  jal       clamp_angle
-/* CAFD98 80241058 E7A40040 */   swc1     $f4, 0x40($sp)
-/* CAFD9C 8024105C C6020018 */  lwc1      $f2, 0x18($s0)
-/* CAFDA0 80241060 460010A1 */  cvt.d.s   $f2, $f2
-/* CAFDA4 80241064 463C1082 */  mul.d     $f2, $f2, $f28
-/* CAFDA8 80241068 00000000 */  nop
-/* CAFDAC 8024106C E7A00014 */  swc1      $f0, 0x14($sp)
-/* CAFDB0 80241070 462010A0 */  cvt.s.d   $f2, $f2
-/* CAFDB4 80241074 E7A20010 */  swc1      $f2, 0x10($sp)
-/* CAFDB8 80241078 860200A8 */  lh        $v0, 0xa8($s0)
-/* CAFDBC 8024107C 27A50038 */  addiu     $a1, $sp, 0x38
-/* CAFDC0 80241080 44820000 */  mtc1      $v0, $f0
-/* CAFDC4 80241084 00000000 */  nop
-/* CAFDC8 80241088 46800020 */  cvt.s.w   $f0, $f0
-/* CAFDCC 8024108C E7A00018 */  swc1      $f0, 0x18($sp)
-/* CAFDD0 80241090 860200A6 */  lh        $v0, 0xa6($s0)
-/* CAFDD4 80241094 27A6003C */  addiu     $a2, $sp, 0x3c
-/* CAFDD8 80241098 44820000 */  mtc1      $v0, $f0
-/* CAFDDC 8024109C 00000000 */  nop
-/* CAFDE0 802410A0 46800020 */  cvt.s.w   $f0, $f0
-/* CAFDE4 802410A4 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* CAFDE8 802410A8 8E040080 */  lw        $a0, 0x80($s0)
-/* CAFDEC 802410AC 0C03773B */  jal       func_800DDCEC
-/* CAFDF0 802410B0 27A70040 */   addiu    $a3, $sp, 0x40
-/* CAFDF4 802410B4 10400007 */  beqz      $v0, .L802410D4
-/* CAFDF8 802410B8 00000000 */   nop
-/* CAFDFC 802410BC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFE00 802410C0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFE04 802410C4 8FA60038 */  lw        $a2, 0x38($sp)
-/* CAFE08 802410C8 0C00A7B5 */  jal       dist2D
-/* CAFE0C 802410CC 8FA70040 */   lw       $a3, 0x40($sp)
-/* CAFE10 802410D0 46000686 */  mov.s     $f26, $f0
-.L802410D4:
-/* CAFE14 802410D4 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFE18 802410D8 8E820000 */  lw        $v0, ($s4)
-/* CAFE1C 802410DC C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFE20 802410E0 8C460028 */  lw        $a2, 0x28($v0)
-/* CAFE24 802410E4 0C00A7B5 */  jal       dist2D
-/* CAFE28 802410E8 8C470030 */   lw       $a3, 0x30($v0)
-/* CAFE2C 802410EC C6000018 */  lwc1      $f0, 0x18($s0)
-/* CAFE30 802410F0 3C013FF8 */  lui       $at, 0x3ff8
-/* CAFE34 802410F4 44811800 */  mtc1      $at, $f3
-/* CAFE38 802410F8 44801000 */  mtc1      $zero, $f2
-/* CAFE3C 802410FC 46000021 */  cvt.d.s   $f0, $f0
-/* CAFE40 80241100 46220082 */  mul.d     $f2, $f0, $f2
-/* CAFE44 80241104 00000000 */  nop
-/* CAFE48 80241108 4600B021 */  cvt.d.s   $f0, $f22
-/* CAFE4C 8024110C 4622003C */  c.lt.d    $f0, $f2
-/* CAFE50 80241110 00000000 */  nop
-/* CAFE54 80241114 45000012 */  bc1f      .L80241160
-/* CAFE58 80241118 00000000 */   nop
-/* CAFE5C 8024111C 4600C021 */  cvt.d.s   $f0, $f24
-/* CAFE60 80241120 4622003C */  c.lt.d    $f0, $f2
-/* CAFE64 80241124 00000000 */  nop
-/* CAFE68 80241128 4500000D */  bc1f      .L80241160
-/* CAFE6C 8024112C 00000000 */   nop
-/* CAFE70 80241130 4600D021 */  cvt.d.s   $f0, $f26
-/* CAFE74 80241134 4622003C */  c.lt.d    $f0, $f2
-/* CAFE78 80241138 00000000 */  nop
-/* CAFE7C 8024113C 45000008 */  bc1f      .L80241160
-/* CAFE80 80241140 02A0202D */   daddu    $a0, $s5, $zero
-/* CAFE84 80241144 AFA00010 */  sw        $zero, 0x10($sp)
-/* CAFE88 80241148 8E26000C */  lw        $a2, 0xc($s1)
-/* CAFE8C 8024114C 8E270010 */  lw        $a3, 0x10($s1)
-/* CAFE90 80241150 0C01242D */  jal       func_800490B4
-/* CAFE94 80241154 0240282D */   daddu    $a1, $s2, $zero
-/* CAFE98 80241158 54400001 */  bnel      $v0, $zero, .L80241160
-/* CAFE9C 8024115C 24130001 */   addiu    $s3, $zero, 1
-.L80241160:
-/* CAFEA0 80241160 1660006A */  bnez      $s3, .L8024130C
-/* CAFEA4 80241164 2402000A */   addiu    $v0, $zero, 0xa
-/* CAFEA8 80241168 4616C03C */  c.lt.s    $f24, $f22
-/* CAFEAC 8024116C 00000000 */  nop
-/* CAFEB0 80241170 4500000C */  bc1f      .L802411A4
-/* CAFEB4 80241174 00000000 */   nop
-/* CAFEB8 80241178 4618D03C */  c.lt.s    $f26, $f24
-/* CAFEBC 8024117C 00000000 */  nop
-/* CAFEC0 80241180 45000006 */  bc1f      .L8024119C
-/* CAFEC4 80241184 00000000 */   nop
-/* CAFEC8 80241188 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFECC 8024118C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFED0 80241190 8FA60020 */  lw        $a2, 0x20($sp)
-/* CAFED4 80241194 080904A2 */  j         .L80241288
-/* CAFED8 80241198 8FA70028 */   lw       $a3, 0x28($sp)
-.L8024119C:
-/* CAFEDC 8024119C 4616C03C */  c.lt.s    $f24, $f22
-/* CAFEE0 802411A0 00000000 */  nop
-.L802411A4:
-/* CAFEE4 802411A4 4500000A */  bc1f      .L802411D0
-/* CAFEE8 802411A8 00000000 */   nop
-/* CAFEEC 802411AC 461AC03C */  c.lt.s    $f24, $f26
-/* CAFEF0 802411B0 00000000 */  nop
-/* CAFEF4 802411B4 45000006 */  bc1f      .L802411D0
-/* CAFEF8 802411B8 00000000 */   nop
-/* CAFEFC 802411BC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFF00 802411C0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFF04 802411C4 8FA60020 */  lw        $a2, 0x20($sp)
-/* CAFF08 802411C8 080904A2 */  j         .L80241288
-/* CAFF0C 802411CC 8FA70028 */   lw       $a3, 0x28($sp)
-.L802411D0:
-/* CAFF10 802411D0 4618B03C */  c.lt.s    $f22, $f24
-/* CAFF14 802411D4 00000000 */  nop
-/* CAFF18 802411D8 4500000A */  bc1f      .L80241204
-/* CAFF1C 802411DC 00000000 */   nop
-/* CAFF20 802411E0 4616D03C */  c.lt.s    $f26, $f22
-/* CAFF24 802411E4 00000000 */  nop
-/* CAFF28 802411E8 45000006 */  bc1f      .L80241204
-/* CAFF2C 802411EC 00000000 */   nop
-/* CAFF30 802411F0 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFF34 802411F4 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFF38 802411F8 8FA6002C */  lw        $a2, 0x2c($sp)
-/* CAFF3C 802411FC 080904A2 */  j         .L80241288
-/* CAFF40 80241200 8FA70034 */   lw       $a3, 0x34($sp)
-.L80241204:
-/* CAFF44 80241204 4618D03C */  c.lt.s    $f26, $f24
-/* CAFF48 80241208 00000000 */  nop
-/* CAFF4C 8024120C 4500000A */  bc1f      .L80241238
-/* CAFF50 80241210 00000000 */   nop
-/* CAFF54 80241214 461AB03C */  c.lt.s    $f22, $f26
-/* CAFF58 80241218 00000000 */  nop
-/* CAFF5C 8024121C 45000008 */  bc1f      .L80241240
-/* CAFF60 80241220 00000000 */   nop
-/* CAFF64 80241224 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFF68 80241228 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFF6C 8024122C 8FA6002C */  lw        $a2, 0x2c($sp)
-/* CAFF70 80241230 080904A2 */  j         .L80241288
-/* CAFF74 80241234 8FA70034 */   lw       $a3, 0x34($sp)
-.L80241238:
-/* CAFF78 80241238 461AB03C */  c.lt.s    $f22, $f26
-/* CAFF7C 8024123C 00000000 */  nop
-.L80241240:
-/* CAFF80 80241240 45000005 */  bc1f      .L80241258
-/* CAFF84 80241244 00000000 */   nop
-/* CAFF88 80241248 4616C03C */  c.lt.s    $f24, $f22
-/* CAFF8C 8024124C 00000000 */  nop
-/* CAFF90 80241250 45010009 */  bc1t      .L80241278
-/* CAFF94 80241254 00000000 */   nop
-.L80241258:
-/* CAFF98 80241258 461AC03C */  c.lt.s    $f24, $f26
-/* CAFF9C 8024125C 00000000 */  nop
-/* CAFFA0 80241260 4500000C */  bc1f      .L80241294
-/* CAFFA4 80241264 00000000 */   nop
-/* CAFFA8 80241268 4618B03C */  c.lt.s    $f22, $f24
-/* CAFFAC 8024126C 00000000 */  nop
-/* CAFFB0 80241270 45000008 */  bc1f      .L80241294
-/* CAFFB4 80241274 00000000 */   nop
-.L80241278:
-/* CAFFB8 80241278 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CAFFBC 8024127C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CAFFC0 80241280 8FA60038 */  lw        $a2, 0x38($sp)
-/* CAFFC4 80241284 8FA70040 */  lw        $a3, 0x40($sp)
-.L80241288:
-/* CAFFC8 80241288 0C00A720 */  jal       atan2
-/* CAFFCC 8024128C 00000000 */   nop
-/* CAFFD0 80241290 46000506 */  mov.s     $f20, $f0
-.L80241294:
-/* CAFFD4 80241294 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CAFFD8 80241298 0C00A70A */  jal       get_clamped_angle_diff
-/* CAFFDC 8024129C 4600A386 */   mov.s    $f14, $f20
-/* CAFFE0 802412A0 46000086 */  mov.s     $f2, $f0
-/* CAFFE4 802412A4 8E22001C */  lw        $v0, 0x1c($s1)
-/* CAFFE8 802412A8 46001005 */  abs.s     $f0, $f2
-/* CAFFEC 802412AC 44822000 */  mtc1      $v0, $f4
-/* CAFFF0 802412B0 00000000 */  nop
-/* CAFFF4 802412B4 46802120 */  cvt.s.w   $f4, $f4
-/* CAFFF8 802412B8 4600203C */  c.lt.s    $f4, $f0
-/* CAFFFC 802412BC 00000000 */  nop
-/* CB0000 802412C0 4500000D */  bc1f      .L802412F8
-/* CB0004 802412C4 00000000 */   nop
-/* CB0008 802412C8 44800000 */  mtc1      $zero, $f0
-/* CB000C 802412CC C614000C */  lwc1      $f20, 0xc($s0)
-/* CB0010 802412D0 4600103C */  c.lt.s    $f2, $f0
-/* CB0014 802412D4 00000000 */  nop
-/* CB0018 802412D8 45000006 */  bc1f      .L802412F4
-/* CB001C 802412DC 00021023 */   negu     $v0, $v0
-/* CB0020 802412E0 44820000 */  mtc1      $v0, $f0
-/* CB0024 802412E4 00000000 */  nop
-/* CB0028 802412E8 46800020 */  cvt.s.w   $f0, $f0
-/* CB002C 802412EC 080904BE */  j         .L802412F8
-/* CB0030 802412F0 4600A500 */   add.s    $f20, $f20, $f0
-.L802412F4:
-/* CB0034 802412F4 4604A500 */  add.s     $f20, $f20, $f4
-.L802412F8:
-/* CB0038 802412F8 0C00A6C9 */  jal       clamp_angle
-/* CB003C 802412FC 4600A306 */   mov.s    $f12, $f20
-/* CB0040 80241300 E600000C */  swc1      $f0, 0xc($s0)
-.L80241304:
-/* CB0044 80241304 12600005 */  beqz      $s3, .L8024131C
-/* CB0048 80241308 2402000A */   addiu    $v0, $zero, 0xa
-.L8024130C:
-/* CB004C 8024130C A602008E */  sh        $v0, 0x8e($s0)
-/* CB0050 80241310 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CB0054 80241314 8C420020 */  lw        $v0, 0x20($v0)
-/* CB0058 80241318 AE020028 */  sw        $v0, 0x28($s0)
-.L8024131C:
-/* CB005C 8024131C 2402000D */  addiu     $v0, $zero, 0xd
-/* CB0060 80241320 AEC20070 */  sw        $v0, 0x70($s6)
-/* CB0064 80241324 8FBF0064 */  lw        $ra, 0x64($sp)
-/* CB0068 80241328 8FB60060 */  lw        $s6, 0x60($sp)
-/* CB006C 8024132C 8FB5005C */  lw        $s5, 0x5c($sp)
-/* CB0070 80241330 8FB40058 */  lw        $s4, 0x58($sp)
-/* CB0074 80241334 8FB30054 */  lw        $s3, 0x54($sp)
-/* CB0078 80241338 8FB20050 */  lw        $s2, 0x50($sp)
-/* CB007C 8024133C 8FB1004C */  lw        $s1, 0x4c($sp)
-/* CB0080 80241340 8FB00048 */  lw        $s0, 0x48($sp)
-/* CB0084 80241344 D7BE0090 */  ldc1      $f30, 0x90($sp)
-/* CB0088 80241348 D7BC0088 */  ldc1      $f28, 0x88($sp)
-/* CB008C 8024134C D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* CB0090 80241350 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* CB0094 80241354 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* CB0098 80241358 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* CB009C 8024135C 03E00008 */  jr        $ra
-/* CB00A0 80241360 27BD0098 */   addiu    $sp, $sp, 0x98
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241364_CB00A4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241364_CB00A4.s
deleted file mode 100644
index 91a579b8c1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241364_CB00A4.s
+++ /dev/null
@@ -1,100 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241364_CB00A4
-/* CB00A4 80241364 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* CB00A8 80241368 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CB00AC 8024136C 0080982D */  daddu     $s3, $a0, $zero
-/* CB00B0 80241370 AFBF0040 */  sw        $ra, 0x40($sp)
-/* CB00B4 80241374 AFB20038 */  sw        $s2, 0x38($sp)
-/* CB00B8 80241378 AFB10034 */  sw        $s1, 0x34($sp)
-/* CB00BC 8024137C AFB00030 */  sw        $s0, 0x30($sp)
-/* CB00C0 80241380 8E720148 */  lw        $s2, 0x148($s3)
-/* CB00C4 80241384 00A0882D */  daddu     $s1, $a1, $zero
-/* CB00C8 80241388 86440008 */  lh        $a0, 8($s2)
-/* CB00CC 8024138C 0C00EABB */  jal       get_npc_unsafe
-/* CB00D0 80241390 00C0802D */   daddu    $s0, $a2, $zero
-/* CB00D4 80241394 0200202D */  daddu     $a0, $s0, $zero
-/* CB00D8 80241398 0240282D */  daddu     $a1, $s2, $zero
-/* CB00DC 8024139C 24030001 */  addiu     $v1, $zero, 1
-/* CB00E0 802413A0 AFA30010 */  sw        $v1, 0x10($sp)
-/* CB00E4 802413A4 8E260024 */  lw        $a2, 0x24($s1)
-/* CB00E8 802413A8 8E270028 */  lw        $a3, 0x28($s1)
-/* CB00EC 802413AC 0C01242D */  jal       func_800490B4
-/* CB00F0 802413B0 0040802D */   daddu    $s0, $v0, $zero
-/* CB00F4 802413B4 1440001D */  bnez      $v0, .L8024142C
-/* CB00F8 802413B8 24040002 */   addiu    $a0, $zero, 2
-/* CB00FC 802413BC 0200282D */  daddu     $a1, $s0, $zero
-/* CB0100 802413C0 0000302D */  daddu     $a2, $zero, $zero
-/* CB0104 802413C4 860300A8 */  lh        $v1, 0xa8($s0)
-/* CB0108 802413C8 3C013F80 */  lui       $at, 0x3f80
-/* CB010C 802413CC 44810000 */  mtc1      $at, $f0
-/* CB0110 802413D0 3C014000 */  lui       $at, 0x4000
-/* CB0114 802413D4 44811000 */  mtc1      $at, $f2
-/* CB0118 802413D8 3C01C1A0 */  lui       $at, 0xc1a0
-/* CB011C 802413DC 44812000 */  mtc1      $at, $f4
-/* CB0120 802413E0 2402000F */  addiu     $v0, $zero, 0xf
-/* CB0124 802413E4 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CB0128 802413E8 44833000 */  mtc1      $v1, $f6
-/* CB012C 802413EC 00000000 */  nop
-/* CB0130 802413F0 468031A0 */  cvt.s.w   $f6, $f6
-/* CB0134 802413F4 44073000 */  mfc1      $a3, $f6
-/* CB0138 802413F8 27A20028 */  addiu     $v0, $sp, 0x28
-/* CB013C 802413FC AFA20020 */  sw        $v0, 0x20($sp)
-/* CB0140 80241400 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CB0144 80241404 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CB0148 80241408 0C01BFA4 */  jal       fx_emote
-/* CB014C 8024140C E7A40018 */   swc1     $f4, 0x18($sp)
-/* CB0150 80241410 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CB0154 80241414 8C430000 */  lw        $v1, ($v0)
-/* CB0158 80241418 24020019 */  addiu     $v0, $zero, 0x19
-/* CB015C 8024141C A602008E */  sh        $v0, 0x8e($s0)
-/* CB0160 80241420 2402000E */  addiu     $v0, $zero, 0xe
-/* CB0164 80241424 0809052A */  j         .L802414A8
-/* CB0168 80241428 AE030028 */   sw       $v1, 0x28($s0)
-.L8024142C:
-/* CB016C 8024142C 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CB0170 80241430 8E030028 */  lw        $v1, 0x28($s0)
-/* CB0174 80241434 8C420020 */  lw        $v0, 0x20($v0)
-/* CB0178 80241438 10620014 */  beq       $v1, $v0, .L8024148C
-/* CB017C 8024143C 00000000 */   nop
-/* CB0180 80241440 C6000018 */  lwc1      $f0, 0x18($s0)
-/* CB0184 80241444 3C014010 */  lui       $at, 0x4010
-/* CB0188 80241448 44811800 */  mtc1      $at, $f3
-/* CB018C 8024144C 44801000 */  mtc1      $zero, $f2
-/* CB0190 80241450 46000021 */  cvt.d.s   $f0, $f0
-/* CB0194 80241454 4622003C */  c.lt.d    $f0, $f2
-/* CB0198 80241458 00000000 */  nop
-/* CB019C 8024145C 45000003 */  bc1f      .L8024146C
-/* CB01A0 80241460 0000282D */   daddu    $a1, $zero, $zero
-/* CB01A4 80241464 0809051D */  j         .L80241474
-/* CB01A8 80241468 0200202D */   daddu    $a0, $s0, $zero
-.L8024146C:
-/* CB01AC 8024146C 0200202D */  daddu     $a0, $s0, $zero
-/* CB01B0 80241470 24050001 */  addiu     $a1, $zero, 1
-.L80241474:
-/* CB01B4 80241474 0C00F598 */  jal       func_8003D660
-/* CB01B8 80241478 00000000 */   nop
-/* CB01BC 8024147C 8E050018 */  lw        $a1, 0x18($s0)
-/* CB01C0 80241480 8E06000C */  lw        $a2, 0xc($s0)
-/* CB01C4 80241484 0C00EA95 */  jal       npc_move_heading
-/* CB01C8 80241488 0200202D */   daddu    $a0, $s0, $zero
-.L8024148C:
-/* CB01CC 8024148C 8602008E */  lh        $v0, 0x8e($s0)
-/* CB01D0 80241490 9603008E */  lhu       $v1, 0x8e($s0)
-/* CB01D4 80241494 18400003 */  blez      $v0, .L802414A4
-/* CB01D8 80241498 2462FFFF */   addiu    $v0, $v1, -1
-/* CB01DC 8024149C 0809052B */  j         .L802414AC
-/* CB01E0 802414A0 A602008E */   sh       $v0, 0x8e($s0)
-.L802414A4:
-/* CB01E4 802414A4 2402000C */  addiu     $v0, $zero, 0xc
-.L802414A8:
-/* CB01E8 802414A8 AE620070 */  sw        $v0, 0x70($s3)
-.L802414AC:
-/* CB01EC 802414AC 8FBF0040 */  lw        $ra, 0x40($sp)
-/* CB01F0 802414B0 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CB01F4 802414B4 8FB20038 */  lw        $s2, 0x38($sp)
-/* CB01F8 802414B8 8FB10034 */  lw        $s1, 0x34($sp)
-/* CB01FC 802414BC 8FB00030 */  lw        $s0, 0x30($sp)
-/* CB0200 802414C0 03E00008 */  jr        $ra
-/* CB0204 802414C4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802414C8_CB0208.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802414C8_CB0208.s
deleted file mode 100644
index 5c9594de00..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802414C8_CB0208.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414C8_CB0208
-/* CB0208 802414C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CB020C 802414CC AFB00010 */  sw        $s0, 0x10($sp)
-/* CB0210 802414D0 0080802D */  daddu     $s0, $a0, $zero
-/* CB0214 802414D4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CB0218 802414D8 8E020148 */  lw        $v0, 0x148($s0)
-/* CB021C 802414DC 0C00EABB */  jal       get_npc_unsafe
-/* CB0220 802414E0 84440008 */   lh       $a0, 8($v0)
-/* CB0224 802414E4 9443008E */  lhu       $v1, 0x8e($v0)
-/* CB0228 802414E8 2463FFFF */  addiu     $v1, $v1, -1
-/* CB022C 802414EC A443008E */  sh        $v1, 0x8e($v0)
-/* CB0230 802414F0 00031C00 */  sll       $v1, $v1, 0x10
-/* CB0234 802414F4 50600001 */  beql      $v1, $zero, .L802414FC
-/* CB0238 802414F8 AE000070 */   sw       $zero, 0x70($s0)
-.L802414FC:
-/* CB023C 802414FC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CB0240 80241500 8FB00010 */  lw        $s0, 0x10($sp)
-/* CB0244 80241504 03E00008 */  jr        $ra
-/* CB0248 80241508 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s
deleted file mode 100644
index ee1a8cf2cd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s
+++ /dev/null
@@ -1,161 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024150C_CB024C
-/* CB024C 8024150C 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CB0250 80241510 AFB40040 */  sw        $s4, 0x40($sp)
-/* CB0254 80241514 0080A02D */  daddu     $s4, $a0, $zero
-/* CB0258 80241518 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CB025C 8024151C AFB50044 */  sw        $s5, 0x44($sp)
-/* CB0260 80241520 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CB0264 80241524 AFB20038 */  sw        $s2, 0x38($sp)
-/* CB0268 80241528 AFB10034 */  sw        $s1, 0x34($sp)
-/* CB026C 8024152C AFB00030 */  sw        $s0, 0x30($sp)
-/* CB0270 80241530 8E910148 */  lw        $s1, 0x148($s4)
-/* CB0274 80241534 86240008 */  lh        $a0, 8($s1)
-/* CB0278 80241538 0C00EABB */  jal       get_npc_unsafe
-/* CB027C 8024153C 00A0802D */   daddu    $s0, $a1, $zero
-/* CB0280 80241540 8E83000C */  lw        $v1, 0xc($s4)
-/* CB0284 80241544 0280202D */  daddu     $a0, $s4, $zero
-/* CB0288 80241548 8C650000 */  lw        $a1, ($v1)
-/* CB028C 8024154C 0C0B1EAF */  jal       get_variable
-/* CB0290 80241550 0040A82D */   daddu    $s5, $v0, $zero
-/* CB0294 80241554 AFA00010 */  sw        $zero, 0x10($sp)
-/* CB0298 80241558 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CB029C 8024155C 8C630030 */  lw        $v1, 0x30($v1)
-/* CB02A0 80241560 AFA30014 */  sw        $v1, 0x14($sp)
-/* CB02A4 80241564 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CB02A8 80241568 8C63001C */  lw        $v1, 0x1c($v1)
-/* CB02AC 8024156C AFA30018 */  sw        $v1, 0x18($sp)
-/* CB02B0 80241570 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CB02B4 80241574 8C630024 */  lw        $v1, 0x24($v1)
-/* CB02B8 80241578 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CB02BC 8024157C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CB02C0 80241580 8C630028 */  lw        $v1, 0x28($v1)
-/* CB02C4 80241584 27B30010 */  addiu     $s3, $sp, 0x10
-/* CB02C8 80241588 AFA30020 */  sw        $v1, 0x20($sp)
-/* CB02CC 8024158C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CB02D0 80241590 3C0142C8 */  lui       $at, 0x42c8
-/* CB02D4 80241594 44810000 */  mtc1      $at, $f0
-/* CB02D8 80241598 8C63002C */  lw        $v1, 0x2c($v1)
-/* CB02DC 8024159C 0040902D */  daddu     $s2, $v0, $zero
-/* CB02E0 802415A0 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CB02E4 802415A4 A7A0002C */  sh        $zero, 0x2c($sp)
-/* CB02E8 802415A8 16000005 */  bnez      $s0, .L802415C0
-/* CB02EC 802415AC AFA30024 */   sw       $v1, 0x24($sp)
-/* CB02F0 802415B0 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CB02F4 802415B4 30420004 */  andi      $v0, $v0, 4
-/* CB02F8 802415B8 1040001F */  beqz      $v0, .L80241638
-/* CB02FC 802415BC 00000000 */   nop
-.L802415C0:
-/* CB0300 802415C0 2404F7FF */  addiu     $a0, $zero, -0x801
-/* CB0304 802415C4 AE800070 */  sw        $zero, 0x70($s4)
-/* CB0308 802415C8 A6A0008E */  sh        $zero, 0x8e($s5)
-/* CB030C 802415CC 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CB0310 802415D0 8EA30000 */  lw        $v1, ($s5)
-/* CB0314 802415D4 8C420000 */  lw        $v0, ($v0)
-/* CB0318 802415D8 00641824 */  and       $v1, $v1, $a0
-/* CB031C 802415DC AEA30000 */  sw        $v1, ($s5)
-/* CB0320 802415E0 AEA20028 */  sw        $v0, 0x28($s5)
-/* CB0324 802415E4 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CB0328 802415E8 8C420034 */  lw        $v0, 0x34($v0)
-/* CB032C 802415EC 54400005 */  bnel      $v0, $zero, .L80241604
-/* CB0330 802415F0 2402FDFF */   addiu    $v0, $zero, -0x201
-/* CB0334 802415F4 34620200 */  ori       $v0, $v1, 0x200
-/* CB0338 802415F8 2403FFF7 */  addiu     $v1, $zero, -9
-/* CB033C 802415FC 08090583 */  j         .L8024160C
-/* CB0340 80241600 00431024 */   and      $v0, $v0, $v1
-.L80241604:
-/* CB0344 80241604 00621024 */  and       $v0, $v1, $v0
-/* CB0348 80241608 34420008 */  ori       $v0, $v0, 8
-.L8024160C:
-/* CB034C 8024160C AEA20000 */  sw        $v0, ($s5)
-/* CB0350 80241610 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CB0354 80241614 30420004 */  andi      $v0, $v0, 4
-/* CB0358 80241618 10400007 */  beqz      $v0, .L80241638
-/* CB035C 8024161C 24020063 */   addiu    $v0, $zero, 0x63
-/* CB0360 80241620 AE820070 */  sw        $v0, 0x70($s4)
-/* CB0364 80241624 AE800074 */  sw        $zero, 0x74($s4)
-/* CB0368 80241628 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CB036C 8024162C 2403FFFB */  addiu     $v1, $zero, -5
-/* CB0370 80241630 00431024 */  and       $v0, $v0, $v1
-/* CB0374 80241634 AE2200B0 */  sw        $v0, 0xb0($s1)
-.L80241638:
-/* CB0378 80241638 8E830070 */  lw        $v1, 0x70($s4)
-/* CB037C 8024163C 2C620064 */  sltiu     $v0, $v1, 0x64
-/* CB0380 80241640 10400036 */  beqz      $v0, L8024171C_CB045C
-/* CB0384 80241644 00031080 */   sll      $v0, $v1, 2
-/* CB0388 80241648 3C018024 */  lui       $at, %hi(jtbl_80246130_CB4E70)
-/* CB038C 8024164C 00220821 */  addu      $at, $at, $v0
-/* CB0390 80241650 8C226130 */  lw        $v0, %lo(jtbl_80246130_CB4E70)($at)
-/* CB0394 80241654 00400008 */  jr        $v0
-/* CB0398 80241658 00000000 */   nop
-glabel L8024165C_CB039C
-/* CB039C 8024165C 0280202D */  daddu     $a0, $s4, $zero
-/* CB03A0 80241660 0240282D */  daddu     $a1, $s2, $zero
-/* CB03A4 80241664 0C012568 */  jal       func_800495A0
-/* CB03A8 80241668 0260302D */   daddu    $a2, $s3, $zero
-glabel L8024166C_CB03AC
-/* CB03AC 8024166C 0280202D */  daddu     $a0, $s4, $zero
-/* CB03B0 80241670 0240282D */  daddu     $a1, $s2, $zero
-/* CB03B4 80241674 0C0125AE */  jal       func_800496B8
-/* CB03B8 80241678 0260302D */   daddu    $a2, $s3, $zero
-/* CB03BC 8024167C 080905C7 */  j         L8024171C_CB045C
-/* CB03C0 80241680 00000000 */   nop
-glabel L80241684_CB03C4
-/* CB03C4 80241684 0280202D */  daddu     $a0, $s4, $zero
-/* CB03C8 80241688 0240282D */  daddu     $a1, $s2, $zero
-/* CB03CC 8024168C 0C0126D1 */  jal       base_UnkNpcAIFunc1
-/* CB03D0 80241690 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241694_CB03D4
-/* CB03D4 80241694 0280202D */  daddu     $a0, $s4, $zero
-/* CB03D8 80241698 0240282D */  daddu     $a1, $s2, $zero
-/* CB03DC 8024169C 0C012701 */  jal       func_80049C04
-/* CB03E0 802416A0 0260302D */   daddu    $a2, $s3, $zero
-/* CB03E4 802416A4 080905C7 */  j         L8024171C_CB045C
-/* CB03E8 802416A8 00000000 */   nop
-glabel L802416AC_CB03EC
-/* CB03EC 802416AC 0280202D */  daddu     $a0, $s4, $zero
-/* CB03F0 802416B0 0240282D */  daddu     $a1, $s2, $zero
-/* CB03F4 802416B4 0C01278F */  jal       func_80049E3C
-/* CB03F8 802416B8 0260302D */   daddu    $a2, $s3, $zero
-glabel L802416BC_CB03FC
-/* CB03FC 802416BC 0280202D */  daddu     $a0, $s4, $zero
-/* CB0400 802416C0 0240282D */  daddu     $a1, $s2, $zero
-/* CB0404 802416C4 0C0127B3 */  jal       func_80049ECC
-/* CB0408 802416C8 0260302D */   daddu    $a2, $s3, $zero
-/* CB040C 802416CC 080905C7 */  j         L8024171C_CB045C
-/* CB0410 802416D0 00000000 */   nop
-glabel L802416D4_CB0414
-/* CB0414 802416D4 0280202D */  daddu     $a0, $s4, $zero
-/* CB0418 802416D8 0240282D */  daddu     $a1, $s2, $zero
-/* CB041C 802416DC 0C090360 */  jal       func_80240D80_CAFAC0
-/* CB0420 802416E0 0260302D */   daddu    $a2, $s3, $zero
-glabel L802416E4_CB0424
-/* CB0424 802416E4 0280202D */  daddu     $a0, $s4, $zero
-/* CB0428 802416E8 0240282D */  daddu     $a1, $s2, $zero
-/* CB042C 802416EC 0C0904D9 */  jal       func_80241364_CB00A4
-/* CB0430 802416F0 0260302D */   daddu    $a2, $s3, $zero
-/* CB0434 802416F4 080905C7 */  j         L8024171C_CB045C
-/* CB0438 802416F8 00000000 */   nop
-glabel L802416FC_CB043C
-/* CB043C 802416FC 0280202D */  daddu     $a0, $s4, $zero
-/* CB0440 80241700 0240282D */  daddu     $a1, $s2, $zero
-/* CB0444 80241704 0C090532 */  jal       func_802414C8_CB0208
-/* CB0448 80241708 0260302D */   daddu    $a2, $s3, $zero
-/* CB044C 8024170C 080905C7 */  j         L8024171C_CB045C
-/* CB0450 80241710 00000000 */   nop
-glabel L80241714_CB0454
-/* CB0454 80241714 0C0129CF */  jal       func_8004A73C
-/* CB0458 80241718 0280202D */   daddu    $a0, $s4, $zero
-glabel L8024171C_CB045C
-/* CB045C 8024171C 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CB0460 80241720 8FB50044 */  lw        $s5, 0x44($sp)
-/* CB0464 80241724 8FB40040 */  lw        $s4, 0x40($sp)
-/* CB0468 80241728 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CB046C 8024172C 8FB20038 */  lw        $s2, 0x38($sp)
-/* CB0470 80241730 8FB10034 */  lw        $s1, 0x34($sp)
-/* CB0474 80241734 8FB00030 */  lw        $s0, 0x30($sp)
-/* CB0478 80241738 0000102D */  daddu     $v0, $zero, $zero
-/* CB047C 8024173C 03E00008 */  jr        $ra
-/* CB0480 80241740 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s
deleted file mode 100644
index 7d2e44a336..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241970_CB06B0
-/* CB06B0 80241970 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CB06B4 80241974 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CB06B8 80241978 10A00003 */  beqz      $a1, .L80241988
-/* CB06BC 8024197C 8C86000C */   lw       $a2, 0xc($a0)
-/* CB06C0 80241980 3C018024 */  lui       $at, %hi(D_80243088_CB1DC8)
-/* CB06C4 80241984 AC203088 */  sw        $zero, %lo(D_80243088_CB1DC8)($at)
-.L80241988:
-/* CB06C8 80241988 3C038024 */  lui       $v1, %hi(D_80243088_CB1DC8)
-/* CB06CC 8024198C 24633088 */  addiu     $v1, $v1, %lo(D_80243088_CB1DC8)
-/* CB06D0 80241990 8C620000 */  lw        $v0, ($v1)
-/* CB06D4 80241994 54400003 */  bnel      $v0, $zero, .L802419A4
-/* CB06D8 80241998 AC600000 */   sw       $zero, ($v1)
-/* CB06DC 8024199C 0809066E */  j         .L802419B8
-/* CB06E0 802419A0 0000102D */   daddu    $v0, $zero, $zero
-.L802419A4:
-/* CB06E4 802419A4 8CC50000 */  lw        $a1, ($a2)
-/* CB06E8 802419A8 3C068024 */  lui       $a2, %hi(D_8024308C_CB1DCC)
-/* CB06EC 802419AC 0C0B2026 */  jal       set_variable
-/* CB06F0 802419B0 8CC6308C */   lw       $a2, %lo(D_8024308C_CB1DCC)($a2)
-/* CB06F4 802419B4 24020002 */  addiu     $v0, $zero, 2
-.L802419B8:
-/* CB06F8 802419B8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CB06FC 802419BC 03E00008 */  jr        $ra
-/* CB0700 802419C0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s
deleted file mode 100644
index 004e707c9e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419C4_CB0704
-/* CB0704 802419C4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CB0708 802419C8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CB070C 802419CC 8C82000C */  lw        $v0, 0xc($a0)
-/* CB0710 802419D0 0C0B1EAF */  jal       get_variable
-/* CB0714 802419D4 8C450000 */   lw       $a1, ($v0)
-/* CB0718 802419D8 3C018024 */  lui       $at, %hi(D_8024308C_CB1DCC)
-/* CB071C 802419DC AC22308C */  sw        $v0, %lo(D_8024308C_CB1DCC)($at)
-/* CB0720 802419E0 24020002 */  addiu     $v0, $zero, 2
-/* CB0724 802419E4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CB0728 802419E8 24030001 */  addiu     $v1, $zero, 1
-/* CB072C 802419EC 3C018024 */  lui       $at, %hi(D_80243088_CB1DC8)
-/* CB0730 802419F0 AC233088 */  sw        $v1, %lo(D_80243088_CB1DC8)($at)
-/* CB0734 802419F4 03E00008 */  jr        $ra
-/* CB0738 802419F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s
deleted file mode 100644
index bb5d84f1b4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419FC_CB073C
-/* CB073C 802419FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CB0740 80241A00 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CB0744 80241A04 8C82000C */  lw        $v0, 0xc($a0)
-/* CB0748 80241A08 0C0B1EAF */  jal       get_variable
-/* CB074C 80241A0C 8C450000 */   lw       $a1, ($v0)
-/* CB0750 80241A10 0040182D */  daddu     $v1, $v0, $zero
-/* CB0754 80241A14 10600012 */  beqz      $v1, .L80241A60
-/* CB0758 80241A18 0000202D */   daddu    $a0, $zero, $zero
-/* CB075C 80241A1C 8C620000 */  lw        $v0, ($v1)
-/* CB0760 80241A20 5040000A */  beql      $v0, $zero, .L80241A4C
-/* CB0764 80241A24 00041080 */   sll      $v0, $a0, 2
-/* CB0768 80241A28 3C058024 */  lui       $a1, %hi(D_802462C0_B4AA30)
-/* CB076C 80241A2C 24A562C0 */  addiu     $a1, $a1, %lo(D_802462C0_B4AA30)
-.L80241A30:
-/* CB0770 80241A30 24630004 */  addiu     $v1, $v1, 4
-/* CB0774 80241A34 24840001 */  addiu     $a0, $a0, 1
-/* CB0778 80241A38 ACA20000 */  sw        $v0, ($a1)
-/* CB077C 80241A3C 8C620000 */  lw        $v0, ($v1)
-/* CB0780 80241A40 1440FFFB */  bnez      $v0, .L80241A30
-/* CB0784 80241A44 24A50004 */   addiu    $a1, $a1, 4
-/* CB0788 80241A48 00041080 */  sll       $v0, $a0, 2
-.L80241A4C:
-/* CB078C 80241A4C 3C018024 */  lui       $at, %hi(D_802462C0_B4AA30)
-/* CB0790 80241A50 00220821 */  addu      $at, $at, $v0
-/* CB0794 80241A54 AC2062C0 */  sw        $zero, %lo(D_802462C0_B4AA30)($at)
-/* CB0798 80241A58 080906A2 */  j         .L80241A88
-/* CB079C 80241A5C 00000000 */   nop
-.L80241A60:
-/* CB07A0 80241A60 3C038024 */  lui       $v1, %hi(D_802462C0_B4AA30)
-/* CB07A4 80241A64 246362C0 */  addiu     $v1, $v1, %lo(D_802462C0_B4AA30)
-/* CB07A8 80241A68 0060282D */  daddu     $a1, $v1, $zero
-.L80241A6C:
-/* CB07AC 80241A6C 24820080 */  addiu     $v0, $a0, 0x80
-/* CB07B0 80241A70 AC620000 */  sw        $v0, ($v1)
-/* CB07B4 80241A74 24630004 */  addiu     $v1, $v1, 4
-/* CB07B8 80241A78 24840001 */  addiu     $a0, $a0, 1
-/* CB07BC 80241A7C 2882005B */  slti      $v0, $a0, 0x5b
-/* CB07C0 80241A80 1440FFFA */  bnez      $v0, .L80241A6C
-/* CB07C4 80241A84 ACA0016C */   sw       $zero, 0x16c($a1)
-.L80241A88:
-/* CB07C8 80241A88 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CB07CC 80241A8C 24020002 */  addiu     $v0, $zero, 2
-/* CB07D0 80241A90 03E00008 */  jr        $ra
-/* CB07D4 80241A94 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s
deleted file mode 100644
index f5e49334e6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A98_CB07D8
-/* CB07D8 80241A98 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CB07DC 80241A9C AFB10014 */  sw        $s1, 0x14($sp)
-/* CB07E0 80241AA0 0080882D */  daddu     $s1, $a0, $zero
-/* CB07E4 80241AA4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* CB07E8 80241AA8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CB07EC 80241AAC AFB20018 */  sw        $s2, 0x18($sp)
-/* CB07F0 80241AB0 AFB00010 */  sw        $s0, 0x10($sp)
-/* CB07F4 80241AB4 8E30000C */  lw        $s0, 0xc($s1)
-/* CB07F8 80241AB8 8E050000 */  lw        $a1, ($s0)
-/* CB07FC 80241ABC 0C0B1EAF */  jal       get_variable
-/* CB0800 80241AC0 26100004 */   addiu    $s0, $s0, 4
-/* CB0804 80241AC4 8E050000 */  lw        $a1, ($s0)
-/* CB0808 80241AC8 26100004 */  addiu     $s0, $s0, 4
-/* CB080C 80241ACC 0220202D */  daddu     $a0, $s1, $zero
-/* CB0810 80241AD0 0C0B1EAF */  jal       get_variable
-/* CB0814 80241AD4 0040982D */   daddu    $s3, $v0, $zero
-/* CB0818 80241AD8 8E050000 */  lw        $a1, ($s0)
-/* CB081C 80241ADC 26100004 */  addiu     $s0, $s0, 4
-/* CB0820 80241AE0 0220202D */  daddu     $a0, $s1, $zero
-/* CB0824 80241AE4 0C0B1EAF */  jal       get_variable
-/* CB0828 80241AE8 0040902D */   daddu    $s2, $v0, $zero
-/* CB082C 80241AEC 0220202D */  daddu     $a0, $s1, $zero
-/* CB0830 80241AF0 8E050000 */  lw        $a1, ($s0)
-/* CB0834 80241AF4 0C0B1EAF */  jal       get_variable
-/* CB0838 80241AF8 0040882D */   daddu    $s1, $v0, $zero
-/* CB083C 80241AFC 0260202D */  daddu     $a0, $s3, $zero
-/* CB0840 80241B00 0C04C3D6 */  jal       get_item_entity
-/* CB0844 80241B04 0040802D */   daddu    $s0, $v0, $zero
-/* CB0848 80241B08 0040182D */  daddu     $v1, $v0, $zero
-/* CB084C 80241B0C 44920000 */  mtc1      $s2, $f0
-/* CB0850 80241B10 00000000 */  nop
-/* CB0854 80241B14 46800020 */  cvt.s.w   $f0, $f0
-/* CB0858 80241B18 E4600008 */  swc1      $f0, 8($v1)
-/* CB085C 80241B1C 44910000 */  mtc1      $s1, $f0
-/* CB0860 80241B20 00000000 */  nop
-/* CB0864 80241B24 46800020 */  cvt.s.w   $f0, $f0
-/* CB0868 80241B28 E460000C */  swc1      $f0, 0xc($v1)
-/* CB086C 80241B2C 44900000 */  mtc1      $s0, $f0
-/* CB0870 80241B30 00000000 */  nop
-/* CB0874 80241B34 46800020 */  cvt.s.w   $f0, $f0
-/* CB0878 80241B38 E4600010 */  swc1      $f0, 0x10($v1)
-/* CB087C 80241B3C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CB0880 80241B40 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CB0884 80241B44 8FB20018 */  lw        $s2, 0x18($sp)
-/* CB0888 80241B48 8FB10014 */  lw        $s1, 0x14($sp)
-/* CB088C 80241B4C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CB0890 80241B50 24020002 */  addiu     $v0, $zero, 2
-/* CB0894 80241B54 03E00008 */  jr        $ra
-/* CB0898 80241B58 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241B5C_CB089C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241B5C_CB089C.s
deleted file mode 100644
index 63f10f60ab..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241B5C_CB089C.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B5C_CB089C
-/* CB089C 80241B5C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CB08A0 80241B60 AFB00010 */  sw        $s0, 0x10($sp)
-/* CB08A4 80241B64 0080802D */  daddu     $s0, $a0, $zero
-/* CB08A8 80241B68 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CB08AC 80241B6C 8E02000C */  lw        $v0, 0xc($s0)
-/* CB08B0 80241B70 0C0B1EAF */  jal       get_variable
-/* CB08B4 80241B74 8C450000 */   lw       $a1, ($v0)
-/* CB08B8 80241B78 3C048008 */  lui       $a0, %hi(gItemTable)
-/* CB08BC 80241B7C 248478E0 */  addiu     $a0, $a0, %lo(gItemTable)
-/* CB08C0 80241B80 00021940 */  sll       $v1, $v0, 5
-/* CB08C4 80241B84 00642021 */  addu      $a0, $v1, $a0
-/* CB08C8 80241B88 240300BB */  addiu     $v1, $zero, 0xbb
-/* CB08CC 80241B8C 14430003 */  bne       $v0, $v1, .L80241B9C
-/* CB08D0 80241B90 24020002 */   addiu    $v0, $zero, 2
-/* CB08D4 80241B94 080906EE */  j         .L80241BB8
-/* CB08D8 80241B98 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80241B9C:
-/* CB08DC 80241B9C 94820018 */  lhu       $v0, 0x18($a0)
-/* CB08E0 80241BA0 30420080 */  andi      $v0, $v0, 0x80
-/* CB08E4 80241BA4 10400003 */  beqz      $v0, .L80241BB4
-/* CB08E8 80241BA8 24020001 */   addiu    $v0, $zero, 1
-/* CB08EC 80241BAC 080906EE */  j         .L80241BB8
-/* CB08F0 80241BB0 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80241BB4:
-/* CB08F4 80241BB4 AE0000A8 */  sw        $zero, 0xa8($s0)
-.L80241BB8:
-/* CB08F8 80241BB8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CB08FC 80241BBC 8FB00010 */  lw        $s0, 0x10($sp)
-/* CB0900 80241BC0 24020002 */  addiu     $v0, $zero, 2
-/* CB0904 80241BC4 03E00008 */  jr        $ra
-/* CB0908 80241BC8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241BCC_CB090C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241BCC_CB090C.s
deleted file mode 100644
index 60e48d00fa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241BCC_CB090C.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241BCC_CB090C
-/* CB090C 80241BCC 2404005A */  addiu     $a0, $zero, 0x5a
-/* CB0910 80241BD0 3C038024 */  lui       $v1, %hi(D_80246598)
-/* CB0914 80241BD4 24636598 */  addiu     $v1, $v1, %lo(D_80246598)
-/* CB0918 80241BD8 240200DA */  addiu     $v0, $zero, 0xda
-.L80241BDC:
-/* CB091C 80241BDC AC620000 */  sw        $v0, ($v1)
-/* CB0920 80241BE0 2463FFFC */  addiu     $v1, $v1, -4
-/* CB0924 80241BE4 2484FFFF */  addiu     $a0, $a0, -1
-/* CB0928 80241BE8 0481FFFC */  bgez      $a0, .L80241BDC
-/* CB092C 80241BEC 2442FFFF */   addiu    $v0, $v0, -1
-/* CB0930 80241BF0 3C018024 */  lui       $at, %hi(D_8024659C)
-/* CB0934 80241BF4 AC20659C */  sw        $zero, %lo(D_8024659C)($at)
-/* CB0938 80241BF8 03E00008 */  jr        $ra
-/* CB093C 80241BFC 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CB0B80/func_80241E40_CB0B80.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CB0B80/func_80241E40_CB0B80.s
deleted file mode 100644
index 7bedbffd27..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CB0B80/func_80241E40_CB0B80.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E40_CB0B80
-/* CB0B80 80241E40 8C820084 */  lw        $v0, 0x84($a0)
-/* CB0B84 80241E44 8C830090 */  lw        $v1, 0x90($a0)
-/* CB0B88 80241E48 00431023 */  subu      $v0, $v0, $v1
-/* CB0B8C 80241E4C 44821000 */  mtc1      $v0, $f2
-/* CB0B90 80241E50 00000000 */  nop
-/* CB0B94 80241E54 468010A0 */  cvt.s.w   $f2, $f2
-/* CB0B98 80241E58 8C820088 */  lw        $v0, 0x88($a0)
-/* CB0B9C 80241E5C 8C830094 */  lw        $v1, 0x94($a0)
-/* CB0BA0 80241E60 46021082 */  mul.s     $f2, $f2, $f2
-/* CB0BA4 80241E64 00000000 */  nop
-/* CB0BA8 80241E68 00431023 */  subu      $v0, $v0, $v1
-/* CB0BAC 80241E6C 44822000 */  mtc1      $v0, $f4
-/* CB0BB0 80241E70 00000000 */  nop
-/* CB0BB4 80241E74 46802120 */  cvt.s.w   $f4, $f4
-/* CB0BB8 80241E78 8C82008C */  lw        $v0, 0x8c($a0)
-/* CB0BBC 80241E7C 46042102 */  mul.s     $f4, $f4, $f4
-/* CB0BC0 80241E80 00000000 */  nop
-/* CB0BC4 80241E84 8C830098 */  lw        $v1, 0x98($a0)
-/* CB0BC8 80241E88 00431023 */  subu      $v0, $v0, $v1
-/* CB0BCC 80241E8C 44820000 */  mtc1      $v0, $f0
-/* CB0BD0 80241E90 00000000 */  nop
-/* CB0BD4 80241E94 46800020 */  cvt.s.w   $f0, $f0
-/* CB0BD8 80241E98 46000002 */  mul.s     $f0, $f0, $f0
-/* CB0BDC 80241E9C 00000000 */  nop
-/* CB0BE0 80241EA0 46041080 */  add.s     $f2, $f2, $f4
-/* CB0BE4 80241EA4 46001080 */  add.s     $f2, $f2, $f0
-/* CB0BE8 80241EA8 3C014561 */  lui       $at, 0x4561
-/* CB0BEC 80241EAC 44810000 */  mtc1      $at, $f0
-/* CB0BF0 80241EB0 00000000 */  nop
-/* CB0BF4 80241EB4 4600103C */  c.lt.s    $f2, $f0
-/* CB0BF8 80241EB8 00000000 */  nop
-/* CB0BFC 80241EBC 45010002 */  bc1t      .L80241EC8
-/* CB0C00 80241EC0 24020001 */   addiu    $v0, $zero, 1
-/* CB0C04 80241EC4 0000102D */  daddu     $v0, $zero, $zero
-.L80241EC8:
-/* CB0C08 80241EC8 AC820084 */  sw        $v0, 0x84($a0)
-/* CB0C0C 80241ECC 03E00008 */  jr        $ra
-/* CB0C10 80241ED0 24020002 */   addiu    $v0, $zero, 2
-/* CB0C14 80241ED4 00000000 */  nop
-/* CB0C18 80241ED8 00000000 */  nop
-/* CB0C1C 80241EDC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5000/func_80240000_CB5000.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5000/func_80240000_CB5000.s
deleted file mode 100644
index 4b7b3ae4a8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5000/func_80240000_CB5000.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CB5000
-/* CB5000 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CB5004 80240004 24040001 */  addiu     $a0, $zero, 1
-/* CB5008 80240008 0000282D */  daddu     $a1, $zero, $zero
-/* CB500C 8024000C 00A0302D */  daddu     $a2, $a1, $zero
-/* CB5010 80240010 00A0382D */  daddu     $a3, $a1, $zero
-/* CB5014 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CB5018 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CB501C 8024001C 0C01CA54 */  jal       func_80072950
-/* CB5020 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CB5024 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CB5028 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CB502C 8024002C 03E00008 */  jr        $ra
-/* CB5030 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CB5034 80240034 00000000 */  nop
-/* CB5038 80240038 00000000 */  nop
-/* CB503C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5040/func_80240040_CB5040.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5040/func_80240040_CB5040.s
deleted file mode 100644
index 4dc336a0aa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5040/func_80240040_CB5040.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CB5040
-/* CB5040 80240040 8C820084 */  lw        $v0, 0x84($a0)
-/* CB5044 80240044 8C830090 */  lw        $v1, 0x90($a0)
-/* CB5048 80240048 00431023 */  subu      $v0, $v0, $v1
-/* CB504C 8024004C 44821000 */  mtc1      $v0, $f2
-/* CB5050 80240050 00000000 */  nop
-/* CB5054 80240054 468010A0 */  cvt.s.w   $f2, $f2
-/* CB5058 80240058 8C820088 */  lw        $v0, 0x88($a0)
-/* CB505C 8024005C 8C830094 */  lw        $v1, 0x94($a0)
-/* CB5060 80240060 46021082 */  mul.s     $f2, $f2, $f2
-/* CB5064 80240064 00000000 */  nop
-/* CB5068 80240068 00431023 */  subu      $v0, $v0, $v1
-/* CB506C 8024006C 44822000 */  mtc1      $v0, $f4
-/* CB5070 80240070 00000000 */  nop
-/* CB5074 80240074 46802120 */  cvt.s.w   $f4, $f4
-/* CB5078 80240078 8C82008C */  lw        $v0, 0x8c($a0)
-/* CB507C 8024007C 46042102 */  mul.s     $f4, $f4, $f4
-/* CB5080 80240080 00000000 */  nop
-/* CB5084 80240084 8C830098 */  lw        $v1, 0x98($a0)
-/* CB5088 80240088 00431023 */  subu      $v0, $v0, $v1
-/* CB508C 8024008C 44820000 */  mtc1      $v0, $f0
-/* CB5090 80240090 00000000 */  nop
-/* CB5094 80240094 46800020 */  cvt.s.w   $f0, $f0
-/* CB5098 80240098 46000002 */  mul.s     $f0, $f0, $f0
-/* CB509C 8024009C 00000000 */  nop
-/* CB50A0 802400A0 46041080 */  add.s     $f2, $f2, $f4
-/* CB50A4 802400A4 46001080 */  add.s     $f2, $f2, $f0
-/* CB50A8 802400A8 3C014561 */  lui       $at, 0x4561
-/* CB50AC 802400AC 44810000 */  mtc1      $at, $f0
-/* CB50B0 802400B0 00000000 */  nop
-/* CB50B4 802400B4 4600103C */  c.lt.s    $f2, $f0
-/* CB50B8 802400B8 00000000 */  nop
-/* CB50BC 802400BC 45010002 */  bc1t      .L802400C8
-/* CB50C0 802400C0 24020001 */   addiu    $v0, $zero, 1
-/* CB50C4 802400C4 0000102D */  daddu     $v0, $zero, $zero
-.L802400C8:
-/* CB50C8 802400C8 AC820084 */  sw        $v0, 0x84($a0)
-/* CB50CC 802400CC 03E00008 */  jr        $ra
-/* CB50D0 802400D0 24020002 */   addiu    $v0, $zero, 2
-/* CB50D4 802400D4 00000000 */  nop
-/* CB50D8 802400D8 00000000 */  nop
-/* CB50DC 802400DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/flo_09_func_802404D0_CB54D0.s
similarity index 99%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/flo_09_func_802404D0_CB54D0.s
index a69eb509bd..d5ed5cddc5 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/flo_09_func_802404D0_CB54D0.s
@@ -1,7 +1,17 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802404D0_CB54D0
+.section .rodata
+
+glabel D_802441A8_CB91A8
+.double 0.09
+
+glabel D_802441B0_CB91B0
+.double 0.09
+
+.section .text
+
+glabel flo_09_func_802404D0_CB54D0
 /* CB54D0 802404D0 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* CB54D4 802404D4 AFB3004C */  sw        $s3, 0x4c($sp)
 /* CB54D8 802404D8 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s
deleted file mode 100644
index c6b48ab0e8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240320_CB5320
-/* CB5320 80240320 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CB5324 80240324 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CB5328 80240328 0080982D */  daddu     $s3, $a0, $zero
-/* CB532C 8024032C AFBF0030 */  sw        $ra, 0x30($sp)
-/* CB5330 80240330 AFB20028 */  sw        $s2, 0x28($sp)
-/* CB5334 80240334 AFB10024 */  sw        $s1, 0x24($sp)
-/* CB5338 80240338 AFB00020 */  sw        $s0, 0x20($sp)
-/* CB533C 8024033C 8E710148 */  lw        $s1, 0x148($s3)
-/* CB5340 80240340 86240008 */  lh        $a0, 8($s1)
-/* CB5344 80240344 0C00EABB */  jal       get_npc_unsafe
-/* CB5348 80240348 00A0902D */   daddu    $s2, $a1, $zero
-/* CB534C 8024034C 8E440004 */  lw        $a0, 4($s2)
-/* CB5350 80240350 0040802D */  daddu     $s0, $v0, $zero
-/* CB5354 80240354 00041FC2 */  srl       $v1, $a0, 0x1f
-/* CB5358 80240358 00832021 */  addu      $a0, $a0, $v1
-/* CB535C 8024035C 00042043 */  sra       $a0, $a0, 1
-/* CB5360 80240360 0C00A67F */  jal       rand_int
-/* CB5364 80240364 24840001 */   addiu    $a0, $a0, 1
-/* CB5368 80240368 8E430004 */  lw        $v1, 4($s2)
-/* CB536C 8024036C 000327C2 */  srl       $a0, $v1, 0x1f
-/* CB5370 80240370 00641821 */  addu      $v1, $v1, $a0
-/* CB5374 80240374 00031843 */  sra       $v1, $v1, 1
-/* CB5378 80240378 00621821 */  addu      $v1, $v1, $v0
-/* CB537C 8024037C A603008E */  sh        $v1, 0x8e($s0)
-/* CB5380 80240380 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CB5384 80240384 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CB5388 80240388 C4640000 */  lwc1      $f4, ($v1)
-/* CB538C 8024038C 46802120 */  cvt.s.w   $f4, $f4
-/* CB5390 80240390 C4620008 */  lwc1      $f2, 8($v1)
-/* CB5394 80240394 468010A0 */  cvt.s.w   $f2, $f2
-/* CB5398 80240398 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CB539C 8024039C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CB53A0 802403A0 44061000 */  mfc1      $a2, $f2
-/* CB53A4 802403A4 C440000C */  lwc1      $f0, 0xc($v0)
-/* CB53A8 802403A8 46800020 */  cvt.s.w   $f0, $f0
-/* CB53AC 802403AC E7A00014 */  swc1      $f0, 0x14($sp)
-/* CB53B0 802403B0 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CB53B4 802403B4 44052000 */  mfc1      $a1, $f4
-/* CB53B8 802403B8 C4400010 */  lwc1      $f0, 0x10($v0)
-/* CB53BC 802403BC 46800020 */  cvt.s.w   $f0, $f0
-/* CB53C0 802403C0 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CB53C4 802403C4 8C640018 */  lw        $a0, 0x18($v1)
-/* CB53C8 802403C8 0C0123F5 */  jal       is_point_within_region
-/* CB53CC 802403CC 8E070038 */   lw       $a3, 0x38($s0)
-/* CB53D0 802403D0 1040000E */  beqz      $v0, .L8024040C
-/* CB53D4 802403D4 00000000 */   nop
-/* CB53D8 802403D8 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CB53DC 802403DC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CB53E0 802403E0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CB53E4 802403E4 C4460000 */  lwc1      $f6, ($v0)
-/* CB53E8 802403E8 468031A0 */  cvt.s.w   $f6, $f6
-/* CB53EC 802403EC 44063000 */  mfc1      $a2, $f6
-/* CB53F0 802403F0 C4460008 */  lwc1      $f6, 8($v0)
-/* CB53F4 802403F4 468031A0 */  cvt.s.w   $f6, $f6
-/* CB53F8 802403F8 44073000 */  mfc1      $a3, $f6
-/* CB53FC 802403FC 0C00A720 */  jal       atan2
-/* CB5400 80240400 00000000 */   nop
-/* CB5404 80240404 0809010F */  j         .L8024043C
-/* CB5408 80240408 E600000C */   swc1     $f0, 0xc($s0)
-.L8024040C:
-/* CB540C 8024040C 0C00A67F */  jal       rand_int
-/* CB5410 80240410 2404003C */   addiu    $a0, $zero, 0x3c
-/* CB5414 80240414 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CB5418 80240418 44820000 */  mtc1      $v0, $f0
-/* CB541C 8024041C 00000000 */  nop
-/* CB5420 80240420 46800020 */  cvt.s.w   $f0, $f0
-/* CB5424 80240424 46006300 */  add.s     $f12, $f12, $f0
-/* CB5428 80240428 3C0141F0 */  lui       $at, 0x41f0
-/* CB542C 8024042C 44810000 */  mtc1      $at, $f0
-/* CB5430 80240430 0C00A6C9 */  jal       clamp_angle
-/* CB5434 80240434 46006301 */   sub.s    $f12, $f12, $f0
-/* CB5438 80240438 E600000C */  swc1      $f0, 0xc($s0)
-.L8024043C:
-/* CB543C 8024043C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CB5440 80240440 8C420004 */  lw        $v0, 4($v0)
-/* CB5444 80240444 AE020028 */  sw        $v0, 0x28($s0)
-/* CB5448 80240448 AE600074 */  sw        $zero, 0x74($s3)
-/* CB544C 8024044C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CB5450 80240450 8C420014 */  lw        $v0, 0x14($v0)
-/* CB5454 80240454 04410004 */  bgez      $v0, .L80240468
-/* CB5458 80240458 00000000 */   nop
-/* CB545C 8024045C C6400000 */  lwc1      $f0, ($s2)
-/* CB5460 80240460 08090122 */  j         .L80240488
-/* CB5464 80240464 E6000018 */   swc1     $f0, 0x18($s0)
-.L80240468:
-/* CB5468 80240468 3C018024 */  lui       $at, %hi(D_802441A0_CB91A0)
-/* CB546C 8024046C D42241A0 */  ldc1      $f2, %lo(D_802441A0_CB91A0)($at)
-/* CB5470 80240470 44820000 */  mtc1      $v0, $f0
-/* CB5474 80240474 00000000 */  nop
-/* CB5478 80240478 46800021 */  cvt.d.w   $f0, $f0
-/* CB547C 8024047C 46220003 */  div.d     $f0, $f0, $f2
-/* CB5480 80240480 46200020 */  cvt.s.d   $f0, $f0
-/* CB5484 80240484 E6000018 */  swc1      $f0, 0x18($s0)
-.L80240488:
-/* CB5488 80240488 C600003C */  lwc1      $f0, 0x3c($s0)
-/* CB548C 8024048C 3C014059 */  lui       $at, 0x4059
-/* CB5490 80240490 44811800 */  mtc1      $at, $f3
-/* CB5494 80240494 44801000 */  mtc1      $zero, $f2
-/* CB5498 80240498 46000021 */  cvt.d.s   $f0, $f0
-/* CB549C 8024049C 46220002 */  mul.d     $f0, $f0, $f2
-/* CB54A0 802404A0 00000000 */  nop
-/* CB54A4 802404A4 24020001 */  addiu     $v0, $zero, 1
-/* CB54A8 802404A8 4620018D */  trunc.w.d $f6, $f0
-/* CB54AC 802404AC E626007C */  swc1      $f6, 0x7c($s1)
-/* CB54B0 802404B0 AE620070 */  sw        $v0, 0x70($s3)
-/* CB54B4 802404B4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CB54B8 802404B8 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CB54BC 802404BC 8FB20028 */  lw        $s2, 0x28($sp)
-/* CB54C0 802404C0 8FB10024 */  lw        $s1, 0x24($sp)
-/* CB54C4 802404C4 8FB00020 */  lw        $s0, 0x20($sp)
-/* CB54C8 802404C8 03E00008 */  jr        $ra
-/* CB54CC 802404CC 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s
deleted file mode 100644
index 9ff0c483bd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F74_CB5F74
-/* CB5F74 80240F74 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CB5F78 80240F78 AFB00010 */  sw        $s0, 0x10($sp)
-/* CB5F7C 80240F7C 0080802D */  daddu     $s0, $a0, $zero
-/* CB5F80 80240F80 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CB5F84 80240F84 8E020148 */  lw        $v0, 0x148($s0)
-/* CB5F88 80240F88 0C00EABB */  jal       get_npc_unsafe
-/* CB5F8C 80240F8C 84440008 */   lh       $a0, 8($v0)
-/* CB5F90 80240F90 9443008E */  lhu       $v1, 0x8e($v0)
-/* CB5F94 80240F94 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CB5F98 80240F98 24640001 */  addiu     $a0, $v1, 1
-/* CB5F9C 80240F9C 00031C00 */  sll       $v1, $v1, 0x10
-/* CB5FA0 80240FA0 00031B83 */  sra       $v1, $v1, 0xe
-/* CB5FA4 80240FA4 A444008E */  sh        $a0, 0x8e($v0)
-/* CB5FA8 80240FA8 3C018024 */  lui       $at, %hi(D_8024362C_CB862C)
-/* CB5FAC 80240FAC 00230821 */  addu      $at, $at, $v1
-/* CB5FB0 80240FB0 C422362C */  lwc1      $f2, %lo(D_8024362C_CB862C)($at)
-/* CB5FB4 80240FB4 8443008E */  lh        $v1, 0x8e($v0)
-/* CB5FB8 80240FB8 46020000 */  add.s     $f0, $f0, $f2
-/* CB5FBC 80240FBC 28630005 */  slti      $v1, $v1, 5
-/* CB5FC0 80240FC0 14600003 */  bnez      $v1, .L80240FD0
-/* CB5FC4 80240FC4 E440003C */   swc1     $f0, 0x3c($v0)
-/* CB5FC8 80240FC8 2402000C */  addiu     $v0, $zero, 0xc
-/* CB5FCC 80240FCC AE020070 */  sw        $v0, 0x70($s0)
-.L80240FD0:
-/* CB5FD0 80240FD0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CB5FD4 80240FD4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CB5FD8 80240FD8 03E00008 */  jr        $ra
-/* CB5FDC 80240FDC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s
deleted file mode 100644
index a82406f435..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s
+++ /dev/null
@@ -1,142 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024162C_CB662C
-/* CB662C 8024162C 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CB6630 80241630 AFB40040 */  sw        $s4, 0x40($sp)
-/* CB6634 80241634 0080A02D */  daddu     $s4, $a0, $zero
-/* CB6638 80241638 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CB663C 8024163C AFB50044 */  sw        $s5, 0x44($sp)
-/* CB6640 80241640 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CB6644 80241644 AFB20038 */  sw        $s2, 0x38($sp)
-/* CB6648 80241648 AFB10034 */  sw        $s1, 0x34($sp)
-/* CB664C 8024164C AFB00030 */  sw        $s0, 0x30($sp)
-/* CB6650 80241650 8E920148 */  lw        $s2, 0x148($s4)
-/* CB6654 80241654 86440008 */  lh        $a0, 8($s2)
-/* CB6658 80241658 8E90000C */  lw        $s0, 0xc($s4)
-/* CB665C 8024165C 0C00EABB */  jal       get_npc_unsafe
-/* CB6660 80241660 00A0882D */   daddu    $s1, $a1, $zero
-/* CB6664 80241664 0280202D */  daddu     $a0, $s4, $zero
-/* CB6668 80241668 8E050000 */  lw        $a1, ($s0)
-/* CB666C 8024166C 0C0B1EAF */  jal       get_variable
-/* CB6670 80241670 0040A82D */   daddu    $s5, $v0, $zero
-/* CB6674 80241674 AFA00010 */  sw        $zero, 0x10($sp)
-/* CB6678 80241678 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CB667C 8024167C 8C630030 */  lw        $v1, 0x30($v1)
-/* CB6680 80241680 AFA30014 */  sw        $v1, 0x14($sp)
-/* CB6684 80241684 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CB6688 80241688 8C63001C */  lw        $v1, 0x1c($v1)
-/* CB668C 8024168C AFA30018 */  sw        $v1, 0x18($sp)
-/* CB6690 80241690 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CB6694 80241694 8C630024 */  lw        $v1, 0x24($v1)
-/* CB6698 80241698 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CB669C 8024169C 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CB66A0 802416A0 8C630028 */  lw        $v1, 0x28($v1)
-/* CB66A4 802416A4 27B30010 */  addiu     $s3, $sp, 0x10
-/* CB66A8 802416A8 AFA30020 */  sw        $v1, 0x20($sp)
-/* CB66AC 802416AC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CB66B0 802416B0 3C0142F0 */  lui       $at, 0x42f0
-/* CB66B4 802416B4 44810000 */  mtc1      $at, $f0
-/* CB66B8 802416B8 8C63002C */  lw        $v1, 0x2c($v1)
-/* CB66BC 802416BC 0040802D */  daddu     $s0, $v0, $zero
-/* CB66C0 802416C0 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CB66C4 802416C4 A7A0002C */  sh        $zero, 0x2c($sp)
-/* CB66C8 802416C8 12200006 */  beqz      $s1, .L802416E4
-/* CB66CC 802416CC AFA30024 */   sw       $v1, 0x24($sp)
-/* CB66D0 802416D0 02A0202D */  daddu     $a0, $s5, $zero
-/* CB66D4 802416D4 0240282D */  daddu     $a1, $s2, $zero
-/* CB66D8 802416D8 0280302D */  daddu     $a2, $s4, $zero
-/* CB66DC 802416DC 0C090542 */  jal       flo_09_UnkFunc5
-/* CB66E0 802416E0 0200382D */   daddu    $a3, $s0, $zero
-.L802416E4:
-/* CB66E4 802416E4 2402FFFE */  addiu     $v0, $zero, -2
-/* CB66E8 802416E8 A2A200AB */  sb        $v0, 0xab($s5)
-/* CB66EC 802416EC 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CB66F0 802416F0 30620004 */  andi      $v0, $v1, 4
-/* CB66F4 802416F4 10400007 */  beqz      $v0, .L80241714
-/* CB66F8 802416F8 00000000 */   nop
-/* CB66FC 802416FC 824200B4 */  lb        $v0, 0xb4($s2)
-/* CB6700 80241700 1440003C */  bnez      $v0, .L802417F4
-/* CB6704 80241704 0000102D */   daddu    $v0, $zero, $zero
-/* CB6708 80241708 2402FFFB */  addiu     $v0, $zero, -5
-/* CB670C 8024170C 00621024 */  and       $v0, $v1, $v0
-/* CB6710 80241710 AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80241714:
-/* CB6714 80241714 8E830070 */  lw        $v1, 0x70($s4)
-/* CB6718 80241718 2C62000F */  sltiu     $v0, $v1, 0xf
-/* CB671C 8024171C 10400034 */  beqz      $v0, L802417F0_CB67F0
-/* CB6720 80241720 00031080 */   sll      $v0, $v1, 2
-/* CB6724 80241724 3C018024 */  lui       $at, %hi(jtbl_802441B8_CB91B8)
-/* CB6728 80241728 00220821 */  addu      $at, $at, $v0
-/* CB672C 8024172C 8C2241B8 */  lw        $v0, %lo(jtbl_802441B8_CB91B8)($at)
-/* CB6730 80241730 00400008 */  jr        $v0
-/* CB6734 80241734 00000000 */   nop
-glabel L80241738_CB6738
-/* CB6738 80241738 0280202D */  daddu     $a0, $s4, $zero
-/* CB673C 8024173C 0200282D */  daddu     $a1, $s0, $zero
-/* CB6740 80241740 0C0900C8 */  jal       func_80240320_CB5320
-/* CB6744 80241744 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241748_CB6748
-/* CB6748 80241748 0280202D */  daddu     $a0, $s4, $zero
-/* CB674C 8024174C 0200282D */  daddu     $a1, $s0, $zero
-/* CB6750 80241750 0C090134 */  jal       func_802404D0_CB54D0
-/* CB6754 80241754 0260302D */   daddu    $a2, $s3, $zero
-/* CB6758 80241758 080905FD */  j         .L802417F4
-/* CB675C 8024175C 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241760_CB6760
-/* CB6760 80241760 0280202D */  daddu     $a0, $s4, $zero
-/* CB6764 80241764 0200282D */  daddu     $a1, $s0, $zero
-/* CB6768 80241768 0C0902BE */  jal       flo_09_UnkNpcAIFunc1
-/* CB676C 8024176C 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241770_CB6770
-/* CB6770 80241770 0280202D */  daddu     $a0, $s4, $zero
-/* CB6774 80241774 0200282D */  daddu     $a1, $s0, $zero
-/* CB6778 80241778 0C0902EE */  jal       flo_09_UnkFunc4
-/* CB677C 8024177C 0260302D */   daddu    $a2, $s3, $zero
-/* CB6780 80241780 080905FD */  j         .L802417F4
-/* CB6784 80241784 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241788_CB6788
-/* CB6788 80241788 0280202D */  daddu     $a0, $s4, $zero
-/* CB678C 8024178C 0200282D */  daddu     $a1, $s0, $zero
-/* CB6790 80241790 0C0903BF */  jal       flo_09_UnkNpcAIFunc2
-/* CB6794 80241794 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241798_CB6798
-/* CB6798 80241798 0280202D */  daddu     $a0, $s4, $zero
-/* CB679C 8024179C 0200282D */  daddu     $a1, $s0, $zero
-/* CB67A0 802417A0 0C0903DD */  jal       func_80240F74_CB5F74
-/* CB67A4 802417A4 0260302D */   daddu    $a2, $s3, $zero
-/* CB67A8 802417A8 080905FD */  j         .L802417F4
-/* CB67AC 802417AC 0000102D */   daddu    $v0, $zero, $zero
-glabel L802417B0_CB67B0
-/* CB67B0 802417B0 0280202D */  daddu     $a0, $s4, $zero
-/* CB67B4 802417B4 0200282D */  daddu     $a1, $s0, $zero
-/* CB67B8 802417B8 0C0903F8 */  jal       flo_09_UnkNpcAIFunc14
-/* CB67BC 802417BC 0260302D */   daddu    $a2, $s3, $zero
-/* CB67C0 802417C0 080905FD */  j         .L802417F4
-/* CB67C4 802417C4 0000102D */   daddu    $v0, $zero, $zero
-glabel L802417C8_CB67C8
-/* CB67C8 802417C8 0280202D */  daddu     $a0, $s4, $zero
-/* CB67CC 802417CC 0200282D */  daddu     $a1, $s0, $zero
-/* CB67D0 802417D0 0C090445 */  jal       flo_09_UnkNpcAIFunc3
-/* CB67D4 802417D4 0260302D */   daddu    $a2, $s3, $zero
-/* CB67D8 802417D8 080905FD */  j         .L802417F4
-/* CB67DC 802417DC 0000102D */   daddu    $v0, $zero, $zero
-glabel L802417E0_CB67E0
-/* CB67E0 802417E0 0280202D */  daddu     $a0, $s4, $zero
-/* CB67E4 802417E4 0200282D */  daddu     $a1, $s0, $zero
-/* CB67E8 802417E8 0C09045E */  jal       flo_09_UnkFunc6
-/* CB67EC 802417EC 0260302D */   daddu    $a2, $s3, $zero
-glabel L802417F0_CB67F0
-/* CB67F0 802417F0 0000102D */  daddu     $v0, $zero, $zero
-.L802417F4:
-/* CB67F4 802417F4 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CB67F8 802417F8 8FB50044 */  lw        $s5, 0x44($sp)
-/* CB67FC 802417FC 8FB40040 */  lw        $s4, 0x40($sp)
-/* CB6800 80241800 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CB6804 80241804 8FB20038 */  lw        $s2, 0x38($sp)
-/* CB6808 80241808 8FB10034 */  lw        $s1, 0x34($sp)
-/* CB680C 8024180C 8FB00030 */  lw        $s0, 0x30($sp)
-/* CB6810 80241810 03E00008 */  jr        $ra
-/* CB6814 80241814 27BD0050 */   addiu    $sp, $sp, 0x50
-/* CB6818 80241818 00000000 */  nop
-/* CB681C 8024181C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9200/func_80240000_CB9200.s b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9200/func_80240000_CB9200.s
deleted file mode 100644
index 5a28092c42..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9200/func_80240000_CB9200.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CB9200
-/* CB9200 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CB9204 80240004 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CB9208 80240008 3C05F5DE */  lui       $a1, 0xf5de
-/* CB920C 8024000C 34A50180 */  ori       $a1, $a1, 0x180
-/* CB9210 80240010 0C0B1EAF */  jal       get_variable
-/* CB9214 80240014 0000202D */   daddu    $a0, $zero, $zero
-/* CB9218 80240018 28430031 */  slti      $v1, $v0, 0x31
-/* CB921C 8024001C 3C020019 */  lui       $v0, 0x19
-/* CB9220 80240020 14600003 */  bnez      $v1, .L80240030
-/* CB9224 80240024 34420119 */   ori      $v0, $v0, 0x119
-/* CB9228 80240028 3C020019 */  lui       $v0, 0x19
-/* CB922C 8024002C 3442011A */  ori       $v0, $v0, 0x11a
-.L80240030:
-/* CB9230 80240030 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CB9234 80240034 03E00008 */  jr        $ra
-/* CB9238 80240038 27BD0018 */   addiu    $sp, $sp, 0x18
-/* CB923C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9240/func_80240040_CB9240.s b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9240/func_80240040_CB9240.s
deleted file mode 100644
index 6a22d188cd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9240/func_80240040_CB9240.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CB9240
-/* CB9240 80240040 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CB9244 80240044 24040001 */  addiu     $a0, $zero, 1
-/* CB9248 80240048 0000282D */  daddu     $a1, $zero, $zero
-/* CB924C 8024004C 00A0302D */  daddu     $a2, $a1, $zero
-/* CB9250 80240050 00A0382D */  daddu     $a3, $a1, $zero
-/* CB9254 80240054 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CB9258 80240058 AFA00010 */  sw        $zero, 0x10($sp)
-/* CB925C 8024005C 0C01CA54 */  jal       func_80072950
-/* CB9260 80240060 AFA00014 */   sw       $zero, 0x14($sp)
-/* CB9264 80240064 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CB9268 80240068 24020002 */  addiu     $v0, $zero, 2
-/* CB926C 8024006C 03E00008 */  jr        $ra
-/* CB9270 80240070 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CB9274 80240074 00000000 */  nop
-/* CB9278 80240078 00000000 */  nop
-/* CB927C 8024007C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s
deleted file mode 100644
index 1a7e71b4b8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240080_CB9280
-/* CB9280 80240080 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CB9284 80240084 AFB00010 */  sw        $s0, 0x10($sp)
-/* CB9288 80240088 3C108024 */  lui       $s0, %hi(D_80241CB0_CBAEB0)
-/* CB928C 8024008C 26101CB0 */  addiu     $s0, $s0, %lo(D_80241CB0_CBAEB0)
-/* CB9290 80240090 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CB9294 80240094 AFB10014 */  sw        $s1, 0x14($sp)
-/* CB9298 80240098 8E020000 */  lw        $v0, ($s0)
-/* CB929C 8024009C 14400010 */  bnez      $v0, .L802400E0
-/* CB92A0 802400A0 0080882D */   daddu    $s1, $a0, $zero
-/* CB92A4 802400A4 0C00AB39 */  jal       heap_malloc
-/* CB92A8 802400A8 24040040 */   addiu    $a0, $zero, 0x40
-/* CB92AC 802400AC AE020000 */  sw        $v0, ($s0)
-/* CB92B0 802400B0 0000182D */  daddu     $v1, $zero, $zero
-/* CB92B4 802400B4 0040282D */  daddu     $a1, $v0, $zero
-/* CB92B8 802400B8 0220202D */  daddu     $a0, $s1, $zero
-.L802400BC:
-/* CB92BC 802400BC 8C820084 */  lw        $v0, 0x84($a0)
-/* CB92C0 802400C0 24840004 */  addiu     $a0, $a0, 4
-/* CB92C4 802400C4 24630001 */  addiu     $v1, $v1, 1
-/* CB92C8 802400C8 ACA20000 */  sw        $v0, ($a1)
-/* CB92CC 802400CC 28620010 */  slti      $v0, $v1, 0x10
-/* CB92D0 802400D0 1440FFFA */  bnez      $v0, .L802400BC
-/* CB92D4 802400D4 24A50004 */   addiu    $a1, $a1, 4
-/* CB92D8 802400D8 08090047 */  j         .L8024011C
-/* CB92DC 802400DC 00000000 */   nop
-.L802400E0:
-/* CB92E0 802400E0 0000182D */  daddu     $v1, $zero, $zero
-/* CB92E4 802400E4 0040282D */  daddu     $a1, $v0, $zero
-/* CB92E8 802400E8 0220202D */  daddu     $a0, $s1, $zero
-.L802400EC:
-/* CB92EC 802400EC 8CA20000 */  lw        $v0, ($a1)
-/* CB92F0 802400F0 24A50004 */  addiu     $a1, $a1, 4
-/* CB92F4 802400F4 24630001 */  addiu     $v1, $v1, 1
-/* CB92F8 802400F8 AC820084 */  sw        $v0, 0x84($a0)
-/* CB92FC 802400FC 28620010 */  slti      $v0, $v1, 0x10
-/* CB9300 80240100 1440FFFA */  bnez      $v0, .L802400EC
-/* CB9304 80240104 24840004 */   addiu    $a0, $a0, 4
-/* CB9308 80240108 3C108024 */  lui       $s0, %hi(D_80241CB0_CBAEB0)
-/* CB930C 8024010C 26101CB0 */  addiu     $s0, $s0, %lo(D_80241CB0_CBAEB0)
-/* CB9310 80240110 0C00AB4B */  jal       heap_free
-/* CB9314 80240114 8E040000 */   lw       $a0, ($s0)
-/* CB9318 80240118 AE000000 */  sw        $zero, ($s0)
-.L8024011C:
-/* CB931C 8024011C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CB9320 80240120 8FB10014 */  lw        $s1, 0x14($sp)
-/* CB9324 80240124 8FB00010 */  lw        $s0, 0x10($sp)
-/* CB9328 80240128 24020002 */  addiu     $v0, $zero, 2
-/* CB932C 8024012C 03E00008 */  jr        $ra
-/* CB9330 80240130 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s
similarity index 98%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s
index 54d31080ba..2f4e000898 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s
@@ -1,12 +1,12 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802404B0_CB96B0
+glabel flo_10_func_802404B0_CB96B0
 /* CB96B0 802404B0 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* CB96B4 802404B4 AFB60040 */  sw        $s6, 0x40($sp)
 /* CB96B8 802404B8 0080B02D */  daddu     $s6, $a0, $zero
-/* CB96BC 802404BC 3C028024 */  lui       $v0, %hi(D_80244070_CBD270)
-/* CB96C0 802404C0 24424070 */  addiu     $v0, $v0, %lo(D_80244070_CBD270)
+/* CB96BC 802404BC 3C028024 */  lui       $v0, %hi(flo_10_D_80244070_CBD270)
+/* CB96C0 802404C0 24424070 */  addiu     $v0, $v0, %lo(flo_10_D_80244070_CBD270)
 /* CB96C4 802404C4 AFBF004C */  sw        $ra, 0x4c($sp)
 /* CB96C8 802404C8 AFBE0048 */  sw        $fp, 0x48($sp)
 /* CB96CC 802404CC AFB70044 */  sw        $s7, 0x44($sp)
@@ -218,8 +218,8 @@ glabel func_802404B0_CB96B0
 /* CB99D4 802407D4 26220040 */  addiu     $v0, $s1, 0x40
 /* CB99D8 802407D8 AE230034 */  sw        $v1, 0x34($s1)
 /* CB99DC 802407DC AE620000 */  sw        $v0, ($s3)
-/* CB99E0 802407E0 3C038024 */  lui       $v1, %hi(D_80244070_CBD270)
-/* CB99E4 802407E4 8C634070 */  lw        $v1, %lo(D_80244070_CBD270)($v1)
+/* CB99E0 802407E0 3C038024 */  lui       $v1, %hi(flo_10_D_80244070_CBD270)
+/* CB99E4 802407E4 8C634070 */  lw        $v1, %lo(flo_10_D_80244070_CBD270)($v1)
 /* CB99E8 802407E8 3C02F100 */  lui       $v0, 0xf100
 /* CB99EC 802407EC AE220038 */  sw        $v0, 0x38($s1)
 /* CB99F0 802407F0 8FAA0020 */  lw        $t2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s
deleted file mode 100644
index 43837c17c8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s
+++ /dev/null
@@ -1,508 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A98_CB9C98
-/* CB9C98 80240A98 27BDFF68 */  addiu     $sp, $sp, -0x98
-/* CB9C9C 80240A9C 24040030 */  addiu     $a0, $zero, 0x30
-/* CB9CA0 80240AA0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* CB9CA4 80240AA4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* CB9CA8 80240AA8 3C05800B */  lui       $a1, %hi(gCameras)
-/* CB9CAC 80240AAC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* CB9CB0 80240AB0 AFBF0064 */  sw        $ra, 0x64($sp)
-/* CB9CB4 80240AB4 AFBE0060 */  sw        $fp, 0x60($sp)
-/* CB9CB8 80240AB8 AFB7005C */  sw        $s7, 0x5c($sp)
-/* CB9CBC 80240ABC AFB60058 */  sw        $s6, 0x58($sp)
-/* CB9CC0 80240AC0 AFB50054 */  sw        $s5, 0x54($sp)
-/* CB9CC4 80240AC4 AFB40050 */  sw        $s4, 0x50($sp)
-/* CB9CC8 80240AC8 AFB3004C */  sw        $s3, 0x4c($sp)
-/* CB9CCC 80240ACC AFB20048 */  sw        $s2, 0x48($sp)
-/* CB9CD0 80240AD0 AFB10044 */  sw        $s1, 0x44($sp)
-/* CB9CD4 80240AD4 AFB00040 */  sw        $s0, 0x40($sp)
-/* CB9CD8 80240AD8 F7BE0090 */  sdc1      $f30, 0x90($sp)
-/* CB9CDC 80240ADC F7BC0088 */  sdc1      $f28, 0x88($sp)
-/* CB9CE0 80240AE0 F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* CB9CE4 80240AE4 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* CB9CE8 80240AE8 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* CB9CEC 80240AEC F7B40068 */  sdc1      $f20, 0x68($sp)
-/* CB9CF0 80240AF0 00031080 */  sll       $v0, $v1, 2
-/* CB9CF4 80240AF4 00431021 */  addu      $v0, $v0, $v1
-/* CB9CF8 80240AF8 00021080 */  sll       $v0, $v0, 2
-/* CB9CFC 80240AFC 00431023 */  subu      $v0, $v0, $v1
-/* CB9D00 80240B00 000218C0 */  sll       $v1, $v0, 3
-/* CB9D04 80240B04 00431021 */  addu      $v0, $v0, $v1
-/* CB9D08 80240B08 000210C0 */  sll       $v0, $v0, 3
-/* CB9D0C 80240B0C 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* CB9D10 80240B10 0045B821 */   addu     $s7, $v0, $a1
-/* CB9D14 80240B14 0C046B4C */  jal       get_model_from_list_index
-/* CB9D18 80240B18 0040202D */   daddu    $a0, $v0, $zero
-/* CB9D1C 80240B1C 0040F02D */  daddu     $fp, $v0, $zero
-/* CB9D20 80240B20 27B40028 */  addiu     $s4, $sp, 0x28
-/* CB9D24 80240B24 27B2002C */  addiu     $s2, $sp, 0x2c
-/* CB9D28 80240B28 27B30030 */  addiu     $s3, $sp, 0x30
-/* CB9D2C 80240B2C 27B10034 */  addiu     $s1, $sp, 0x34
-/* CB9D30 80240B30 8FC20008 */  lw        $v0, 8($fp)
-/* CB9D34 80240B34 C7C00098 */  lwc1      $f0, 0x98($fp)
-/* CB9D38 80240B38 8C42000C */  lw        $v0, 0xc($v0)
-/* CB9D3C 80240B3C 3C013F80 */  lui       $at, 0x3f80
-/* CB9D40 80240B40 4481E000 */  mtc1      $at, $f28
-/* CB9D44 80240B44 C45E0004 */  lwc1      $f30, 4($v0)
-/* CB9D48 80240B48 4680F7A0 */  cvt.s.w   $f30, $f30
-/* CB9D4C 80240B4C 461E0001 */  sub.s     $f0, $f0, $f30
-/* CB9D50 80240B50 C448001C */  lwc1      $f8, 0x1c($v0)
-/* CB9D54 80240B54 46804220 */  cvt.s.w   $f8, $f8
-/* CB9D58 80240B58 E7A80038 */  swc1      $f8, 0x38($sp)
-/* CB9D5C 80240B5C 44050000 */  mfc1      $a1, $f0
-/* CB9D60 80240B60 C7C000A0 */  lwc1      $f0, 0xa0($fp)
-/* CB9D64 80240B64 26F000D4 */  addiu     $s0, $s7, 0xd4
-/* CB9D68 80240B68 E7BC0010 */  swc1      $f28, 0x10($sp)
-/* CB9D6C 80240B6C AFB40014 */  sw        $s4, 0x14($sp)
-/* CB9D70 80240B70 AFB20018 */  sw        $s2, 0x18($sp)
-/* CB9D74 80240B74 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CB9D78 80240B78 46080201 */  sub.s     $f8, $f0, $f8
-/* CB9D7C 80240B7C AFB10020 */  sw        $s1, 0x20($sp)
-/* CB9D80 80240B80 8FC6009C */  lw        $a2, 0x9c($fp)
-/* CB9D84 80240B84 44074000 */  mfc1      $a3, $f8
-/* CB9D88 80240B88 0C00A588 */  jal       transform_point
-/* CB9D8C 80240B8C 0200202D */   daddu    $a0, $s0, $zero
-/* CB9D90 80240B90 C7A00034 */  lwc1      $f0, 0x34($sp)
-/* CB9D94 80240B94 C7A60028 */  lwc1      $f6, 0x28($sp)
-/* CB9D98 80240B98 4600E003 */  div.s     $f0, $f28, $f0
-/* CB9D9C 80240B9C 46003182 */  mul.s     $f6, $f6, $f0
-/* CB9DA0 80240BA0 00000000 */  nop
-/* CB9DA4 80240BA4 C7A4002C */  lwc1      $f4, 0x2c($sp)
-/* CB9DA8 80240BA8 46000087 */  neg.s     $f2, $f0
-/* CB9DAC 80240BAC 46022102 */  mul.s     $f4, $f4, $f2
-/* CB9DB0 80240BB0 00000000 */  nop
-/* CB9DB4 80240BB4 C7A20030 */  lwc1      $f2, 0x30($sp)
-/* CB9DB8 80240BB8 46001082 */  mul.s     $f2, $f2, $f0
-/* CB9DBC 80240BBC 00000000 */  nop
-/* CB9DC0 80240BC0 44804000 */  mtc1      $zero, $f8
-/* CB9DC4 80240BC4 00000000 */  nop
-/* CB9DC8 80240BC8 4608003C */  c.lt.s    $f0, $f8
-/* CB9DCC 80240BCC E7A00034 */  swc1      $f0, 0x34($sp)
-/* CB9DD0 80240BD0 E7A60028 */  swc1      $f6, 0x28($sp)
-/* CB9DD4 80240BD4 E7A4002C */  swc1      $f4, 0x2c($sp)
-/* CB9DD8 80240BD8 45000003 */  bc1f      .L80240BE8
-/* CB9DDC 80240BDC E7A20030 */   swc1     $f2, 0x30($sp)
-/* CB9DE0 80240BE0 E7A80028 */  swc1      $f8, 0x28($sp)
-/* CB9DE4 80240BE4 E7BC002C */  swc1      $f28, 0x2c($sp)
-.L80240BE8:
-/* CB9DE8 80240BE8 C7B40028 */  lwc1      $f20, 0x28($sp)
-/* CB9DEC 80240BEC C7B6002C */  lwc1      $f22, 0x2c($sp)
-/* CB9DF0 80240BF0 C7C00098 */  lwc1      $f0, 0x98($fp)
-/* CB9DF4 80240BF4 C7C200A0 */  lwc1      $f2, 0xa0($fp)
-/* CB9DF8 80240BF8 C7A80038 */  lwc1      $f8, 0x38($sp)
-/* CB9DFC 80240BFC E7BC0010 */  swc1      $f28, 0x10($sp)
-/* CB9E00 80240C00 AFB40014 */  sw        $s4, 0x14($sp)
-/* CB9E04 80240C04 AFB20018 */  sw        $s2, 0x18($sp)
-/* CB9E08 80240C08 461E0001 */  sub.s     $f0, $f0, $f30
-/* CB9E0C 80240C0C AFB3001C */  sw        $s3, 0x1c($sp)
-/* CB9E10 80240C10 AFB10020 */  sw        $s1, 0x20($sp)
-/* CB9E14 80240C14 46081200 */  add.s     $f8, $f2, $f8
-/* CB9E18 80240C18 8FC6009C */  lw        $a2, 0x9c($fp)
-/* CB9E1C 80240C1C 44050000 */  mfc1      $a1, $f0
-/* CB9E20 80240C20 44074000 */  mfc1      $a3, $f8
-/* CB9E24 80240C24 0C00A588 */  jal       transform_point
-/* CB9E28 80240C28 0200202D */   daddu    $a0, $s0, $zero
-/* CB9E2C 80240C2C C7A00034 */  lwc1      $f0, 0x34($sp)
-/* CB9E30 80240C30 C7A60028 */  lwc1      $f6, 0x28($sp)
-/* CB9E34 80240C34 4600E003 */  div.s     $f0, $f28, $f0
-/* CB9E38 80240C38 46003182 */  mul.s     $f6, $f6, $f0
-/* CB9E3C 80240C3C 00000000 */  nop
-/* CB9E40 80240C40 C7A4002C */  lwc1      $f4, 0x2c($sp)
-/* CB9E44 80240C44 46000087 */  neg.s     $f2, $f0
-/* CB9E48 80240C48 46022102 */  mul.s     $f4, $f4, $f2
-/* CB9E4C 80240C4C 00000000 */  nop
-/* CB9E50 80240C50 C7A20030 */  lwc1      $f2, 0x30($sp)
-/* CB9E54 80240C54 46001082 */  mul.s     $f2, $f2, $f0
-/* CB9E58 80240C58 00000000 */  nop
-/* CB9E5C 80240C5C 4600A606 */  mov.s     $f24, $f20
-/* CB9E60 80240C60 44804000 */  mtc1      $zero, $f8
-/* CB9E64 80240C64 4600B686 */  mov.s     $f26, $f22
-/* CB9E68 80240C68 4608003C */  c.lt.s    $f0, $f8
-/* CB9E6C 80240C6C E7A00034 */  swc1      $f0, 0x34($sp)
-/* CB9E70 80240C70 E7A60028 */  swc1      $f6, 0x28($sp)
-/* CB9E74 80240C74 E7A4002C */  swc1      $f4, 0x2c($sp)
-/* CB9E78 80240C78 45000003 */  bc1f      .L80240C88
-/* CB9E7C 80240C7C E7A20030 */   swc1     $f2, 0x30($sp)
-/* CB9E80 80240C80 E7A80028 */  swc1      $f8, 0x28($sp)
-/* CB9E84 80240C84 E7BC002C */  swc1      $f28, 0x2c($sp)
-.L80240C88:
-/* CB9E88 80240C88 C7A20028 */  lwc1      $f2, 0x28($sp)
-/* CB9E8C 80240C8C 4614103C */  c.lt.s    $f2, $f20
-/* CB9E90 80240C90 00000000 */  nop
-/* CB9E94 80240C94 45030001 */  bc1tl     .L80240C9C
-/* CB9E98 80240C98 46001606 */   mov.s    $f24, $f2
-.L80240C9C:
-/* CB9E9C 80240C9C C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* CB9EA0 80240CA0 4616003C */  c.lt.s    $f0, $f22
-/* CB9EA4 80240CA4 00000000 */  nop
-/* CB9EA8 80240CA8 45030001 */  bc1tl     .L80240CB0
-/* CB9EAC 80240CAC 46000686 */   mov.s    $f26, $f0
-.L80240CB0:
-/* CB9EB0 80240CB0 4602A03C */  c.lt.s    $f20, $f2
-/* CB9EB4 80240CB4 00000000 */  nop
-/* CB9EB8 80240CB8 45030001 */  bc1tl     .L80240CC0
-/* CB9EBC 80240CBC 46001506 */   mov.s    $f20, $f2
-.L80240CC0:
-/* CB9EC0 80240CC0 4600B03C */  c.lt.s    $f22, $f0
-/* CB9EC4 80240CC4 00000000 */  nop
-/* CB9EC8 80240CC8 45030001 */  bc1tl     .L80240CD0
-/* CB9ECC 80240CCC 46000586 */   mov.s    $f22, $f0
-.L80240CD0:
-/* CB9ED0 80240CD0 C7C00098 */  lwc1      $f0, 0x98($fp)
-/* CB9ED4 80240CD4 C7C200A0 */  lwc1      $f2, 0xa0($fp)
-/* CB9ED8 80240CD8 C7A80038 */  lwc1      $f8, 0x38($sp)
-/* CB9EDC 80240CDC E7BC0010 */  swc1      $f28, 0x10($sp)
-/* CB9EE0 80240CE0 AFB40014 */  sw        $s4, 0x14($sp)
-/* CB9EE4 80240CE4 AFB20018 */  sw        $s2, 0x18($sp)
-/* CB9EE8 80240CE8 461E0000 */  add.s     $f0, $f0, $f30
-/* CB9EEC 80240CEC AFB3001C */  sw        $s3, 0x1c($sp)
-/* CB9EF0 80240CF0 AFB10020 */  sw        $s1, 0x20($sp)
-/* CB9EF4 80240CF4 46081200 */  add.s     $f8, $f2, $f8
-/* CB9EF8 80240CF8 8FC6009C */  lw        $a2, 0x9c($fp)
-/* CB9EFC 80240CFC 44050000 */  mfc1      $a1, $f0
-/* CB9F00 80240D00 44074000 */  mfc1      $a3, $f8
-/* CB9F04 80240D04 0C00A588 */  jal       transform_point
-/* CB9F08 80240D08 0200202D */   daddu    $a0, $s0, $zero
-/* CB9F0C 80240D0C C7A00034 */  lwc1      $f0, 0x34($sp)
-/* CB9F10 80240D10 C7A60028 */  lwc1      $f6, 0x28($sp)
-/* CB9F14 80240D14 4600E003 */  div.s     $f0, $f28, $f0
-/* CB9F18 80240D18 46003182 */  mul.s     $f6, $f6, $f0
-/* CB9F1C 80240D1C 00000000 */  nop
-/* CB9F20 80240D20 C7A4002C */  lwc1      $f4, 0x2c($sp)
-/* CB9F24 80240D24 46000087 */  neg.s     $f2, $f0
-/* CB9F28 80240D28 46022102 */  mul.s     $f4, $f4, $f2
-/* CB9F2C 80240D2C 00000000 */  nop
-/* CB9F30 80240D30 C7A20030 */  lwc1      $f2, 0x30($sp)
-/* CB9F34 80240D34 46001082 */  mul.s     $f2, $f2, $f0
-/* CB9F38 80240D38 00000000 */  nop
-/* CB9F3C 80240D3C 44804000 */  mtc1      $zero, $f8
-/* CB9F40 80240D40 00000000 */  nop
-/* CB9F44 80240D44 4608003C */  c.lt.s    $f0, $f8
-/* CB9F48 80240D48 E7A00034 */  swc1      $f0, 0x34($sp)
-/* CB9F4C 80240D4C E7A60028 */  swc1      $f6, 0x28($sp)
-/* CB9F50 80240D50 E7A4002C */  swc1      $f4, 0x2c($sp)
-/* CB9F54 80240D54 45000003 */  bc1f      .L80240D64
-/* CB9F58 80240D58 E7A20030 */   swc1     $f2, 0x30($sp)
-/* CB9F5C 80240D5C E7BC0028 */  swc1      $f28, 0x28($sp)
-/* CB9F60 80240D60 E7BC002C */  swc1      $f28, 0x2c($sp)
-.L80240D64:
-/* CB9F64 80240D64 C7A20028 */  lwc1      $f2, 0x28($sp)
-/* CB9F68 80240D68 4618103C */  c.lt.s    $f2, $f24
-/* CB9F6C 80240D6C 00000000 */  nop
-/* CB9F70 80240D70 45030001 */  bc1tl     .L80240D78
-/* CB9F74 80240D74 46001606 */   mov.s    $f24, $f2
-.L80240D78:
-/* CB9F78 80240D78 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* CB9F7C 80240D7C 461A003C */  c.lt.s    $f0, $f26
-/* CB9F80 80240D80 00000000 */  nop
-/* CB9F84 80240D84 45030001 */  bc1tl     .L80240D8C
-/* CB9F88 80240D88 46000686 */   mov.s    $f26, $f0
-.L80240D8C:
-/* CB9F8C 80240D8C 4602A03C */  c.lt.s    $f20, $f2
-/* CB9F90 80240D90 00000000 */  nop
-/* CB9F94 80240D94 45030001 */  bc1tl     .L80240D9C
-/* CB9F98 80240D98 46001506 */   mov.s    $f20, $f2
-.L80240D9C:
-/* CB9F9C 80240D9C 4600B03C */  c.lt.s    $f22, $f0
-/* CB9FA0 80240DA0 00000000 */  nop
-/* CB9FA4 80240DA4 45030001 */  bc1tl     .L80240DAC
-/* CB9FA8 80240DA8 46000586 */   mov.s    $f22, $f0
-.L80240DAC:
-/* CB9FAC 80240DAC C7C00098 */  lwc1      $f0, 0x98($fp)
-/* CB9FB0 80240DB0 C7C200A0 */  lwc1      $f2, 0xa0($fp)
-/* CB9FB4 80240DB4 C7A80038 */  lwc1      $f8, 0x38($sp)
-/* CB9FB8 80240DB8 E7BC0010 */  swc1      $f28, 0x10($sp)
-/* CB9FBC 80240DBC AFB40014 */  sw        $s4, 0x14($sp)
-/* CB9FC0 80240DC0 AFB20018 */  sw        $s2, 0x18($sp)
-/* CB9FC4 80240DC4 461E0000 */  add.s     $f0, $f0, $f30
-/* CB9FC8 80240DC8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CB9FCC 80240DCC AFB10020 */  sw        $s1, 0x20($sp)
-/* CB9FD0 80240DD0 46081201 */  sub.s     $f8, $f2, $f8
-/* CB9FD4 80240DD4 8FC6009C */  lw        $a2, 0x9c($fp)
-/* CB9FD8 80240DD8 44050000 */  mfc1      $a1, $f0
-/* CB9FDC 80240DDC 44074000 */  mfc1      $a3, $f8
-/* CB9FE0 80240DE0 0C00A588 */  jal       transform_point
-/* CB9FE4 80240DE4 26E400D4 */   addiu    $a0, $s7, 0xd4
-/* CB9FE8 80240DE8 C7A00034 */  lwc1      $f0, 0x34($sp)
-/* CB9FEC 80240DEC C7A60028 */  lwc1      $f6, 0x28($sp)
-/* CB9FF0 80240DF0 4600E003 */  div.s     $f0, $f28, $f0
-/* CB9FF4 80240DF4 46003182 */  mul.s     $f6, $f6, $f0
-/* CB9FF8 80240DF8 00000000 */  nop
-/* CB9FFC 80240DFC C7A4002C */  lwc1      $f4, 0x2c($sp)
-/* CBA000 80240E00 46000087 */  neg.s     $f2, $f0
-/* CBA004 80240E04 46022102 */  mul.s     $f4, $f4, $f2
-/* CBA008 80240E08 00000000 */  nop
-/* CBA00C 80240E0C C7A20030 */  lwc1      $f2, 0x30($sp)
-/* CBA010 80240E10 46001082 */  mul.s     $f2, $f2, $f0
-/* CBA014 80240E14 00000000 */  nop
-/* CBA018 80240E18 44804000 */  mtc1      $zero, $f8
-/* CBA01C 80240E1C 00000000 */  nop
-/* CBA020 80240E20 4608003C */  c.lt.s    $f0, $f8
-/* CBA024 80240E24 E7A00034 */  swc1      $f0, 0x34($sp)
-/* CBA028 80240E28 E7A60028 */  swc1      $f6, 0x28($sp)
-/* CBA02C 80240E2C E7A4002C */  swc1      $f4, 0x2c($sp)
-/* CBA030 80240E30 45000003 */  bc1f      .L80240E40
-/* CBA034 80240E34 E7A20030 */   swc1     $f2, 0x30($sp)
-/* CBA038 80240E38 E7BC0028 */  swc1      $f28, 0x28($sp)
-/* CBA03C 80240E3C E7BC002C */  swc1      $f28, 0x2c($sp)
-.L80240E40:
-/* CBA040 80240E40 C7A20028 */  lwc1      $f2, 0x28($sp)
-/* CBA044 80240E44 4618103C */  c.lt.s    $f2, $f24
-/* CBA048 80240E48 00000000 */  nop
-/* CBA04C 80240E4C 45030001 */  bc1tl     .L80240E54
-/* CBA050 80240E50 46001606 */   mov.s    $f24, $f2
-.L80240E54:
-/* CBA054 80240E54 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* CBA058 80240E58 461A003C */  c.lt.s    $f0, $f26
-/* CBA05C 80240E5C 00000000 */  nop
-/* CBA060 80240E60 45030001 */  bc1tl     .L80240E68
-/* CBA064 80240E64 46000686 */   mov.s    $f26, $f0
-.L80240E68:
-/* CBA068 80240E68 4602A03C */  c.lt.s    $f20, $f2
-/* CBA06C 80240E6C 00000000 */  nop
-/* CBA070 80240E70 45030001 */  bc1tl     .L80240E78
-/* CBA074 80240E74 46001506 */   mov.s    $f20, $f2
-.L80240E78:
-/* CBA078 80240E78 4600B03C */  c.lt.s    $f22, $f0
-/* CBA07C 80240E7C 00000000 */  nop
-/* CBA080 80240E80 45030001 */  bc1tl     .L80240E88
-/* CBA084 80240E84 46000586 */   mov.s    $f22, $f0
-.L80240E88:
-/* CBA088 80240E88 4614C032 */  c.eq.s    $f24, $f20
-/* CBA08C 80240E8C 00000000 */  nop
-/* CBA090 80240E90 45000005 */  bc1f      .L80240EA8
-/* CBA094 80240E94 00000000 */   nop
-/* CBA098 80240E98 4616D032 */  c.eq.s    $f26, $f22
-/* CBA09C 80240E9C 00000000 */  nop
-/* CBA0A0 80240EA0 450100CE */  bc1t      .L802411DC
-/* CBA0A4 80240EA4 00000000 */   nop
-.L80240EA8:
-/* CBA0A8 80240EA8 86E2000A */  lh        $v0, 0xa($s7)
-/* CBA0AC 80240EAC 44821000 */  mtc1      $v0, $f2
-/* CBA0B0 80240EB0 00000000 */  nop
-/* CBA0B4 80240EB4 468010A0 */  cvt.s.w   $f2, $f2
-/* CBA0B8 80240EB8 4602C002 */  mul.s     $f0, $f24, $f2
-/* CBA0BC 80240EBC 00000000 */  nop
-/* CBA0C0 80240EC0 46020000 */  add.s     $f0, $f0, $f2
-/* CBA0C4 80240EC4 3C013F00 */  lui       $at, 0x3f00
-/* CBA0C8 80240EC8 44813000 */  mtc1      $at, $f6
-/* CBA0CC 80240ECC 00000000 */  nop
-/* CBA0D0 80240ED0 46060602 */  mul.s     $f24, $f0, $f6
-/* CBA0D4 80240ED4 00000000 */  nop
-/* CBA0D8 80240ED8 86E2000C */  lh        $v0, 0xc($s7)
-/* CBA0DC 80240EDC 44822000 */  mtc1      $v0, $f4
-/* CBA0E0 80240EE0 00000000 */  nop
-/* CBA0E4 80240EE4 46802120 */  cvt.s.w   $f4, $f4
-/* CBA0E8 80240EE8 4604D002 */  mul.s     $f0, $f26, $f4
-/* CBA0EC 80240EEC 00000000 */  nop
-/* CBA0F0 80240EF0 46040000 */  add.s     $f0, $f0, $f4
-/* CBA0F4 80240EF4 3C18E300 */  lui       $t8, 0xe300
-/* CBA0F8 80240EF8 37180A01 */  ori       $t8, $t8, 0xa01
-/* CBA0FC 80240EFC 46060682 */  mul.s     $f26, $f0, $f6
-/* CBA100 80240F00 00000000 */  nop
-/* CBA104 80240F04 3C14E200 */  lui       $s4, 0xe200
-/* CBA108 80240F08 3694001C */  ori       $s4, $s4, 0x1c
-/* CBA10C 80240F0C 3C060F0A */  lui       $a2, 0xf0a
-/* CBA110 80240F10 34C64010 */  ori       $a2, $a2, 0x4010
-/* CBA114 80240F14 4602A002 */  mul.s     $f0, $f20, $f2
-/* CBA118 80240F18 00000000 */  nop
-/* CBA11C 80240F1C 3C13FF10 */  lui       $s3, 0xff10
-/* CBA120 80240F20 3673013F */  ori       $s3, $s3, 0x13f
-/* CBA124 80240F24 3C15FCFF */  lui       $s5, 0xfcff
-/* CBA128 80240F28 36B5FFFF */  ori       $s5, $s5, 0xffff
-/* CBA12C 80240F2C 46020000 */  add.s     $f0, $f0, $f2
-/* CBA130 80240F30 3C16E200 */  lui       $s6, 0xe200
-/* CBA134 80240F34 36D61D00 */  ori       $s6, $s6, 0x1d00
-/* CBA138 80240F38 46060502 */  mul.s     $f20, $f0, $f6
-/* CBA13C 80240F3C 00000000 */  nop
-/* CBA140 80240F40 3C04800A */  lui       $a0, %hi(nuGfxZBuffer)
-/* CBA144 80240F44 8C84A5DC */  lw        $a0, %lo(nuGfxZBuffer)($a0)
-/* CBA148 80240F48 3C12800A */  lui       $s2, %hi(gMasterGfxPos)
-/* CBA14C 80240F4C 2652A66C */  addiu     $s2, $s2, %lo(gMasterGfxPos)
-/* CBA150 80240F50 AFB8003C */  sw        $t8, 0x3c($sp)
-/* CBA154 80240F54 8E510000 */  lw        $s1, ($s2)
-/* CBA158 80240F58 4604B002 */  mul.s     $f0, $f22, $f4
-/* CBA15C 80240F5C 00000000 */  nop
-/* CBA160 80240F60 86E3000E */  lh        $v1, 0xe($s7)
-/* CBA164 80240F64 86E50010 */  lh        $a1, 0x10($s7)
-/* CBA168 80240F68 0220102D */  daddu     $v0, $s1, $zero
-/* CBA16C 80240F6C 26310008 */  addiu     $s1, $s1, 8
-/* CBA170 80240F70 46040000 */  add.s     $f0, $f0, $f4
-/* CBA174 80240F74 AE510000 */  sw        $s1, ($s2)
-/* CBA178 80240F78 AC580000 */  sw        $t8, ($v0)
-/* CBA17C 80240F7C 46060582 */  mul.s     $f22, $f0, $f6
-/* CBA180 80240F80 00000000 */  nop
-/* CBA184 80240F84 AC400004 */  sw        $zero, 4($v0)
-/* CBA188 80240F88 26220008 */  addiu     $v0, $s1, 8
-/* CBA18C 80240F8C AE420000 */  sw        $v0, ($s2)
-/* CBA190 80240F90 44851000 */  mtc1      $a1, $f2
-/* CBA194 80240F94 00000000 */  nop
-/* CBA198 80240F98 468010A0 */  cvt.s.w   $f2, $f2
-/* CBA19C 80240F9C 4602D680 */  add.s     $f26, $f26, $f2
-/* CBA1A0 80240FA0 26220010 */  addiu     $v0, $s1, 0x10
-/* CBA1A4 80240FA4 44830000 */  mtc1      $v1, $f0
-/* CBA1A8 80240FA8 00000000 */  nop
-/* CBA1AC 80240FAC 46800020 */  cvt.s.w   $f0, $f0
-/* CBA1B0 80240FB0 4600C600 */  add.s     $f24, $f24, $f0
-/* CBA1B4 80240FB4 AE340000 */  sw        $s4, ($s1)
-/* CBA1B8 80240FB8 AE260004 */  sw        $a2, 4($s1)
-/* CBA1BC 80240FBC 4600A500 */  add.s     $f20, $f20, $f0
-/* CBA1C0 80240FC0 AE420000 */  sw        $v0, ($s2)
-/* CBA1C4 80240FC4 AE330008 */  sw        $s3, 8($s1)
-/* CBA1C8 80240FC8 0C0187A4 */  jal       osVirtualToPhysical
-/* CBA1CC 80240FCC 4602B580 */   add.s    $f22, $f22, $f2
-/* CBA1D0 80240FD0 3C03FFFD */  lui       $v1, 0xfffd
-/* CBA1D4 80240FD4 3463FEFF */  ori       $v1, $v1, 0xfeff
-/* CBA1D8 80240FD8 3C05F8F0 */  lui       $a1, 0xf8f0
-/* CBA1DC 80240FDC 8E500000 */  lw        $s0, ($s2)
-/* CBA1E0 80240FE0 34A5F000 */  ori       $a1, $a1, 0xf000
-/* CBA1E4 80240FE4 AE22000C */  sw        $v0, 0xc($s1)
-/* CBA1E8 80240FE8 3C11E700 */  lui       $s1, 0xe700
-/* CBA1EC 80240FEC 3C04800A */  lui       $a0, %hi(D_8009A64C)
-/* CBA1F0 80240FF0 8C84A64C */  lw        $a0, %lo(D_8009A64C)($a0)
-/* CBA1F4 80240FF4 0200102D */  daddu     $v0, $s0, $zero
-/* CBA1F8 80240FF8 26100008 */  addiu     $s0, $s0, 8
-/* CBA1FC 80240FFC AE500000 */  sw        $s0, ($s2)
-/* CBA200 80241000 AC550000 */  sw        $s5, ($v0)
-/* CBA204 80241004 AC430004 */  sw        $v1, 4($v0)
-/* CBA208 80241008 26020008 */  addiu     $v0, $s0, 8
-/* CBA20C 8024100C AE420000 */  sw        $v0, ($s2)
-/* CBA210 80241010 3C02FA00 */  lui       $v0, 0xfa00
-/* CBA214 80241014 AE020000 */  sw        $v0, ($s0)
-/* CBA218 80241018 26020010 */  addiu     $v0, $s0, 0x10
-/* CBA21C 8024101C AE050004 */  sw        $a1, 4($s0)
-/* CBA220 80241020 AE420000 */  sw        $v0, ($s2)
-/* CBA224 80241024 3C02DE00 */  lui       $v0, 0xde00
-/* CBA228 80241028 AE110008 */  sw        $s1, 8($s0)
-/* CBA22C 8024102C AE00000C */  sw        $zero, 0xc($s0)
-/* CBA230 80241030 AE020010 */  sw        $v0, 0x10($s0)
-/* CBA234 80241034 8FC30008 */  lw        $v1, 8($fp)
-/* CBA238 80241038 26020018 */  addiu     $v0, $s0, 0x18
-/* CBA23C 8024103C AE420000 */  sw        $v0, ($s2)
-/* CBA240 80241040 8C630004 */  lw        $v1, 4($v1)
-/* CBA244 80241044 26020020 */  addiu     $v0, $s0, 0x20
-/* CBA248 80241048 AE420000 */  sw        $v0, ($s2)
-/* CBA24C 8024104C 8C630000 */  lw        $v1, ($v1)
-/* CBA250 80241050 26020028 */  addiu     $v0, $s0, 0x28
-/* CBA254 80241054 AE420000 */  sw        $v0, ($s2)
-/* CBA258 80241058 AE110018 */  sw        $s1, 0x18($s0)
-/* CBA25C 8024105C AE00001C */  sw        $zero, 0x1c($s0)
-/* CBA260 80241060 AE130020 */  sw        $s3, 0x20($s0)
-/* CBA264 80241064 0C0187A4 */  jal       osVirtualToPhysical
-/* CBA268 80241068 AE030014 */   sw       $v1, 0x14($s0)
-/* CBA26C 8024106C 3C090050 */  lui       $t1, 0x50
-/* CBA270 80241070 35294E50 */  ori       $t1, $t1, 0x4e50
-/* CBA274 80241074 3C0AE300 */  lui       $t2, 0xe300
-/* CBA278 80241078 354A1201 */  ori       $t2, $t2, 0x1201
-/* CBA27C 8024107C 3C0BE300 */  lui       $t3, 0xe300
-/* CBA280 80241080 356B0C00 */  ori       $t3, $t3, 0xc00
-/* CBA284 80241084 3C0CD700 */  lui       $t4, 0xd700
-/* CBA288 80241088 358C0002 */  ori       $t4, $t4, 2
-/* CBA28C 8024108C 3C0DE300 */  lui       $t5, 0xe300
-/* CBA290 80241090 35AD1001 */  ori       $t5, $t5, 0x1001
-/* CBA294 80241094 3C0EE300 */  lui       $t6, 0xe300
-/* CBA298 80241098 35CE0D01 */  ori       $t6, $t6, 0xd01
-/* CBA29C 8024109C 3C0FE300 */  lui       $t7, 0xe300
-/* CBA2A0 802410A0 35EF0F00 */  ori       $t7, $t7, 0xf00
-/* CBA2A4 802410A4 3C13FFFC */  lui       $s3, 0xfffc
-/* CBA2A8 802410A8 3673F67B */  ori       $s3, $s3, 0xf67b
-/* CBA2AC 802410AC 4600C20D */  trunc.w.s $f8, $f24
-/* CBA2B0 802410B0 44044000 */  mfc1      $a0, $f8
-/* CBA2B4 802410B4 4600D20D */  trunc.w.s $f8, $f26
-/* CBA2B8 802410B8 44054000 */  mfc1      $a1, $f8
-/* CBA2BC 802410BC 4600A20D */  trunc.w.s $f8, $f20
-/* CBA2C0 802410C0 44064000 */  mfc1      $a2, $f8
-/* CBA2C4 802410C4 8E430000 */  lw        $v1, ($s2)
-/* CBA2C8 802410C8 4600B20D */  trunc.w.s $f8, $f22
-/* CBA2CC 802410CC 44074000 */  mfc1      $a3, $f8
-/* CBA2D0 802410D0 AE020024 */  sw        $v0, 0x24($s0)
-/* CBA2D4 802410D4 24020004 */  addiu     $v0, $zero, 4
-/* CBA2D8 802410D8 0060402D */  daddu     $t0, $v1, $zero
-/* CBA2DC 802410DC 24630008 */  addiu     $v1, $v1, 8
-/* CBA2E0 802410E0 AE430000 */  sw        $v1, ($s2)
-/* CBA2E4 802410E4 AD020004 */  sw        $v0, 4($t0)
-/* CBA2E8 802410E8 24620008 */  addiu     $v0, $v1, 8
-/* CBA2EC 802410EC AD160000 */  sw        $s6, ($t0)
-/* CBA2F0 802410F0 AE420000 */  sw        $v0, ($s2)
-/* CBA2F4 802410F4 3C02EE00 */  lui       $v0, 0xee00
-/* CBA2F8 802410F8 AC620000 */  sw        $v0, ($v1)
-/* CBA2FC 802410FC 3C027FDE */  lui       $v0, 0x7fde
-/* CBA300 80241100 AC620004 */  sw        $v0, 4($v1)
-/* CBA304 80241104 24620010 */  addiu     $v0, $v1, 0x10
-/* CBA308 80241108 AE420000 */  sw        $v0, ($s2)
-/* CBA30C 8024110C 24620018 */  addiu     $v0, $v1, 0x18
-/* CBA310 80241110 AC740008 */  sw        $s4, 8($v1)
-/* CBA314 80241114 AC69000C */  sw        $t1, 0xc($v1)
-/* CBA318 80241118 AE420000 */  sw        $v0, ($s2)
-/* CBA31C 8024111C 24620020 */  addiu     $v0, $v1, 0x20
-/* CBA320 80241120 AC6A0010 */  sw        $t2, 0x10($v1)
-/* CBA324 80241124 AC600014 */  sw        $zero, 0x14($v1)
-/* CBA328 80241128 AE420000 */  sw        $v0, ($s2)
-/* CBA32C 8024112C 24620028 */  addiu     $v0, $v1, 0x28
-/* CBA330 80241130 AC6B0018 */  sw        $t3, 0x18($v1)
-/* CBA334 80241134 AC60001C */  sw        $zero, 0x1c($v1)
-/* CBA338 80241138 AE420000 */  sw        $v0, ($s2)
-/* CBA33C 8024113C 2402FFFF */  addiu     $v0, $zero, -1
-/* CBA340 80241140 AC620024 */  sw        $v0, 0x24($v1)
-/* CBA344 80241144 24620030 */  addiu     $v0, $v1, 0x30
-/* CBA348 80241148 AC6C0020 */  sw        $t4, 0x20($v1)
-/* CBA34C 8024114C AE420000 */  sw        $v0, ($s2)
-/* CBA350 80241150 24620038 */  addiu     $v0, $v1, 0x38
-/* CBA354 80241154 AC6D0028 */  sw        $t5, 0x28($v1)
-/* CBA358 80241158 AC60002C */  sw        $zero, 0x2c($v1)
-/* CBA35C 8024115C AE420000 */  sw        $v0, ($s2)
-/* CBA360 80241160 24620040 */  addiu     $v0, $v1, 0x40
-/* CBA364 80241164 AC6E0030 */  sw        $t6, 0x30($v1)
-/* CBA368 80241168 AC600034 */  sw        $zero, 0x34($v1)
-/* CBA36C 8024116C AE420000 */  sw        $v0, ($s2)
-/* CBA370 80241170 24620048 */  addiu     $v0, $v1, 0x48
-/* CBA374 80241174 AC6F0038 */  sw        $t7, 0x38($v1)
-/* CBA378 80241178 AC60003C */  sw        $zero, 0x3c($v1)
-/* CBA37C 8024117C AE420000 */  sw        $v0, ($s2)
-/* CBA380 80241180 24620050 */  addiu     $v0, $v1, 0x50
-/* CBA384 80241184 AC750040 */  sw        $s5, 0x40($v1)
-/* CBA388 80241188 AC730044 */  sw        $s3, 0x44($v1)
-/* CBA38C 8024118C AE420000 */  sw        $v0, ($s2)
-/* CBA390 80241190 AC710048 */  sw        $s1, 0x48($v1)
-/* CBA394 80241194 0C09012C */  jal       func_802404B0_CB96B0
-/* CBA398 80241198 AC60004C */   sw       $zero, 0x4c($v1)
-/* CBA39C 8024119C 8E420000 */  lw        $v0, ($s2)
-/* CBA3A0 802411A0 0040182D */  daddu     $v1, $v0, $zero
-/* CBA3A4 802411A4 24420008 */  addiu     $v0, $v0, 8
-/* CBA3A8 802411A8 AE420000 */  sw        $v0, ($s2)
-/* CBA3AC 802411AC AC710000 */  sw        $s1, ($v1)
-/* CBA3B0 802411B0 AC600004 */  sw        $zero, 4($v1)
-/* CBA3B4 802411B4 24430008 */  addiu     $v1, $v0, 8
-/* CBA3B8 802411B8 AE430000 */  sw        $v1, ($s2)
-/* CBA3BC 802411BC 8FB8003C */  lw        $t8, 0x3c($sp)
-/* CBA3C0 802411C0 3C030010 */  lui       $v1, 0x10
-/* CBA3C4 802411C4 AC580000 */  sw        $t8, ($v0)
-/* CBA3C8 802411C8 AC430004 */  sw        $v1, 4($v0)
-/* CBA3CC 802411CC 24430010 */  addiu     $v1, $v0, 0x10
-/* CBA3D0 802411D0 AE430000 */  sw        $v1, ($s2)
-/* CBA3D4 802411D4 AC560008 */  sw        $s6, 8($v0)
-/* CBA3D8 802411D8 AC40000C */  sw        $zero, 0xc($v0)
-.L802411DC:
-/* CBA3DC 802411DC 8FBF0064 */  lw        $ra, 0x64($sp)
-/* CBA3E0 802411E0 8FBE0060 */  lw        $fp, 0x60($sp)
-/* CBA3E4 802411E4 8FB7005C */  lw        $s7, 0x5c($sp)
-/* CBA3E8 802411E8 8FB60058 */  lw        $s6, 0x58($sp)
-/* CBA3EC 802411EC 8FB50054 */  lw        $s5, 0x54($sp)
-/* CBA3F0 802411F0 8FB40050 */  lw        $s4, 0x50($sp)
-/* CBA3F4 802411F4 8FB3004C */  lw        $s3, 0x4c($sp)
-/* CBA3F8 802411F8 8FB20048 */  lw        $s2, 0x48($sp)
-/* CBA3FC 802411FC 8FB10044 */  lw        $s1, 0x44($sp)
-/* CBA400 80241200 8FB00040 */  lw        $s0, 0x40($sp)
-/* CBA404 80241204 D7BE0090 */  ldc1      $f30, 0x90($sp)
-/* CBA408 80241208 D7BC0088 */  ldc1      $f28, 0x88($sp)
-/* CBA40C 8024120C D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* CBA410 80241210 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* CBA414 80241214 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* CBA418 80241218 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* CBA41C 8024121C 03E00008 */  jr        $ra
-/* CBA420 80241220 27BD0098 */   addiu    $sp, $sp, 0x98
-/* CBA424 80241224 00000000 */  nop
-/* CBA428 80241228 00000000 */  nop
-/* CBA42C 8024122C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240034_CBDD04.s b/ver/us/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240034_CBDD04.s
deleted file mode 100644
index 57d561f327..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240034_CBDD04.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_CBDD04
-/* CBDD04 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* CBDD08 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* CBDD0C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CBDD10 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* CBDD14 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* CBDD18 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CBDD1C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* CBDD20 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* CBDD24 80240054 24020002 */   addiu    $v0, $zero, 2
-/* CBDD28 80240058 08090038 */  j         .L802400E0
-/* CBDD2C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* CBDD30 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* CBDD34 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* CBDD38 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* CBDD3C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* CBDD40 80240070 04420001 */  bltzl     $v0, .L80240078
-/* CBDD44 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* CBDD48 80240078 14400003 */  bnez      $v0, .L80240088
-/* CBDD4C 8024007C 00000000 */   nop
-/* CBDD50 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* CBDD54 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* CBDD58 80240088 44822000 */  mtc1      $v0, $f4
-/* CBDD5C 8024008C 00000000 */  nop
-/* CBDD60 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* CBDD64 80240094 44062000 */  mfc1      $a2, $f4
-/* CBDD68 80240098 44872000 */  mtc1      $a3, $f4
-/* CBDD6C 8024009C 00000000 */  nop
-/* CBDD70 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* CBDD74 802400A4 44806000 */  mtc1      $zero, $f12
-/* CBDD78 802400A8 44072000 */  mfc1      $a3, $f4
-/* CBDD7C 802400AC 0C00A720 */  jal       atan2
-/* CBDD80 802400B0 46006386 */   mov.s    $f14, $f12
-/* CBDD84 802400B4 3C014270 */  lui       $at, 0x4270
-/* CBDD88 802400B8 44811000 */  mtc1      $at, $f2
-/* CBDD8C 802400BC 00000000 */  nop
-/* CBDD90 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* CBDD94 802400C4 00000000 */  nop
-/* CBDD98 802400C8 45000004 */  bc1f      .L802400DC
-/* CBDD9C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* CBDDA0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* CBDDA4 802400D4 08090038 */  j         .L802400E0
-/* CBDDA8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* CBDDAC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* CBDDB0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CBDDB4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CBDDB8 802400E8 03E00008 */  jr        $ra
-/* CBDDBC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802402E0_CBDFB0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802402E0_CBDFB0.s
deleted file mode 100644
index ce5ed5b7fe..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_802402E0_CBDFB0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402E0_CBDFB0
-/* CBDFB0 802402E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CBDFB4 802402E4 0000202D */  daddu     $a0, $zero, $zero
-/* CBDFB8 802402E8 0080282D */  daddu     $a1, $a0, $zero
-/* CBDFBC 802402EC 0080302D */  daddu     $a2, $a0, $zero
-/* CBDFC0 802402F0 0080382D */  daddu     $a3, $a0, $zero
-/* CBDFC4 802402F4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CBDFC8 802402F8 AFA00010 */  sw        $zero, 0x10($sp)
-/* CBDFCC 802402FC 0C01CA54 */  jal       func_80072950
-/* CBDFD0 80240300 AFA00014 */   sw       $zero, 0x14($sp)
-/* CBDFD4 80240304 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CBDFD8 80240308 24020002 */  addiu     $v0, $zero, 2
-/* CBDFDC 8024030C 03E00008 */  jr        $ra
-/* CBDFE0 80240310 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CBDFE4 80240314 00000000 */  nop
-/* CBDFE8 80240318 00000000 */  nop
-/* CBDFEC 8024031C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E30/func_80240000_CC0E30.s b/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E30/func_80240000_CC0E30.s
deleted file mode 100644
index cda6b92750..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E30/func_80240000_CC0E30.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CC0E30
-/* CC0E30 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CC0E34 80240004 0000202D */  daddu     $a0, $zero, $zero
-/* CC0E38 80240008 0080282D */  daddu     $a1, $a0, $zero
-/* CC0E3C 8024000C 0080302D */  daddu     $a2, $a0, $zero
-/* CC0E40 80240010 0080382D */  daddu     $a3, $a0, $zero
-/* CC0E44 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CC0E48 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CC0E4C 8024001C 0C01CA54 */  jal       func_80072950
-/* CC0E50 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CC0E54 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CC0E58 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CC0E5C 8024002C 03E00008 */  jr        $ra
-/* CC0E60 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CC0E64 80240034 00000000 */  nop
-/* CC0E68 80240038 00000000 */  nop
-/* CC0E6C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s
deleted file mode 100644
index 509295b20f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024027C_CC10AC
-/* CC10AC 8024027C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CC10B0 80240280 AFB00010 */  sw        $s0, 0x10($sp)
-/* CC10B4 80240284 3C108024 */  lui       $s0, %hi(D_802417EC_CC261C)
-/* CC10B8 80240288 261017EC */  addiu     $s0, $s0, %lo(D_802417EC_CC261C)
-/* CC10BC 8024028C AFBF0018 */  sw        $ra, 0x18($sp)
-/* CC10C0 80240290 AFB10014 */  sw        $s1, 0x14($sp)
-/* CC10C4 80240294 8E020000 */  lw        $v0, ($s0)
-/* CC10C8 80240298 14400010 */  bnez      $v0, .L802402DC
-/* CC10CC 8024029C 0080882D */   daddu    $s1, $a0, $zero
-/* CC10D0 802402A0 0C00AB39 */  jal       heap_malloc
-/* CC10D4 802402A4 24040040 */   addiu    $a0, $zero, 0x40
-/* CC10D8 802402A8 AE020000 */  sw        $v0, ($s0)
-/* CC10DC 802402AC 0000182D */  daddu     $v1, $zero, $zero
-/* CC10E0 802402B0 0040282D */  daddu     $a1, $v0, $zero
-/* CC10E4 802402B4 0220202D */  daddu     $a0, $s1, $zero
-.L802402B8:
-/* CC10E8 802402B8 8C820084 */  lw        $v0, 0x84($a0)
-/* CC10EC 802402BC 24840004 */  addiu     $a0, $a0, 4
-/* CC10F0 802402C0 24630001 */  addiu     $v1, $v1, 1
-/* CC10F4 802402C4 ACA20000 */  sw        $v0, ($a1)
-/* CC10F8 802402C8 28620010 */  slti      $v0, $v1, 0x10
-/* CC10FC 802402CC 1440FFFA */  bnez      $v0, .L802402B8
-/* CC1100 802402D0 24A50004 */   addiu    $a1, $a1, 4
-/* CC1104 802402D4 080900C6 */  j         .L80240318
-/* CC1108 802402D8 00000000 */   nop
-.L802402DC:
-/* CC110C 802402DC 0000182D */  daddu     $v1, $zero, $zero
-/* CC1110 802402E0 0040282D */  daddu     $a1, $v0, $zero
-/* CC1114 802402E4 0220202D */  daddu     $a0, $s1, $zero
-.L802402E8:
-/* CC1118 802402E8 8CA20000 */  lw        $v0, ($a1)
-/* CC111C 802402EC 24A50004 */  addiu     $a1, $a1, 4
-/* CC1120 802402F0 24630001 */  addiu     $v1, $v1, 1
-/* CC1124 802402F4 AC820084 */  sw        $v0, 0x84($a0)
-/* CC1128 802402F8 28620010 */  slti      $v0, $v1, 0x10
-/* CC112C 802402FC 1440FFFA */  bnez      $v0, .L802402E8
-/* CC1130 80240300 24840004 */   addiu    $a0, $a0, 4
-/* CC1134 80240304 3C108024 */  lui       $s0, %hi(D_802417EC_CC261C)
-/* CC1138 80240308 261017EC */  addiu     $s0, $s0, %lo(D_802417EC_CC261C)
-/* CC113C 8024030C 0C00AB4B */  jal       heap_free
-/* CC1140 80240310 8E040000 */   lw       $a0, ($s0)
-/* CC1144 80240314 AE000000 */  sw        $zero, ($s0)
-.L80240318:
-/* CC1148 80240318 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CC114C 8024031C 8FB10014 */  lw        $s1, 0x14($sp)
-/* CC1150 80240320 8FB00010 */  lw        $s0, 0x10($sp)
-/* CC1154 80240324 24020002 */  addiu     $v0, $zero, 2
-/* CC1158 80240328 03E00008 */  jr        $ra
-/* CC115C 8024032C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s
deleted file mode 100644
index 7a67c2d8d7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405C0_CC13F0
-/* CC13F0 802405C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CC13F4 802405C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CC13F8 802405C8 10A00003 */  beqz      $a1, .L802405D8
-/* CC13FC 802405CC 8C86000C */   lw       $a2, 0xc($a0)
-/* CC1400 802405D0 3C018024 */  lui       $at, %hi(D_80241850_CC2680)
-/* CC1404 802405D4 AC201850 */  sw        $zero, %lo(D_80241850_CC2680)($at)
-.L802405D8:
-/* CC1408 802405D8 3C038024 */  lui       $v1, %hi(D_80241850_CC2680)
-/* CC140C 802405DC 24631850 */  addiu     $v1, $v1, %lo(D_80241850_CC2680)
-/* CC1410 802405E0 8C620000 */  lw        $v0, ($v1)
-/* CC1414 802405E4 54400003 */  bnel      $v0, $zero, .L802405F4
-/* CC1418 802405E8 AC600000 */   sw       $zero, ($v1)
-/* CC141C 802405EC 08090182 */  j         .L80240608
-/* CC1420 802405F0 0000102D */   daddu    $v0, $zero, $zero
-.L802405F4:
-/* CC1424 802405F4 8CC50000 */  lw        $a1, ($a2)
-/* CC1428 802405F8 3C068024 */  lui       $a2, %hi(D_80241854_CC2684)
-/* CC142C 802405FC 0C0B2026 */  jal       set_variable
-/* CC1430 80240600 8CC61854 */   lw       $a2, %lo(D_80241854_CC2684)($a2)
-/* CC1434 80240604 24020002 */  addiu     $v0, $zero, 2
-.L80240608:
-/* CC1438 80240608 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CC143C 8024060C 03E00008 */  jr        $ra
-/* CC1440 80240610 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s b/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s
deleted file mode 100644
index b2ffd645d5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240614_CC1444
-/* CC1444 80240614 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CC1448 80240618 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CC144C 8024061C 8C82000C */  lw        $v0, 0xc($a0)
-/* CC1450 80240620 0C0B1EAF */  jal       get_variable
-/* CC1454 80240624 8C450000 */   lw       $a1, ($v0)
-/* CC1458 80240628 3C018024 */  lui       $at, %hi(D_80241854_CC2684)
-/* CC145C 8024062C AC221854 */  sw        $v0, %lo(D_80241854_CC2684)($at)
-/* CC1460 80240630 24020002 */  addiu     $v0, $zero, 2
-/* CC1464 80240634 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CC1468 80240638 24030001 */  addiu     $v1, $zero, 1
-/* CC146C 8024063C 3C018024 */  lui       $at, %hi(D_80241850_CC2680)
-/* CC1470 80240640 AC231850 */  sw        $v1, %lo(D_80241850_CC2680)($at)
-/* CC1474 80240644 03E00008 */  jr        $ra
-/* CC1478 80240648 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s
deleted file mode 100644
index 4e710da7f7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024064C_CC147C
-/* CC147C 8024064C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CC1480 80240650 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CC1484 80240654 8C82000C */  lw        $v0, 0xc($a0)
-/* CC1488 80240658 0C0B1EAF */  jal       get_variable
-/* CC148C 8024065C 8C450000 */   lw       $a1, ($v0)
-/* CC1490 80240660 0040182D */  daddu     $v1, $v0, $zero
-/* CC1494 80240664 10600012 */  beqz      $v1, .L802406B0
-/* CC1498 80240668 0000202D */   daddu    $a0, $zero, $zero
-/* CC149C 8024066C 8C620000 */  lw        $v0, ($v1)
-/* CC14A0 80240670 5040000A */  beql      $v0, $zero, .L8024069C
-/* CC14A4 80240674 00041080 */   sll      $v0, $a0, 2
-/* CC14A8 80240678 3C058024 */  lui       $a1, %hi(D_802429E0)
-/* CC14AC 8024067C 24A529E0 */  addiu     $a1, $a1, %lo(D_802429E0)
-.L80240680:
-/* CC14B0 80240680 24630004 */  addiu     $v1, $v1, 4
-/* CC14B4 80240684 24840001 */  addiu     $a0, $a0, 1
-/* CC14B8 80240688 ACA20000 */  sw        $v0, ($a1)
-/* CC14BC 8024068C 8C620000 */  lw        $v0, ($v1)
-/* CC14C0 80240690 1440FFFB */  bnez      $v0, .L80240680
-/* CC14C4 80240694 24A50004 */   addiu    $a1, $a1, 4
-/* CC14C8 80240698 00041080 */  sll       $v0, $a0, 2
-.L8024069C:
-/* CC14CC 8024069C 3C018024 */  lui       $at, %hi(D_802429E0)
-/* CC14D0 802406A0 00220821 */  addu      $at, $at, $v0
-/* CC14D4 802406A4 AC2029E0 */  sw        $zero, %lo(D_802429E0)($at)
-/* CC14D8 802406A8 080901B6 */  j         .L802406D8
-/* CC14DC 802406AC 00000000 */   nop
-.L802406B0:
-/* CC14E0 802406B0 3C038024 */  lui       $v1, %hi(D_802429E0)
-/* CC14E4 802406B4 246329E0 */  addiu     $v1, $v1, %lo(D_802429E0)
-/* CC14E8 802406B8 0060282D */  daddu     $a1, $v1, $zero
-.L802406BC:
-/* CC14EC 802406BC 24820010 */  addiu     $v0, $a0, 0x10
-/* CC14F0 802406C0 AC620000 */  sw        $v0, ($v1)
-/* CC14F4 802406C4 24630004 */  addiu     $v1, $v1, 4
-/* CC14F8 802406C8 24840001 */  addiu     $a0, $a0, 1
-/* CC14FC 802406CC 28820070 */  slti      $v0, $a0, 0x70
-/* CC1500 802406D0 1440FFFA */  bnez      $v0, .L802406BC
-/* CC1504 802406D4 ACA001C0 */   sw       $zero, 0x1c0($a1)
-.L802406D8:
-/* CC1508 802406D8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CC150C 802406DC 24020002 */  addiu     $v0, $zero, 2
-/* CC1510 802406E0 03E00008 */  jr        $ra
-/* CC1514 802406E4 27BD0018 */   addiu    $sp, $sp, 0x18
-/* CC1518 802406E8 00000000 */  nop
-/* CC151C 802406EC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3810/func_80240000_CC3810.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3810/func_80240000_CC3810.s
deleted file mode 100644
index 2ca398b893..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3810/func_80240000_CC3810.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CC3810
-/* CC3810 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CC3814 80240004 0000202D */  daddu     $a0, $zero, $zero
-/* CC3818 80240008 0080282D */  daddu     $a1, $a0, $zero
-/* CC381C 8024000C 0080302D */  daddu     $a2, $a0, $zero
-/* CC3820 80240010 0080382D */  daddu     $a3, $a0, $zero
-/* CC3824 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CC3828 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CC382C 8024001C 0C01CA54 */  jal       func_80072950
-/* CC3830 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CC3834 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CC3838 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CC383C 8024002C 03E00008 */  jr        $ra
-/* CC3840 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CC3844 80240034 00000000 */  nop
-/* CC3848 80240038 00000000 */  nop
-/* CC384C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80240374_CC3B84.s
similarity index 99%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80240374_CC3B84.s
index 30b3f1b17a..0d28c2e945 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80240374_CC3B84.s
@@ -1,7 +1,17 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240374_CC3B84
+.section .rodata
+
+glabel D_80247A38_CCB248
+.double 0.09
+
+glabel D_80247A40_CCB250
+.double 0.09
+
+.section .text
+
+glabel flo_13_func_80240374_CC3B84
 /* CC3B84 80240374 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* CC3B88 80240378 AFB3004C */  sw        $s3, 0x4c($sp)
 /* CC3B8C 8024037C 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s
similarity index 98%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s
index c5f4cef4f7..9be8706ce0 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80241DB8_CC55C8
+glabel flo_13_func_80241DB8_CC55C8
 /* CC55C8 80241DB8 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* CC55CC 80241DBC AFB40050 */  sw        $s4, 0x50($sp)
 /* CC55D0 80241DC0 0080A02D */  daddu     $s4, $a0, $zero
@@ -85,12 +85,12 @@ glabel func_80241DB8_CC55C8
 .L80241EEC:
 /* CC56FC 80241EEC 0280202D */  daddu     $a0, $s4, $zero
 /* CC5700 80241EF0 02C0282D */  daddu     $a1, $s6, $zero
-/* CC5704 80241EF4 0C090071 */  jal       func_802401C4_CC39D4
+/* CC5704 80241EF4 0C090071 */  jal       flo_13_func_802401C4_CC39D4
 /* CC5708 80241EF8 02A0302D */   daddu    $a2, $s5, $zero
 .L80241EFC:
 /* CC570C 80241EFC 0280202D */  daddu     $a0, $s4, $zero
 /* CC5710 80241F00 02C0282D */  daddu     $a1, $s6, $zero
-/* CC5714 80241F04 0C0905C1 */  jal       func_80241704_CC4F14
+/* CC5714 80241F04 0C0905C1 */  jal       flo_13_func_80241704_CC4F14
 /* CC5718 80241F08 02A0302D */   daddu    $a2, $s5, $zero
 /* CC571C 80241F0C 080907CD */  j         .L80241F34
 /* CC5720 80241F10 00000000 */   nop
@@ -102,7 +102,7 @@ glabel func_80241DB8_CC55C8
 /* CC5734 80241F24 0280202D */  daddu     $a0, $s4, $zero
 .L80241F28:
 /* CC5738 80241F28 02C0282D */  daddu     $a1, $s6, $zero
-/* CC573C 80241F2C 0C0906DA */  jal       func_80241B68_CC5378
+/* CC573C 80241F2C 0C0906DA */  jal       flo_13_func_80241B68_CC5378
 /* CC5740 80241F30 02A0302D */   daddu    $a2, $s5, $zero
 .L80241F34:
 /* CC5744 80241F34 8E830070 */  lw        $v1, 0x70($s4)
@@ -117,7 +117,7 @@ glabel func_80241DB8_CC55C8
 /* CC5764 80241F54 8C460028 */  lw        $a2, 0x28($v0)
 /* CC5768 80241F58 0C00A720 */  jal       atan2
 /* CC576C 80241F5C 8C470030 */   lw       $a3, 0x30($v0)
-/* CC5770 80241F60 0C0905AF */  jal       func_802416BC_CC4ECC
+/* CC5770 80241F60 0C0905AF */  jal       flo_13_func_802416BC_CC4ECC
 /* CC5774 80241F64 E640000C */   swc1     $f0, 0xc($s2)
 /* CC5778 80241F68 0440000F */  bltz      $v0, .L80241FA8
 /* CC577C 80241F6C AE62007C */   sw       $v0, 0x7c($s3)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240040_CC3850.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240040_CC3850.s
deleted file mode 100644
index 7470fe4208..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240040_CC3850.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CC3850
-/* CC3850 80240040 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CC3854 80240044 AFB20018 */  sw        $s2, 0x18($sp)
-/* CC3858 80240048 0080902D */  daddu     $s2, $a0, $zero
-/* CC385C 8024004C AFB10014 */  sw        $s1, 0x14($sp)
-/* CC3860 80240050 00A0882D */  daddu     $s1, $a1, $zero
-/* CC3864 80240054 AFBF0024 */  sw        $ra, 0x24($sp)
-/* CC3868 80240058 AFB40020 */  sw        $s4, 0x20($sp)
-/* CC386C 8024005C AFB3001C */  sw        $s3, 0x1c($sp)
-/* CC3870 80240060 AFB00010 */  sw        $s0, 0x10($sp)
-/* CC3874 80240064 8E50000C */  lw        $s0, 0xc($s2)
-/* CC3878 80240068 8E050000 */  lw        $a1, ($s0)
-/* CC387C 8024006C 0C0B1EAF */  jal       get_variable
-/* CC3880 80240070 26100004 */   addiu    $s0, $s0, 4
-/* CC3884 80240074 0240202D */  daddu     $a0, $s2, $zero
-/* CC3888 80240078 8E050000 */  lw        $a1, ($s0)
-/* CC388C 8024007C 0C0B1EAF */  jal       get_variable
-/* CC3890 80240080 0040802D */   daddu    $s0, $v0, $zero
-/* CC3894 80240084 0200202D */  daddu     $a0, $s0, $zero
-/* CC3898 80240088 0C00EAD2 */  jal       get_npc_safe
-/* CC389C 8024008C 0040A02D */   daddu    $s4, $v0, $zero
-/* CC38A0 80240090 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* CC38A4 80240094 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* CC38A8 80240098 12200006 */  beqz      $s1, .L802400B4
-/* CC38AC 8024009C 0040802D */   daddu    $s0, $v0, $zero
-/* CC38B0 802400A0 82620012 */  lb        $v0, 0x12($s3)
-/* CC38B4 802400A4 54400003 */  bnel      $v0, $zero, .L802400B4
-/* CC38B8 802400A8 AE400070 */   sw       $zero, 0x70($s2)
-/* CC38BC 802400AC 24020002 */  addiu     $v0, $zero, 2
-/* CC38C0 802400B0 AE420070 */  sw        $v0, 0x70($s2)
-.L802400B4:
-/* CC38C4 802400B4 8E430070 */  lw        $v1, 0x70($s2)
-/* CC38C8 802400B8 24110001 */  addiu     $s1, $zero, 1
-/* CC38CC 802400BC 10710013 */  beq       $v1, $s1, .L8024010C
-/* CC38D0 802400C0 28620002 */   slti     $v0, $v1, 2
-/* CC38D4 802400C4 10400005 */  beqz      $v0, .L802400DC
-/* CC38D8 802400C8 24020002 */   addiu    $v0, $zero, 2
-/* CC38DC 802400CC 10600009 */  beqz      $v1, .L802400F4
-/* CC38E0 802400D0 0000102D */   daddu    $v0, $zero, $zero
-/* CC38E4 802400D4 08090069 */  j         .L802401A4
-/* CC38E8 802400D8 00000000 */   nop
-.L802400DC:
-/* CC38EC 802400DC 10620013 */  beq       $v1, $v0, .L8024012C
-/* CC38F0 802400E0 24020003 */   addiu    $v0, $zero, 3
-/* CC38F4 802400E4 1062001E */  beq       $v1, $v0, .L80240160
-/* CC38F8 802400E8 0000102D */   daddu    $v0, $zero, $zero
-/* CC38FC 802400EC 08090069 */  j         .L802401A4
-/* CC3900 802400F0 00000000 */   nop
-.L802400F4:
-/* CC3904 802400F4 0C03AC5A */  jal       func_800EB168
-/* CC3908 802400F8 0000202D */   daddu    $a0, $zero, $zero
-/* CC390C 802400FC 2402001E */  addiu     $v0, $zero, 0x1e
-/* CC3910 80240100 AE420074 */  sw        $v0, 0x74($s2)
-/* CC3914 80240104 08090068 */  j         .L802401A0
-/* CC3918 80240108 AE510070 */   sw       $s1, 0x70($s2)
-.L8024010C:
-/* CC391C 8024010C 8E420074 */  lw        $v0, 0x74($s2)
-/* CC3920 80240110 2403FFFF */  addiu     $v1, $zero, -1
-/* CC3924 80240114 2442FFFF */  addiu     $v0, $v0, -1
-/* CC3928 80240118 14430021 */  bne       $v0, $v1, .L802401A0
-/* CC392C 8024011C AE420074 */   sw       $v0, 0x74($s2)
-/* CC3930 80240120 24020002 */  addiu     $v0, $zero, 2
-/* CC3934 80240124 08090068 */  j         .L802401A0
-/* CC3938 80240128 AE420070 */   sw       $v0, 0x70($s2)
-.L8024012C:
-/* CC393C 8024012C 0200202D */  daddu     $a0, $s0, $zero
-/* CC3940 80240130 00141600 */  sll       $v0, $s4, 0x18
-/* CC3944 80240134 00021543 */  sra       $v0, $v0, 0x15
-/* CC3948 80240138 02621021 */  addu      $v0, $s3, $v0
-/* CC394C 8024013C A2740012 */  sb        $s4, 0x12($s3)
-/* CC3950 80240140 0C03BD17 */  jal       clear_partner_move_history
-/* CC3954 80240144 A0510014 */   sb       $s1, 0x14($v0)
-/* CC3958 80240148 82640012 */  lb        $a0, 0x12($s3)
-/* CC395C 8024014C 0C03ACA9 */  jal       func_800EB2A4
-/* CC3960 80240150 00000000 */   nop
-/* CC3964 80240154 24020003 */  addiu     $v0, $zero, 3
-/* CC3968 80240158 08090068 */  j         .L802401A0
-/* CC396C 8024015C AE420070 */   sw       $v0, 0x70($s2)
-.L80240160:
-/* CC3970 80240160 0C00EAD2 */  jal       get_npc_safe
-/* CC3974 80240164 2404FFFC */   addiu    $a0, $zero, -4
-/* CC3978 80240168 8E05000C */  lw        $a1, 0xc($s0)
-/* CC397C 8024016C 0C00ECD0 */  jal       set_npc_yaw
-/* CC3980 80240170 0040202D */   daddu    $a0, $v0, $zero
-/* CC3984 80240174 0200202D */  daddu     $a0, $s0, $zero
-/* CC3988 80240178 8E020000 */  lw        $v0, ($s0)
-/* CC398C 8024017C 2403FFFB */  addiu     $v1, $zero, -5
-/* CC3990 80240180 00431024 */  and       $v0, $v0, $v1
-/* CC3994 80240184 0C00EAFF */  jal       disable_npc_shadow
-/* CC3998 80240188 AE020000 */   sw       $v0, ($s0)
-/* CC399C 8024018C 3C01C47A */  lui       $at, 0xc47a
-/* CC39A0 80240190 44810000 */  mtc1      $at, $f0
-/* CC39A4 80240194 24020002 */  addiu     $v0, $zero, 2
-/* CC39A8 80240198 08090069 */  j         .L802401A4
-/* CC39AC 8024019C E600003C */   swc1     $f0, 0x3c($s0)
-.L802401A0:
-/* CC39B0 802401A0 0000102D */  daddu     $v0, $zero, $zero
-.L802401A4:
-/* CC39B4 802401A4 8FBF0024 */  lw        $ra, 0x24($sp)
-/* CC39B8 802401A8 8FB40020 */  lw        $s4, 0x20($sp)
-/* CC39BC 802401AC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CC39C0 802401B0 8FB20018 */  lw        $s2, 0x18($sp)
-/* CC39C4 802401B4 8FB10014 */  lw        $s1, 0x14($sp)
-/* CC39C8 802401B8 8FB00010 */  lw        $s0, 0x10($sp)
-/* CC39CC 802401BC 03E00008 */  jr        $ra
-/* CC39D0 802401C0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s
deleted file mode 100644
index 9600f3cab3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401C4_CC39D4
-/* CC39D4 802401C4 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CC39D8 802401C8 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CC39DC 802401CC 0080982D */  daddu     $s3, $a0, $zero
-/* CC39E0 802401D0 AFBF0030 */  sw        $ra, 0x30($sp)
-/* CC39E4 802401D4 AFB20028 */  sw        $s2, 0x28($sp)
-/* CC39E8 802401D8 AFB10024 */  sw        $s1, 0x24($sp)
-/* CC39EC 802401DC AFB00020 */  sw        $s0, 0x20($sp)
-/* CC39F0 802401E0 8E710148 */  lw        $s1, 0x148($s3)
-/* CC39F4 802401E4 86240008 */  lh        $a0, 8($s1)
-/* CC39F8 802401E8 0C00EABB */  jal       get_npc_unsafe
-/* CC39FC 802401EC 00A0902D */   daddu    $s2, $a1, $zero
-/* CC3A00 802401F0 8E440004 */  lw        $a0, 4($s2)
-/* CC3A04 802401F4 0040802D */  daddu     $s0, $v0, $zero
-/* CC3A08 802401F8 00041FC2 */  srl       $v1, $a0, 0x1f
-/* CC3A0C 802401FC 00832021 */  addu      $a0, $a0, $v1
-/* CC3A10 80240200 00042043 */  sra       $a0, $a0, 1
-/* CC3A14 80240204 0C00A67F */  jal       rand_int
-/* CC3A18 80240208 24840001 */   addiu    $a0, $a0, 1
-/* CC3A1C 8024020C 8E430004 */  lw        $v1, 4($s2)
-/* CC3A20 80240210 000327C2 */  srl       $a0, $v1, 0x1f
-/* CC3A24 80240214 00641821 */  addu      $v1, $v1, $a0
-/* CC3A28 80240218 00031843 */  sra       $v1, $v1, 1
-/* CC3A2C 8024021C 00621821 */  addu      $v1, $v1, $v0
-/* CC3A30 80240220 A603008E */  sh        $v1, 0x8e($s0)
-/* CC3A34 80240224 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CC3A38 80240228 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CC3A3C 8024022C C4640000 */  lwc1      $f4, ($v1)
-/* CC3A40 80240230 46802120 */  cvt.s.w   $f4, $f4
-/* CC3A44 80240234 C4620008 */  lwc1      $f2, 8($v1)
-/* CC3A48 80240238 468010A0 */  cvt.s.w   $f2, $f2
-/* CC3A4C 8024023C E7A00010 */  swc1      $f0, 0x10($sp)
-/* CC3A50 80240240 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC3A54 80240244 44061000 */  mfc1      $a2, $f2
-/* CC3A58 80240248 C440000C */  lwc1      $f0, 0xc($v0)
-/* CC3A5C 8024024C 46800020 */  cvt.s.w   $f0, $f0
-/* CC3A60 80240250 E7A00014 */  swc1      $f0, 0x14($sp)
-/* CC3A64 80240254 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC3A68 80240258 44052000 */  mfc1      $a1, $f4
-/* CC3A6C 8024025C C4400010 */  lwc1      $f0, 0x10($v0)
-/* CC3A70 80240260 46800020 */  cvt.s.w   $f0, $f0
-/* CC3A74 80240264 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CC3A78 80240268 8C640018 */  lw        $a0, 0x18($v1)
-/* CC3A7C 8024026C 0C0123F5 */  jal       is_point_within_region
-/* CC3A80 80240270 8E070038 */   lw       $a3, 0x38($s0)
-/* CC3A84 80240274 1040000E */  beqz      $v0, .L802402B0
-/* CC3A88 80240278 00000000 */   nop
-/* CC3A8C 8024027C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC3A90 80240280 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CC3A94 80240284 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CC3A98 80240288 C4460000 */  lwc1      $f6, ($v0)
-/* CC3A9C 8024028C 468031A0 */  cvt.s.w   $f6, $f6
-/* CC3AA0 80240290 44063000 */  mfc1      $a2, $f6
-/* CC3AA4 80240294 C4460008 */  lwc1      $f6, 8($v0)
-/* CC3AA8 80240298 468031A0 */  cvt.s.w   $f6, $f6
-/* CC3AAC 8024029C 44073000 */  mfc1      $a3, $f6
-/* CC3AB0 802402A0 0C00A720 */  jal       atan2
-/* CC3AB4 802402A4 00000000 */   nop
-/* CC3AB8 802402A8 080900B8 */  j         .L802402E0
-/* CC3ABC 802402AC E600000C */   swc1     $f0, 0xc($s0)
-.L802402B0:
-/* CC3AC0 802402B0 0C00A67F */  jal       rand_int
-/* CC3AC4 802402B4 2404003C */   addiu    $a0, $zero, 0x3c
-/* CC3AC8 802402B8 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CC3ACC 802402BC 44820000 */  mtc1      $v0, $f0
-/* CC3AD0 802402C0 00000000 */  nop
-/* CC3AD4 802402C4 46800020 */  cvt.s.w   $f0, $f0
-/* CC3AD8 802402C8 46006300 */  add.s     $f12, $f12, $f0
-/* CC3ADC 802402CC 3C0141F0 */  lui       $at, 0x41f0
-/* CC3AE0 802402D0 44810000 */  mtc1      $at, $f0
-/* CC3AE4 802402D4 0C00A6C9 */  jal       clamp_angle
-/* CC3AE8 802402D8 46006301 */   sub.s    $f12, $f12, $f0
-/* CC3AEC 802402DC E600000C */  swc1      $f0, 0xc($s0)
-.L802402E0:
-/* CC3AF0 802402E0 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CC3AF4 802402E4 8C420004 */  lw        $v0, 4($v0)
-/* CC3AF8 802402E8 AE020028 */  sw        $v0, 0x28($s0)
-/* CC3AFC 802402EC AE600074 */  sw        $zero, 0x74($s3)
-/* CC3B00 802402F0 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC3B04 802402F4 8C420014 */  lw        $v0, 0x14($v0)
-/* CC3B08 802402F8 04410004 */  bgez      $v0, .L8024030C
-/* CC3B0C 802402FC 00000000 */   nop
-/* CC3B10 80240300 C6400000 */  lwc1      $f0, ($s2)
-/* CC3B14 80240304 080900CB */  j         .L8024032C
-/* CC3B18 80240308 E6000018 */   swc1     $f0, 0x18($s0)
-.L8024030C:
-/* CC3B1C 8024030C 3C018024 */  lui       $at, %hi(D_80247A30_CCB240)
-/* CC3B20 80240310 D4227A30 */  ldc1      $f2, %lo(D_80247A30_CCB240)($at)
-/* CC3B24 80240314 44820000 */  mtc1      $v0, $f0
-/* CC3B28 80240318 00000000 */  nop
-/* CC3B2C 8024031C 46800021 */  cvt.d.w   $f0, $f0
-/* CC3B30 80240320 46220003 */  div.d     $f0, $f0, $f2
-/* CC3B34 80240324 46200020 */  cvt.s.d   $f0, $f0
-/* CC3B38 80240328 E6000018 */  swc1      $f0, 0x18($s0)
-.L8024032C:
-/* CC3B3C 8024032C C600003C */  lwc1      $f0, 0x3c($s0)
-/* CC3B40 80240330 3C014059 */  lui       $at, 0x4059
-/* CC3B44 80240334 44811800 */  mtc1      $at, $f3
-/* CC3B48 80240338 44801000 */  mtc1      $zero, $f2
-/* CC3B4C 8024033C 46000021 */  cvt.d.s   $f0, $f0
-/* CC3B50 80240340 46220002 */  mul.d     $f0, $f0, $f2
-/* CC3B54 80240344 00000000 */  nop
-/* CC3B58 80240348 24020001 */  addiu     $v0, $zero, 1
-/* CC3B5C 8024034C 4620018D */  trunc.w.d $f6, $f0
-/* CC3B60 80240350 E626007C */  swc1      $f6, 0x7c($s1)
-/* CC3B64 80240354 AE620070 */  sw        $v0, 0x70($s3)
-/* CC3B68 80240358 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CC3B6C 8024035C 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CC3B70 80240360 8FB20028 */  lw        $s2, 0x28($sp)
-/* CC3B74 80240364 8FB10024 */  lw        $s1, 0x24($sp)
-/* CC3B78 80240368 8FB00020 */  lw        $s0, 0x20($sp)
-/* CC3B7C 8024036C 03E00008 */  jr        $ra
-/* CC3B80 80240370 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E18_CC4628.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E18_CC4628.s
deleted file mode 100644
index 2370aa745e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E18_CC4628.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E18_CC4628
-/* CC4628 80240E18 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CC462C 80240E1C AFB00010 */  sw        $s0, 0x10($sp)
-/* CC4630 80240E20 0080802D */  daddu     $s0, $a0, $zero
-/* CC4634 80240E24 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CC4638 80240E28 8E020148 */  lw        $v0, 0x148($s0)
-/* CC463C 80240E2C 0C00EABB */  jal       get_npc_unsafe
-/* CC4640 80240E30 84440008 */   lh       $a0, 8($v0)
-/* CC4644 80240E34 9443008E */  lhu       $v1, 0x8e($v0)
-/* CC4648 80240E38 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CC464C 80240E3C 24640001 */  addiu     $a0, $v1, 1
-/* CC4650 80240E40 00031C00 */  sll       $v1, $v1, 0x10
-/* CC4654 80240E44 00031B83 */  sra       $v1, $v1, 0xe
-/* CC4658 80240E48 A444008E */  sh        $a0, 0x8e($v0)
-/* CC465C 80240E4C 3C018024 */  lui       $at, %hi(D_8024412C_CC793C)
-/* CC4660 80240E50 00230821 */  addu      $at, $at, $v1
-/* CC4664 80240E54 C422412C */  lwc1      $f2, %lo(D_8024412C_CC793C)($at)
-/* CC4668 80240E58 8443008E */  lh        $v1, 0x8e($v0)
-/* CC466C 80240E5C 46020000 */  add.s     $f0, $f0, $f2
-/* CC4670 80240E60 28630005 */  slti      $v1, $v1, 5
-/* CC4674 80240E64 14600003 */  bnez      $v1, .L80240E74
-/* CC4678 80240E68 E440003C */   swc1     $f0, 0x3c($v0)
-/* CC467C 80240E6C 2402000C */  addiu     $v0, $zero, 0xc
-/* CC4680 80240E70 AE020070 */  sw        $v0, 0x70($s0)
-.L80240E74:
-/* CC4684 80240E74 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CC4688 80240E78 8FB00010 */  lw        $s0, 0x10($sp)
-/* CC468C 80240E7C 03E00008 */  jr        $ra
-/* CC4690 80240E80 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s
deleted file mode 100644
index 8d5fd460d4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414D0_CC4CE0
-/* CC4CE0 802414D0 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CC4CE4 802414D4 AFB40040 */  sw        $s4, 0x40($sp)
-/* CC4CE8 802414D8 0080A02D */  daddu     $s4, $a0, $zero
-/* CC4CEC 802414DC AFBF0048 */  sw        $ra, 0x48($sp)
-/* CC4CF0 802414E0 AFB50044 */  sw        $s5, 0x44($sp)
-/* CC4CF4 802414E4 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CC4CF8 802414E8 AFB20038 */  sw        $s2, 0x38($sp)
-/* CC4CFC 802414EC AFB10034 */  sw        $s1, 0x34($sp)
-/* CC4D00 802414F0 AFB00030 */  sw        $s0, 0x30($sp)
-/* CC4D04 802414F4 8E920148 */  lw        $s2, 0x148($s4)
-/* CC4D08 802414F8 86440008 */  lh        $a0, 8($s2)
-/* CC4D0C 802414FC 8E90000C */  lw        $s0, 0xc($s4)
-/* CC4D10 80241500 0C00EABB */  jal       get_npc_unsafe
-/* CC4D14 80241504 00A0882D */   daddu    $s1, $a1, $zero
-/* CC4D18 80241508 0280202D */  daddu     $a0, $s4, $zero
-/* CC4D1C 8024150C 8E050000 */  lw        $a1, ($s0)
-/* CC4D20 80241510 0C0B1EAF */  jal       get_variable
-/* CC4D24 80241514 0040A82D */   daddu    $s5, $v0, $zero
-/* CC4D28 80241518 AFA00010 */  sw        $zero, 0x10($sp)
-/* CC4D2C 8024151C 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC4D30 80241520 8C630030 */  lw        $v1, 0x30($v1)
-/* CC4D34 80241524 AFA30014 */  sw        $v1, 0x14($sp)
-/* CC4D38 80241528 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC4D3C 8024152C 8C63001C */  lw        $v1, 0x1c($v1)
-/* CC4D40 80241530 AFA30018 */  sw        $v1, 0x18($sp)
-/* CC4D44 80241534 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC4D48 80241538 8C630024 */  lw        $v1, 0x24($v1)
-/* CC4D4C 8024153C AFA3001C */  sw        $v1, 0x1c($sp)
-/* CC4D50 80241540 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC4D54 80241544 8C630028 */  lw        $v1, 0x28($v1)
-/* CC4D58 80241548 27B30010 */  addiu     $s3, $sp, 0x10
-/* CC4D5C 8024154C AFA30020 */  sw        $v1, 0x20($sp)
-/* CC4D60 80241550 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC4D64 80241554 3C0142F0 */  lui       $at, 0x42f0
-/* CC4D68 80241558 44810000 */  mtc1      $at, $f0
-/* CC4D6C 8024155C 8C63002C */  lw        $v1, 0x2c($v1)
-/* CC4D70 80241560 0040802D */  daddu     $s0, $v0, $zero
-/* CC4D74 80241564 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CC4D78 80241568 A7A0002C */  sh        $zero, 0x2c($sp)
-/* CC4D7C 8024156C 12200006 */  beqz      $s1, .L80241588
-/* CC4D80 80241570 AFA30024 */   sw       $v1, 0x24($sp)
-/* CC4D84 80241574 02A0202D */  daddu     $a0, $s5, $zero
-/* CC4D88 80241578 0240282D */  daddu     $a1, $s2, $zero
-/* CC4D8C 8024157C 0280302D */  daddu     $a2, $s4, $zero
-/* CC4D90 80241580 0C0904EB */  jal       flo_13_UnkFunc5
-/* CC4D94 80241584 0200382D */   daddu    $a3, $s0, $zero
-.L80241588:
-/* CC4D98 80241588 2402FFFE */  addiu     $v0, $zero, -2
-/* CC4D9C 8024158C A2A200AB */  sb        $v0, 0xab($s5)
-/* CC4DA0 80241590 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CC4DA4 80241594 30620004 */  andi      $v0, $v1, 4
-/* CC4DA8 80241598 10400007 */  beqz      $v0, .L802415B8
-/* CC4DAC 8024159C 00000000 */   nop
-/* CC4DB0 802415A0 824200B4 */  lb        $v0, 0xb4($s2)
-/* CC4DB4 802415A4 1440003C */  bnez      $v0, .L80241698
-/* CC4DB8 802415A8 0000102D */   daddu    $v0, $zero, $zero
-/* CC4DBC 802415AC 2402FFFB */  addiu     $v0, $zero, -5
-/* CC4DC0 802415B0 00621024 */  and       $v0, $v1, $v0
-/* CC4DC4 802415B4 AE4200B0 */  sw        $v0, 0xb0($s2)
-.L802415B8:
-/* CC4DC8 802415B8 8E830070 */  lw        $v1, 0x70($s4)
-/* CC4DCC 802415BC 2C62000F */  sltiu     $v0, $v1, 0xf
-/* CC4DD0 802415C0 10400034 */  beqz      $v0, L80241694_CC4EA4
-/* CC4DD4 802415C4 00031080 */   sll      $v0, $v1, 2
-/* CC4DD8 802415C8 3C018024 */  lui       $at, %hi(jtbl_80247A48_CCB258)
-/* CC4DDC 802415CC 00220821 */  addu      $at, $at, $v0
-/* CC4DE0 802415D0 8C227A48 */  lw        $v0, %lo(jtbl_80247A48_CCB258)($at)
-/* CC4DE4 802415D4 00400008 */  jr        $v0
-/* CC4DE8 802415D8 00000000 */   nop
-glabel L802415DC_CC4DEC
-/* CC4DEC 802415DC 0280202D */  daddu     $a0, $s4, $zero
-/* CC4DF0 802415E0 0200282D */  daddu     $a1, $s0, $zero
-/* CC4DF4 802415E4 0C090071 */  jal       func_802401C4_CC39D4
-/* CC4DF8 802415E8 0260302D */   daddu    $a2, $s3, $zero
-glabel L802415EC_CC4DFC
-/* CC4DFC 802415EC 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E00 802415F0 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E04 802415F4 0C0900DD */  jal       func_80240374_CC3B84
-/* CC4E08 802415F8 0260302D */   daddu    $a2, $s3, $zero
-/* CC4E0C 802415FC 080905A6 */  j         .L80241698
-/* CC4E10 80241600 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241604_CC4E14
-/* CC4E14 80241604 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E18 80241608 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E1C 8024160C 0C090267 */  jal       flo_13_UnkNpcAIFunc1
-/* CC4E20 80241610 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241614_CC4E24
-/* CC4E24 80241614 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E28 80241618 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E2C 8024161C 0C090297 */  jal       flo_13_UnkFunc4
-/* CC4E30 80241620 0260302D */   daddu    $a2, $s3, $zero
-/* CC4E34 80241624 080905A6 */  j         .L80241698
-/* CC4E38 80241628 0000102D */   daddu    $v0, $zero, $zero
-glabel L8024162C_CC4E3C
-/* CC4E3C 8024162C 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E40 80241630 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E44 80241634 0C090368 */  jal       flo_13_UnkNpcAIFunc2
-/* CC4E48 80241638 0260302D */   daddu    $a2, $s3, $zero
-glabel L8024163C_CC4E4C
-/* CC4E4C 8024163C 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E50 80241640 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E54 80241644 0C090386 */  jal       func_80240E18_CC4628
-/* CC4E58 80241648 0260302D */   daddu    $a2, $s3, $zero
-/* CC4E5C 8024164C 080905A6 */  j         .L80241698
-/* CC4E60 80241650 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241654_CC4E64
-/* CC4E64 80241654 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E68 80241658 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E6C 8024165C 0C0903A1 */  jal       flo_13_UnkNpcAIFunc14
-/* CC4E70 80241660 0260302D */   daddu    $a2, $s3, $zero
-/* CC4E74 80241664 080905A6 */  j         .L80241698
-/* CC4E78 80241668 0000102D */   daddu    $v0, $zero, $zero
-glabel L8024166C_CC4E7C
-/* CC4E7C 8024166C 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E80 80241670 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E84 80241674 0C0903EE */  jal       flo_13_UnkNpcAIFunc3
-/* CC4E88 80241678 0260302D */   daddu    $a2, $s3, $zero
-/* CC4E8C 8024167C 080905A6 */  j         .L80241698
-/* CC4E90 80241680 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241684_CC4E94
-/* CC4E94 80241684 0280202D */  daddu     $a0, $s4, $zero
-/* CC4E98 80241688 0200282D */  daddu     $a1, $s0, $zero
-/* CC4E9C 8024168C 0C090407 */  jal       flo_13_UnkFunc6
-/* CC4EA0 80241690 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241694_CC4EA4
-/* CC4EA4 80241694 0000102D */  daddu     $v0, $zero, $zero
-.L80241698:
-/* CC4EA8 80241698 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CC4EAC 8024169C 8FB50044 */  lw        $s5, 0x44($sp)
-/* CC4EB0 802416A0 8FB40040 */  lw        $s4, 0x40($sp)
-/* CC4EB4 802416A4 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CC4EB8 802416A8 8FB20038 */  lw        $s2, 0x38($sp)
-/* CC4EBC 802416AC 8FB10034 */  lw        $s1, 0x34($sp)
-/* CC4EC0 802416B0 8FB00030 */  lw        $s0, 0x30($sp)
-/* CC4EC4 802416B4 03E00008 */  jr        $ra
-/* CC4EC8 802416B8 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802416BC_CC4ECC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802416BC_CC4ECC.s
deleted file mode 100644
index ba04ea4052..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802416BC_CC4ECC.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416BC_CC4ECC
-/* CC4ECC 802416BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CC4ED0 802416C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* CC4ED4 802416C4 24100032 */  addiu     $s0, $zero, 0x32
-/* CC4ED8 802416C8 AFBF0014 */  sw        $ra, 0x14($sp)
-.L802416CC:
-/* CC4EDC 802416CC 0C00FB3A */  jal       get_enemy
-/* CC4EE0 802416D0 0200202D */   daddu    $a0, $s0, $zero
-/* CC4EE4 802416D4 8C420094 */  lw        $v0, 0x94($v0)
-/* CC4EE8 802416D8 54400003 */  bnel      $v0, $zero, .L802416E8
-/* CC4EEC 802416DC 26100001 */   addiu    $s0, $s0, 1
-/* CC4EF0 802416E0 080905BD */  j         .L802416F4
-/* CC4EF4 802416E4 0200102D */   daddu    $v0, $s0, $zero
-.L802416E8:
-/* CC4EF8 802416E8 2A020038 */  slti      $v0, $s0, 0x38
-/* CC4EFC 802416EC 1440FFF7 */  bnez      $v0, .L802416CC
-/* CC4F00 802416F0 2402FFFF */   addiu    $v0, $zero, -1
-.L802416F4:
-/* CC4F04 802416F4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CC4F08 802416F8 8FB00010 */  lw        $s0, 0x10($sp)
-/* CC4F0C 802416FC 03E00008 */  jr        $ra
-/* CC4F10 80241700 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s
deleted file mode 100644
index eba9ed31c9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s
+++ /dev/null
@@ -1,295 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241704_CC4F14
-/* CC4F14 80241704 27BDFF78 */  addiu     $sp, $sp, -0x88
-/* CC4F18 80241708 AFB20048 */  sw        $s2, 0x48($sp)
-/* CC4F1C 8024170C 0080902D */  daddu     $s2, $a0, $zero
-/* CC4F20 80241710 AFBF0064 */  sw        $ra, 0x64($sp)
-/* CC4F24 80241714 AFBE0060 */  sw        $fp, 0x60($sp)
-/* CC4F28 80241718 AFB7005C */  sw        $s7, 0x5c($sp)
-/* CC4F2C 8024171C AFB60058 */  sw        $s6, 0x58($sp)
-/* CC4F30 80241720 AFB50054 */  sw        $s5, 0x54($sp)
-/* CC4F34 80241724 AFB40050 */  sw        $s4, 0x50($sp)
-/* CC4F38 80241728 AFB3004C */  sw        $s3, 0x4c($sp)
-/* CC4F3C 8024172C AFB10044 */  sw        $s1, 0x44($sp)
-/* CC4F40 80241730 AFB00040 */  sw        $s0, 0x40($sp)
-/* CC4F44 80241734 F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* CC4F48 80241738 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* CC4F4C 8024173C F7B60070 */  sdc1      $f22, 0x70($sp)
-/* CC4F50 80241740 F7B40068 */  sdc1      $f20, 0x68($sp)
-/* CC4F54 80241744 8E510148 */  lw        $s1, 0x148($s2)
-/* CC4F58 80241748 00A0B82D */  daddu     $s7, $a1, $zero
-/* CC4F5C 8024174C 86240008 */  lh        $a0, 8($s1)
-/* CC4F60 80241750 0C00EABB */  jal       get_npc_unsafe
-/* CC4F64 80241754 00C0F02D */   daddu    $fp, $a2, $zero
-/* CC4F68 80241758 C620007C */  lwc1      $f0, 0x7c($s1)
-/* CC4F6C 8024175C 46800020 */  cvt.s.w   $f0, $f0
-/* CC4F70 80241760 46000021 */  cvt.d.s   $f0, $f0
-/* CC4F74 80241764 0040802D */  daddu     $s0, $v0, $zero
-/* CC4F78 80241768 3C014059 */  lui       $at, 0x4059
-/* CC4F7C 8024176C 44813800 */  mtc1      $at, $f7
-/* CC4F80 80241770 44803000 */  mtc1      $zero, $f6
-/* CC4F84 80241774 8602008E */  lh        $v0, 0x8e($s0)
-/* CC4F88 80241778 9603008E */  lhu       $v1, 0x8e($s0)
-/* CC4F8C 8024177C 46260003 */  div.d     $f0, $f0, $f6
-/* CC4F90 80241780 462005A0 */  cvt.s.d   $f22, $f0
-/* CC4F94 80241784 C6200078 */  lwc1      $f0, 0x78($s1)
-/* CC4F98 80241788 46800020 */  cvt.s.w   $f0, $f0
-/* CC4F9C 8024178C 46000021 */  cvt.d.s   $f0, $f0
-/* CC4FA0 80241790 46260003 */  div.d     $f0, $f0, $f6
-/* CC4FA4 80241794 18400003 */  blez      $v0, .L802417A4
-/* CC4FA8 80241798 46200620 */   cvt.s.d  $f24, $f0
-/* CC4FAC 8024179C 2462FFFF */  addiu     $v0, $v1, -1
-/* CC4FB0 802417A0 A602008E */  sh        $v0, 0x8e($s0)
-.L802417A4:
-/* CC4FB4 802417A4 27B40028 */  addiu     $s4, $sp, 0x28
-/* CC4FB8 802417A8 0280282D */  daddu     $a1, $s4, $zero
-/* CC4FBC 802417AC 27B5002C */  addiu     $s5, $sp, 0x2c
-/* CC4FC0 802417B0 02A0302D */  daddu     $a2, $s5, $zero
-/* CC4FC4 802417B4 27B60030 */  addiu     $s6, $sp, 0x30
-/* CC4FC8 802417B8 02C0382D */  daddu     $a3, $s6, $zero
-/* CC4FCC 802417BC C6000038 */  lwc1      $f0, 0x38($s0)
-/* CC4FD0 802417C0 C602003C */  lwc1      $f2, 0x3c($s0)
-/* CC4FD4 802417C4 C6040040 */  lwc1      $f4, 0x40($s0)
-/* CC4FD8 802417C8 3C01447A */  lui       $at, 0x447a
-/* CC4FDC 802417CC 4481D000 */  mtc1      $at, $f26
-/* CC4FE0 802417D0 27B30034 */  addiu     $s3, $sp, 0x34
-/* CC4FE4 802417D4 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CC4FE8 802417D8 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* CC4FEC 802417DC E7A40030 */  swc1      $f4, 0x30($sp)
-/* CC4FF0 802417E0 E7BA0034 */  swc1      $f26, 0x34($sp)
-/* CC4FF4 802417E4 C6340070 */  lwc1      $f20, 0x70($s1)
-/* CC4FF8 802417E8 4680A520 */  cvt.s.w   $f20, $f20
-/* CC4FFC 802417EC 4600A521 */  cvt.d.s   $f20, $f20
-/* CC5000 802417F0 4626A503 */  div.d     $f20, $f20, $f6
-/* CC5004 802417F4 AFB30010 */  sw        $s3, 0x10($sp)
-/* CC5008 802417F8 8E040080 */  lw        $a0, 0x80($s0)
-/* CC500C 802417FC 0C0372DF */  jal       func_800DCB7C
-/* CC5010 80241800 4620A520 */   cvt.s.d  $f20, $f20
-/* CC5014 80241804 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* CC5018 80241808 0C00A8BB */  jal       sin_deg
-/* CC501C 8024180C 46806320 */   cvt.s.w  $f12, $f12
-/* CC5020 80241810 46140002 */  mul.s     $f0, $f0, $f20
-/* CC5024 80241814 00000000 */  nop
-/* CC5028 80241818 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* CC502C 8024181C 46181080 */  add.s     $f2, $f2, $f24
-/* CC5030 80241820 46001080 */  add.s     $f2, $f2, $f0
-/* CC5034 80241824 E602003C */  swc1      $f2, 0x3c($s0)
-/* CC5038 80241828 8E220074 */  lw        $v0, 0x74($s1)
-/* CC503C 8024182C 2442000C */  addiu     $v0, $v0, 0xc
-/* CC5040 80241830 44826000 */  mtc1      $v0, $f12
-/* CC5044 80241834 00000000 */  nop
-/* CC5048 80241838 0C00A6C9 */  jal       clamp_angle
-/* CC504C 8024183C 46806320 */   cvt.s.w  $f12, $f12
-/* CC5050 80241840 4600020D */  trunc.w.s $f8, $f0
-/* CC5054 80241844 E6280074 */  swc1      $f8, 0x74($s1)
-/* CC5058 80241848 8EE30014 */  lw        $v1, 0x14($s7)
-/* CC505C 8024184C 0460003C */  bltz      $v1, .L80241940
-/* CC5060 80241850 00000000 */   nop
-/* CC5064 80241854 8E420074 */  lw        $v0, 0x74($s2)
-/* CC5068 80241858 1C400038 */  bgtz      $v0, .L8024193C
-/* CC506C 8024185C 2442FFFF */   addiu    $v0, $v0, -1
-/* CC5070 80241860 03C0202D */  daddu     $a0, $fp, $zero
-/* CC5074 80241864 AE430074 */  sw        $v1, 0x74($s2)
-/* CC5078 80241868 AFA00010 */  sw        $zero, 0x10($sp)
-/* CC507C 8024186C 8EE6000C */  lw        $a2, 0xc($s7)
-/* CC5080 80241870 8EE70010 */  lw        $a3, 0x10($s7)
-/* CC5084 80241874 0C01242D */  jal       func_800490B4
-/* CC5088 80241878 0220282D */   daddu    $a1, $s1, $zero
-/* CC508C 8024187C 1040002D */  beqz      $v0, .L80241934
-/* CC5090 80241880 0000202D */   daddu    $a0, $zero, $zero
-/* CC5094 80241884 0200282D */  daddu     $a1, $s0, $zero
-/* CC5098 80241888 0000302D */  daddu     $a2, $zero, $zero
-/* CC509C 8024188C 860300A8 */  lh        $v1, 0xa8($s0)
-/* CC50A0 80241890 3C013F80 */  lui       $at, 0x3f80
-/* CC50A4 80241894 44810000 */  mtc1      $at, $f0
-/* CC50A8 80241898 3C014000 */  lui       $at, 0x4000
-/* CC50AC 8024189C 44811000 */  mtc1      $at, $f2
-/* CC50B0 802418A0 3C01C1A0 */  lui       $at, 0xc1a0
-/* CC50B4 802418A4 44812000 */  mtc1      $at, $f4
-/* CC50B8 802418A8 2402000F */  addiu     $v0, $zero, 0xf
-/* CC50BC 802418AC AFA2001C */  sw        $v0, 0x1c($sp)
-/* CC50C0 802418B0 44834000 */  mtc1      $v1, $f8
-/* CC50C4 802418B4 00000000 */  nop
-/* CC50C8 802418B8 46804220 */  cvt.s.w   $f8, $f8
-/* CC50CC 802418BC 44074000 */  mfc1      $a3, $f8
-/* CC50D0 802418C0 27A20038 */  addiu     $v0, $sp, 0x38
-/* CC50D4 802418C4 AFA20020 */  sw        $v0, 0x20($sp)
-/* CC50D8 802418C8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CC50DC 802418CC E7A20014 */  swc1      $f2, 0x14($sp)
-/* CC50E0 802418D0 0C01BFA4 */  jal       fx_emote
-/* CC50E4 802418D4 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CC50E8 802418D8 0200202D */  daddu     $a0, $s0, $zero
-/* CC50EC 802418DC 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* CC50F0 802418E0 0C012530 */  jal       func_800494C0
-/* CC50F4 802418E4 3C060020 */   lui      $a2, 0x20
-/* CC50F8 802418E8 0280282D */  daddu     $a1, $s4, $zero
-/* CC50FC 802418EC C6000038 */  lwc1      $f0, 0x38($s0)
-/* CC5100 802418F0 C602003C */  lwc1      $f2, 0x3c($s0)
-/* CC5104 802418F4 C6040040 */  lwc1      $f4, 0x40($s0)
-/* CC5108 802418F8 02A0302D */  daddu     $a2, $s5, $zero
-/* CC510C 802418FC E7BA0034 */  swc1      $f26, 0x34($sp)
-/* CC5110 80241900 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CC5114 80241904 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* CC5118 80241908 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CC511C 8024190C AFB30010 */  sw        $s3, 0x10($sp)
-/* CC5120 80241910 8E040080 */  lw        $a0, 0x80($s0)
-/* CC5124 80241914 0C0372DF */  jal       func_800DCB7C
-/* CC5128 80241918 02C0382D */   daddu    $a3, $s6, $zero
-/* CC512C 8024191C C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* CC5130 80241920 46180000 */  add.s     $f0, $f0, $f24
-/* CC5134 80241924 2402000C */  addiu     $v0, $zero, 0xc
-/* CC5138 80241928 E6000064 */  swc1      $f0, 0x64($s0)
-/* CC513C 8024192C 080906CA */  j         .L80241B28
-/* CC5140 80241930 AE420070 */   sw       $v0, 0x70($s2)
-.L80241934:
-/* CC5144 80241934 8E420074 */  lw        $v0, 0x74($s2)
-/* CC5148 80241938 2442FFFF */  addiu     $v0, $v0, -1
-.L8024193C:
-/* CC514C 8024193C AE420074 */  sw        $v0, 0x74($s2)
-.L80241940:
-/* CC5150 80241940 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CC5154 80241944 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CC5158 80241948 C4620000 */  lwc1      $f2, ($v1)
-/* CC515C 8024194C 468010A0 */  cvt.s.w   $f2, $f2
-/* CC5160 80241950 C4640008 */  lwc1      $f4, 8($v1)
-/* CC5164 80241954 46802120 */  cvt.s.w   $f4, $f4
-/* CC5168 80241958 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CC516C 8024195C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC5170 80241960 44051000 */  mfc1      $a1, $f2
-/* CC5174 80241964 C440000C */  lwc1      $f0, 0xc($v0)
-/* CC5178 80241968 46800020 */  cvt.s.w   $f0, $f0
-/* CC517C 8024196C E7A00014 */  swc1      $f0, 0x14($sp)
-/* CC5180 80241970 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC5184 80241974 44062000 */  mfc1      $a2, $f4
-/* CC5188 80241978 C4400010 */  lwc1      $f0, 0x10($v0)
-/* CC518C 8024197C 46800020 */  cvt.s.w   $f0, $f0
-/* CC5190 80241980 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CC5194 80241984 8C640018 */  lw        $a0, 0x18($v1)
-/* CC5198 80241988 0C0123F5 */  jal       is_point_within_region
-/* CC519C 8024198C 8E070038 */   lw       $a3, 0x38($s0)
-/* CC51A0 80241990 1040000D */  beqz      $v0, .L802419C8
-/* CC51A4 80241994 00000000 */   nop
-/* CC51A8 80241998 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC51AC 8024199C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CC51B0 802419A0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CC51B4 802419A4 C4480000 */  lwc1      $f8, ($v0)
-/* CC51B8 802419A8 46804220 */  cvt.s.w   $f8, $f8
-/* CC51BC 802419AC 44064000 */  mfc1      $a2, $f8
-/* CC51C0 802419B0 C4480008 */  lwc1      $f8, 8($v0)
-/* CC51C4 802419B4 46804220 */  cvt.s.w   $f8, $f8
-/* CC51C8 802419B8 44074000 */  mfc1      $a3, $f8
-/* CC51CC 802419BC 0C00A720 */  jal       atan2
-/* CC51D0 802419C0 00000000 */   nop
-/* CC51D4 802419C4 E600000C */  swc1      $f0, 0xc($s0)
-.L802419C8:
-/* CC51D8 802419C8 8602008C */  lh        $v0, 0x8c($s0)
-/* CC51DC 802419CC 14400056 */  bnez      $v0, .L80241B28
-/* CC51E0 802419D0 00000000 */   nop
-/* CC51E4 802419D4 8602008E */  lh        $v0, 0x8e($s0)
-/* CC51E8 802419D8 1840003D */  blez      $v0, .L80241AD0
-/* CC51EC 802419DC 240403E8 */   addiu    $a0, $zero, 0x3e8
-/* CC51F0 802419E0 8E050018 */  lw        $a1, 0x18($s0)
-/* CC51F4 802419E4 8E06000C */  lw        $a2, 0xc($s0)
-/* CC51F8 802419E8 0C00EA95 */  jal       npc_move_heading
-/* CC51FC 802419EC 0200202D */   daddu    $a0, $s0, $zero
-/* CC5200 802419F0 8E22006C */  lw        $v0, 0x6c($s1)
-/* CC5204 802419F4 30420001 */  andi      $v0, $v0, 1
-/* CC5208 802419F8 10400032 */  beqz      $v0, .L80241AC4
-/* CC520C 802419FC 27A50028 */   addiu    $a1, $sp, 0x28
-/* CC5210 80241A00 27A6002C */  addiu     $a2, $sp, 0x2c
-/* CC5214 80241A04 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CC5218 80241A08 C6020040 */  lwc1      $f2, 0x40($s0)
-/* CC521C 80241A0C 3C01447A */  lui       $at, 0x447a
-/* CC5220 80241A10 44812000 */  mtc1      $at, $f4
-/* CC5224 80241A14 27A20034 */  addiu     $v0, $sp, 0x34
-/* CC5228 80241A18 E7B6002C */  swc1      $f22, 0x2c($sp)
-/* CC522C 80241A1C E7A00028 */  swc1      $f0, 0x28($sp)
-/* CC5230 80241A20 E7A20030 */  swc1      $f2, 0x30($sp)
-/* CC5234 80241A24 E7A40034 */  swc1      $f4, 0x34($sp)
-/* CC5238 80241A28 AFA20010 */  sw        $v0, 0x10($sp)
-/* CC523C 80241A2C 8E040080 */  lw        $a0, 0x80($s0)
-/* CC5240 80241A30 0C0372DF */  jal       func_800DCB7C
-/* CC5244 80241A34 27A70030 */   addiu    $a3, $sp, 0x30
-/* CC5248 80241A38 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* CC524C 80241A3C 46180100 */  add.s     $f4, $f0, $f24
-/* CC5250 80241A40 3C014000 */  lui       $at, 0x4000
-/* CC5254 80241A44 44813800 */  mtc1      $at, $f7
-/* CC5258 80241A48 44803000 */  mtc1      $zero, $f6
-/* CC525C 80241A4C 46162001 */  sub.s     $f0, $f4, $f22
-/* CC5260 80241A50 E7A4002C */  swc1      $f4, 0x2c($sp)
-/* CC5264 80241A54 460000A1 */  cvt.d.s   $f2, $f0
-/* CC5268 80241A58 4622303C */  c.lt.d    $f6, $f2
-/* CC526C 80241A5C 00000000 */  nop
-/* CC5270 80241A60 45000005 */  bc1f      .L80241A78
-/* CC5274 80241A64 E7A00034 */   swc1     $f0, 0x34($sp)
-/* CC5278 80241A68 4600B021 */  cvt.d.s   $f0, $f22
-/* CC527C 80241A6C 46260000 */  add.d     $f0, $f0, $f6
-/* CC5280 80241A70 080906A9 */  j         .L80241AA4
-/* CC5284 80241A74 462005A0 */   cvt.s.d  $f22, $f0
-.L80241A78:
-/* CC5288 80241A78 3C01C000 */  lui       $at, 0xc000
-/* CC528C 80241A7C 44810800 */  mtc1      $at, $f1
-/* CC5290 80241A80 44800000 */  mtc1      $zero, $f0
-/* CC5294 80241A84 00000000 */  nop
-/* CC5298 80241A88 4620103C */  c.lt.d    $f2, $f0
-/* CC529C 80241A8C 00000000 */  nop
-/* CC52A0 80241A90 45020004 */  bc1fl     .L80241AA4
-/* CC52A4 80241A94 46002586 */   mov.s    $f22, $f4
-/* CC52A8 80241A98 4600B021 */  cvt.d.s   $f0, $f22
-/* CC52AC 80241A9C 46260001 */  sub.d     $f0, $f0, $f6
-/* CC52B0 80241AA0 462005A0 */  cvt.s.d   $f22, $f0
-.L80241AA4:
-/* CC52B4 80241AA4 3C014059 */  lui       $at, 0x4059
-/* CC52B8 80241AA8 44811800 */  mtc1      $at, $f3
-/* CC52BC 80241AAC 44801000 */  mtc1      $zero, $f2
-/* CC52C0 80241AB0 4600B021 */  cvt.d.s   $f0, $f22
-/* CC52C4 80241AB4 46220002 */  mul.d     $f0, $f0, $f2
-/* CC52C8 80241AB8 00000000 */  nop
-/* CC52CC 80241ABC 4620020D */  trunc.w.d $f8, $f0
-/* CC52D0 80241AC0 E628007C */  swc1      $f8, 0x7c($s1)
-.L80241AC4:
-/* CC52D4 80241AC4 8602008E */  lh        $v0, 0x8e($s0)
-/* CC52D8 80241AC8 1C400017 */  bgtz      $v0, .L80241B28
-/* CC52DC 80241ACC 240403E8 */   addiu    $a0, $zero, 0x3e8
-.L80241AD0:
-/* CC52E0 80241AD0 24020002 */  addiu     $v0, $zero, 2
-/* CC52E4 80241AD4 0C00A67F */  jal       rand_int
-/* CC52E8 80241AD8 AE420070 */   sw       $v0, 0x70($s2)
-/* CC52EC 80241ADC 3C035555 */  lui       $v1, 0x5555
-/* CC52F0 80241AE0 34635556 */  ori       $v1, $v1, 0x5556
-/* CC52F4 80241AE4 00430018 */  mult      $v0, $v1
-/* CC52F8 80241AE8 000227C3 */  sra       $a0, $v0, 0x1f
-/* CC52FC 80241AEC 00004010 */  mfhi      $t0
-/* CC5300 80241AF0 01042023 */  subu      $a0, $t0, $a0
-/* CC5304 80241AF4 00041840 */  sll       $v1, $a0, 1
-/* CC5308 80241AF8 00641821 */  addu      $v1, $v1, $a0
-/* CC530C 80241AFC 00431023 */  subu      $v0, $v0, $v1
-/* CC5310 80241B00 24430002 */  addiu     $v1, $v0, 2
-/* CC5314 80241B04 AE430074 */  sw        $v1, 0x74($s2)
-/* CC5318 80241B08 8EE2002C */  lw        $v0, 0x2c($s7)
-/* CC531C 80241B0C 58400006 */  blezl     $v0, .L80241B28
-/* CC5320 80241B10 AE400070 */   sw       $zero, 0x70($s2)
-/* CC5324 80241B14 8EE20004 */  lw        $v0, 4($s7)
-/* CC5328 80241B18 58400003 */  blezl     $v0, .L80241B28
-/* CC532C 80241B1C AE400070 */   sw       $zero, 0x70($s2)
-/* CC5330 80241B20 50600001 */  beql      $v1, $zero, .L80241B28
-/* CC5334 80241B24 AE400070 */   sw       $zero, 0x70($s2)
-.L80241B28:
-/* CC5338 80241B28 8FBF0064 */  lw        $ra, 0x64($sp)
-/* CC533C 80241B2C 8FBE0060 */  lw        $fp, 0x60($sp)
-/* CC5340 80241B30 8FB7005C */  lw        $s7, 0x5c($sp)
-/* CC5344 80241B34 8FB60058 */  lw        $s6, 0x58($sp)
-/* CC5348 80241B38 8FB50054 */  lw        $s5, 0x54($sp)
-/* CC534C 80241B3C 8FB40050 */  lw        $s4, 0x50($sp)
-/* CC5350 80241B40 8FB3004C */  lw        $s3, 0x4c($sp)
-/* CC5354 80241B44 8FB20048 */  lw        $s2, 0x48($sp)
-/* CC5358 80241B48 8FB10044 */  lw        $s1, 0x44($sp)
-/* CC535C 80241B4C 8FB00040 */  lw        $s0, 0x40($sp)
-/* CC5360 80241B50 D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* CC5364 80241B54 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* CC5368 80241B58 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* CC536C 80241B5C D7B40068 */  ldc1      $f20, 0x68($sp)
-/* CC5370 80241B60 03E00008 */  jr        $ra
-/* CC5374 80241B64 27BD0088 */   addiu    $sp, $sp, 0x88
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241B68_CC5378.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241B68_CC5378.s
deleted file mode 100644
index 54b2ec662d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241B68_CC5378.s
+++ /dev/null
@@ -1,156 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B68_CC5378
-/* CC5378 80241B68 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* CC537C 80241B6C AFB20048 */  sw        $s2, 0x48($sp)
-/* CC5380 80241B70 0080902D */  daddu     $s2, $a0, $zero
-/* CC5384 80241B74 AFBF0054 */  sw        $ra, 0x54($sp)
-/* CC5388 80241B78 AFB40050 */  sw        $s4, 0x50($sp)
-/* CC538C 80241B7C AFB3004C */  sw        $s3, 0x4c($sp)
-/* CC5390 80241B80 AFB10044 */  sw        $s1, 0x44($sp)
-/* CC5394 80241B84 AFB00040 */  sw        $s0, 0x40($sp)
-/* CC5398 80241B88 F7B60060 */  sdc1      $f22, 0x60($sp)
-/* CC539C 80241B8C F7B40058 */  sdc1      $f20, 0x58($sp)
-/* CC53A0 80241B90 8E510148 */  lw        $s1, 0x148($s2)
-/* CC53A4 80241B94 00A0982D */  daddu     $s3, $a1, $zero
-/* CC53A8 80241B98 86240008 */  lh        $a0, 8($s1)
-/* CC53AC 80241B9C 0C00EABB */  jal       get_npc_unsafe
-/* CC53B0 80241BA0 00C0A02D */   daddu    $s4, $a2, $zero
-/* CC53B4 80241BA4 0040802D */  daddu     $s0, $v0, $zero
-/* CC53B8 80241BA8 C6200078 */  lwc1      $f0, 0x78($s1)
-/* CC53BC 80241BAC 46800020 */  cvt.s.w   $f0, $f0
-/* CC53C0 80241BB0 46000021 */  cvt.d.s   $f0, $f0
-/* CC53C4 80241BB4 3C014059 */  lui       $at, 0x4059
-/* CC53C8 80241BB8 44814800 */  mtc1      $at, $f9
-/* CC53CC 80241BBC 44804000 */  mtc1      $zero, $f8
-/* CC53D0 80241BC0 8602008E */  lh        $v0, 0x8e($s0)
-/* CC53D4 80241BC4 9603008E */  lhu       $v1, 0x8e($s0)
-/* CC53D8 80241BC8 46280003 */  div.d     $f0, $f0, $f8
-/* CC53DC 80241BCC 18400003 */  blez      $v0, .L80241BDC
-/* CC53E0 80241BD0 462005A0 */   cvt.s.d  $f22, $f0
-/* CC53E4 80241BD4 2462FFFF */  addiu     $v0, $v1, -1
-/* CC53E8 80241BD8 A602008E */  sh        $v0, 0x8e($s0)
-.L80241BDC:
-/* CC53EC 80241BDC 27A50028 */  addiu     $a1, $sp, 0x28
-/* CC53F0 80241BE0 27A6002C */  addiu     $a2, $sp, 0x2c
-/* CC53F4 80241BE4 27A70030 */  addiu     $a3, $sp, 0x30
-/* CC53F8 80241BE8 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CC53FC 80241BEC C602003C */  lwc1      $f2, 0x3c($s0)
-/* CC5400 80241BF0 C6040040 */  lwc1      $f4, 0x40($s0)
-/* CC5404 80241BF4 3C01447A */  lui       $at, 0x447a
-/* CC5408 80241BF8 44813000 */  mtc1      $at, $f6
-/* CC540C 80241BFC 27A20034 */  addiu     $v0, $sp, 0x34
-/* CC5410 80241C00 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CC5414 80241C04 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* CC5418 80241C08 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CC541C 80241C0C E7A60034 */  swc1      $f6, 0x34($sp)
-/* CC5420 80241C10 C6340070 */  lwc1      $f20, 0x70($s1)
-/* CC5424 80241C14 4680A520 */  cvt.s.w   $f20, $f20
-/* CC5428 80241C18 4600A521 */  cvt.d.s   $f20, $f20
-/* CC542C 80241C1C 4628A503 */  div.d     $f20, $f20, $f8
-/* CC5430 80241C20 AFA20010 */  sw        $v0, 0x10($sp)
-/* CC5434 80241C24 8E040080 */  lw        $a0, 0x80($s0)
-/* CC5438 80241C28 0C0372DF */  jal       func_800DCB7C
-/* CC543C 80241C2C 4620A520 */   cvt.s.d  $f20, $f20
-/* CC5440 80241C30 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* CC5444 80241C34 0C00A8BB */  jal       sin_deg
-/* CC5448 80241C38 46806320 */   cvt.s.w  $f12, $f12
-/* CC544C 80241C3C 46140002 */  mul.s     $f0, $f0, $f20
-/* CC5450 80241C40 00000000 */  nop
-/* CC5454 80241C44 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* CC5458 80241C48 46161080 */  add.s     $f2, $f2, $f22
-/* CC545C 80241C4C 46001080 */  add.s     $f2, $f2, $f0
-/* CC5460 80241C50 E602003C */  swc1      $f2, 0x3c($s0)
-/* CC5464 80241C54 8E220074 */  lw        $v0, 0x74($s1)
-/* CC5468 80241C58 2442000C */  addiu     $v0, $v0, 0xc
-/* CC546C 80241C5C 44826000 */  mtc1      $v0, $f12
-/* CC5470 80241C60 00000000 */  nop
-/* CC5474 80241C64 0C00A6C9 */  jal       clamp_angle
-/* CC5478 80241C68 46806320 */   cvt.s.w  $f12, $f12
-/* CC547C 80241C6C 4600028D */  trunc.w.s $f10, $f0
-/* CC5480 80241C70 E62A0074 */  swc1      $f10, 0x74($s1)
-/* CC5484 80241C74 0280202D */  daddu     $a0, $s4, $zero
-/* CC5488 80241C78 24020001 */  addiu     $v0, $zero, 1
-/* CC548C 80241C7C AFA20010 */  sw        $v0, 0x10($sp)
-/* CC5490 80241C80 8E660024 */  lw        $a2, 0x24($s3)
-/* CC5494 80241C84 8E670028 */  lw        $a3, 0x28($s3)
-/* CC5498 80241C88 0C01242D */  jal       func_800490B4
-/* CC549C 80241C8C 0220282D */   daddu    $a1, $s1, $zero
-/* CC54A0 80241C90 1040001D */  beqz      $v0, .L80241D08
-/* CC54A4 80241C94 0000202D */   daddu    $a0, $zero, $zero
-/* CC54A8 80241C98 0200282D */  daddu     $a1, $s0, $zero
-/* CC54AC 80241C9C 0000302D */  daddu     $a2, $zero, $zero
-/* CC54B0 80241CA0 860300A8 */  lh        $v1, 0xa8($s0)
-/* CC54B4 80241CA4 3C013F80 */  lui       $at, 0x3f80
-/* CC54B8 80241CA8 44810000 */  mtc1      $at, $f0
-/* CC54BC 80241CAC 3C014000 */  lui       $at, 0x4000
-/* CC54C0 80241CB0 44811000 */  mtc1      $at, $f2
-/* CC54C4 80241CB4 3C01C1A0 */  lui       $at, 0xc1a0
-/* CC54C8 80241CB8 44812000 */  mtc1      $at, $f4
-/* CC54CC 80241CBC 2402000F */  addiu     $v0, $zero, 0xf
-/* CC54D0 80241CC0 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CC54D4 80241CC4 44835000 */  mtc1      $v1, $f10
-/* CC54D8 80241CC8 00000000 */  nop
-/* CC54DC 80241CCC 468052A0 */  cvt.s.w   $f10, $f10
-/* CC54E0 80241CD0 44075000 */  mfc1      $a3, $f10
-/* CC54E4 80241CD4 27A20038 */  addiu     $v0, $sp, 0x38
-/* CC54E8 80241CD8 AFA20020 */  sw        $v0, 0x20($sp)
-/* CC54EC 80241CDC E7A00010 */  swc1      $f0, 0x10($sp)
-/* CC54F0 80241CE0 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CC54F4 80241CE4 0C01BFA4 */  jal       fx_emote
-/* CC54F8 80241CE8 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CC54FC 80241CEC 0200202D */  daddu     $a0, $s0, $zero
-/* CC5500 80241CF0 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* CC5504 80241CF4 0C012530 */  jal       func_800494C0
-/* CC5508 80241CF8 3C060020 */   lui      $a2, 0x20
-/* CC550C 80241CFC 2402000C */  addiu     $v0, $zero, 0xc
-/* CC5510 80241D00 08090764 */  j         .L80241D90
-/* CC5514 80241D04 AE420070 */   sw       $v0, 0x70($s2)
-.L80241D08:
-/* CC5518 80241D08 8602008C */  lh        $v0, 0x8c($s0)
-/* CC551C 80241D0C 14400020 */  bnez      $v0, .L80241D90
-/* CC5520 80241D10 00000000 */   nop
-/* CC5524 80241D14 8602008E */  lh        $v0, 0x8e($s0)
-/* CC5528 80241D18 1C40001D */  bgtz      $v0, .L80241D90
-/* CC552C 80241D1C 00000000 */   nop
-/* CC5530 80241D20 8E420074 */  lw        $v0, 0x74($s2)
-/* CC5534 80241D24 2442FFFF */  addiu     $v0, $v0, -1
-/* CC5538 80241D28 18400018 */  blez      $v0, .L80241D8C
-/* CC553C 80241D2C AE420074 */   sw       $v0, 0x74($s2)
-/* CC5540 80241D30 C600000C */  lwc1      $f0, 0xc($s0)
-/* CC5544 80241D34 3C014334 */  lui       $at, 0x4334
-/* CC5548 80241D38 44816000 */  mtc1      $at, $f12
-/* CC554C 80241D3C 0C00A6C9 */  jal       clamp_angle
-/* CC5550 80241D40 460C0300 */   add.s    $f12, $f0, $f12
-/* CC5554 80241D44 240403E8 */  addiu     $a0, $zero, 0x3e8
-/* CC5558 80241D48 0C00A67F */  jal       rand_int
-/* CC555C 80241D4C E600000C */   swc1     $f0, 0xc($s0)
-/* CC5560 80241D50 3C032E8B */  lui       $v1, 0x2e8b
-/* CC5564 80241D54 3463A2E9 */  ori       $v1, $v1, 0xa2e9
-/* CC5568 80241D58 00430018 */  mult      $v0, $v1
-/* CC556C 80241D5C 00021FC3 */  sra       $v1, $v0, 0x1f
-/* CC5570 80241D60 00004010 */  mfhi      $t0
-/* CC5574 80241D64 00082043 */  sra       $a0, $t0, 1
-/* CC5578 80241D68 00832023 */  subu      $a0, $a0, $v1
-/* CC557C 80241D6C 00041840 */  sll       $v1, $a0, 1
-/* CC5580 80241D70 00641821 */  addu      $v1, $v1, $a0
-/* CC5584 80241D74 00031880 */  sll       $v1, $v1, 2
-/* CC5588 80241D78 00641823 */  subu      $v1, $v1, $a0
-/* CC558C 80241D7C 00431023 */  subu      $v0, $v0, $v1
-/* CC5590 80241D80 24420005 */  addiu     $v0, $v0, 5
-/* CC5594 80241D84 08090764 */  j         .L80241D90
-/* CC5598 80241D88 A602008E */   sh       $v0, 0x8e($s0)
-.L80241D8C:
-/* CC559C 80241D8C AE400070 */  sw        $zero, 0x70($s2)
-.L80241D90:
-/* CC55A0 80241D90 8FBF0054 */  lw        $ra, 0x54($sp)
-/* CC55A4 80241D94 8FB40050 */  lw        $s4, 0x50($sp)
-/* CC55A8 80241D98 8FB3004C */  lw        $s3, 0x4c($sp)
-/* CC55AC 80241D9C 8FB20048 */  lw        $s2, 0x48($sp)
-/* CC55B0 80241DA0 8FB10044 */  lw        $s1, 0x44($sp)
-/* CC55B4 80241DA4 8FB00040 */  lw        $s0, 0x40($sp)
-/* CC55B8 80241DA8 D7B60060 */  ldc1      $f22, 0x60($sp)
-/* CC55BC 80241DAC D7B40058 */  ldc1      $f20, 0x58($sp)
-/* CC55C0 80241DB0 03E00008 */  jr        $ra
-/* CC55C4 80241DB4 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s
deleted file mode 100644
index 7489c1b4b5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s
+++ /dev/null
@@ -1,86 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242314_CC5B24
-/* CC5B24 80242314 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CC5B28 80242318 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CC5B2C 8024231C 0080982D */  daddu     $s3, $a0, $zero
-/* CC5B30 80242320 AFBF0020 */  sw        $ra, 0x20($sp)
-/* CC5B34 80242324 AFB20018 */  sw        $s2, 0x18($sp)
-/* CC5B38 80242328 AFB10014 */  sw        $s1, 0x14($sp)
-/* CC5B3C 8024232C AFB00010 */  sw        $s0, 0x10($sp)
-/* CC5B40 80242330 8E710148 */  lw        $s1, 0x148($s3)
-/* CC5B44 80242334 86240008 */  lh        $a0, 8($s1)
-/* CC5B48 80242338 0C00EABB */  jal       get_npc_unsafe
-/* CC5B4C 8024233C 00A0902D */   daddu    $s2, $a1, $zero
-/* CC5B50 80242340 0040802D */  daddu     $s0, $v0, $zero
-/* CC5B54 80242344 8602008E */  lh        $v0, 0x8e($s0)
-/* CC5B58 80242348 9603008E */  lhu       $v1, 0x8e($s0)
-/* CC5B5C 8024234C 18400005 */  blez      $v0, .L80242364
-/* CC5B60 80242350 2462FFFF */   addiu    $v0, $v1, -1
-/* CC5B64 80242354 A602008E */  sh        $v0, 0x8e($s0)
-/* CC5B68 80242358 00021400 */  sll       $v0, $v0, 0x10
-/* CC5B6C 8024235C 1C400033 */  bgtz      $v0, .L8024242C
-/* CC5B70 80242360 00000000 */   nop
-.L80242364:
-/* CC5B74 80242364 8602008C */  lh        $v0, 0x8c($s0)
-/* CC5B78 80242368 14400030 */  bnez      $v0, .L8024242C
-/* CC5B7C 8024236C 00000000 */   nop
-/* CC5B80 80242370 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CC5B84 80242374 8C420024 */  lw        $v0, 0x24($v0)
-/* CC5B88 80242378 AE020028 */  sw        $v0, 0x28($s0)
-/* CC5B8C 8024237C C6400018 */  lwc1      $f0, 0x18($s2)
-/* CC5B90 80242380 E6000018 */  swc1      $f0, 0x18($s0)
-/* CC5B94 80242384 8E230088 */  lw        $v1, 0x88($s1)
-/* CC5B98 80242388 24020005 */  addiu     $v0, $zero, 5
-/* CC5B9C 8024238C 10620005 */  beq       $v1, $v0, .L802423A4
-/* CC5BA0 80242390 00000000 */   nop
-/* CC5BA4 80242394 10600003 */  beqz      $v1, .L802423A4
-/* CC5BA8 80242398 24020001 */   addiu    $v0, $zero, 1
-/* CC5BAC 8024239C 14620006 */  bne       $v1, $v0, .L802423B8
-/* CC5BB0 802423A0 00000000 */   nop
-.L802423A4:
-/* CC5BB4 802423A4 8E220084 */  lw        $v0, 0x84($s1)
-/* CC5BB8 802423A8 00021FC2 */  srl       $v1, $v0, 0x1f
-/* CC5BBC 802423AC 00431021 */  addu      $v0, $v0, $v1
-/* CC5BC0 802423B0 00021043 */  sra       $v0, $v0, 1
-/* CC5BC4 802423B4 A60200A8 */  sh        $v0, 0xa8($s0)
-.L802423B8:
-/* CC5BC8 802423B8 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CC5BCC 802423BC 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CC5BD0 802423C0 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CC5BD4 802423C4 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CC5BD8 802423C8 8C460028 */  lw        $a2, 0x28($v0)
-/* CC5BDC 802423CC 0C00A7B5 */  jal       dist2D
-/* CC5BE0 802423D0 8C470030 */   lw       $a3, 0x30($v0)
-/* CC5BE4 802423D4 C6020018 */  lwc1      $f2, 0x18($s0)
-/* CC5BE8 802423D8 46020003 */  div.s     $f0, $f0, $f2
-/* CC5BEC 802423DC 3C018024 */  lui       $at, %hi(D_80247A88_CCB298)
-/* CC5BF0 802423E0 D4227A88 */  ldc1      $f2, %lo(D_80247A88_CCB298)($at)
-/* CC5BF4 802423E4 46000021 */  cvt.d.s   $f0, $f0
-/* CC5BF8 802423E8 46220000 */  add.d     $f0, $f0, $f2
-/* CC5BFC 802423EC 4620010D */  trunc.w.d $f4, $f0
-/* CC5C00 802423F0 44022000 */  mfc1      $v0, $f4
-/* CC5C04 802423F4 00000000 */  nop
-/* CC5C08 802423F8 A602008E */  sh        $v0, 0x8e($s0)
-/* CC5C0C 802423FC 00021400 */  sll       $v0, $v0, 0x10
-/* CC5C10 80242400 8E230078 */  lw        $v1, 0x78($s1)
-/* CC5C14 80242404 00021403 */  sra       $v0, $v0, 0x10
-/* CC5C18 80242408 0043102A */  slt       $v0, $v0, $v1
-/* CC5C1C 8024240C 10400003 */  beqz      $v0, .L8024241C
-/* CC5C20 80242410 00000000 */   nop
-/* CC5C24 80242414 9622007A */  lhu       $v0, 0x7a($s1)
-/* CC5C28 80242418 A602008E */  sh        $v0, 0x8e($s0)
-.L8024241C:
-/* CC5C2C 8024241C 8602008E */  lh        $v0, 0x8e($s0)
-/* CC5C30 80242420 AE22007C */  sw        $v0, 0x7c($s1)
-/* CC5C34 80242424 2402000E */  addiu     $v0, $zero, 0xe
-/* CC5C38 80242428 AE620070 */  sw        $v0, 0x70($s3)
-.L8024242C:
-/* CC5C3C 8024242C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CC5C40 80242430 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CC5C44 80242434 8FB20018 */  lw        $s2, 0x18($sp)
-/* CC5C48 80242438 8FB10014 */  lw        $s1, 0x14($sp)
-/* CC5C4C 8024243C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CC5C50 80242440 03E00008 */  jr        $ra
-/* CC5C54 80242444 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s
deleted file mode 100644
index 2fbb94e699..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s
+++ /dev/null
@@ -1,302 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024262C_CC5E3C
-/* CC5E3C 8024262C 27BDFF90 */  addiu     $sp, $sp, -0x70
-/* CC5E40 80242630 AFB3005C */  sw        $s3, 0x5c($sp)
-/* CC5E44 80242634 0080982D */  daddu     $s3, $a0, $zero
-/* CC5E48 80242638 AFBF0068 */  sw        $ra, 0x68($sp)
-/* CC5E4C 8024263C AFB50064 */  sw        $s5, 0x64($sp)
-/* CC5E50 80242640 AFB40060 */  sw        $s4, 0x60($sp)
-/* CC5E54 80242644 AFB20058 */  sw        $s2, 0x58($sp)
-/* CC5E58 80242648 AFB10054 */  sw        $s1, 0x54($sp)
-/* CC5E5C 8024264C AFB00050 */  sw        $s0, 0x50($sp)
-/* CC5E60 80242650 8E710148 */  lw        $s1, 0x148($s3)
-/* CC5E64 80242654 86240008 */  lh        $a0, 8($s1)
-/* CC5E68 80242658 0C00EABB */  jal       get_npc_unsafe
-/* CC5E6C 8024265C 00A0802D */   daddu    $s0, $a1, $zero
-/* CC5E70 80242660 8E63000C */  lw        $v1, 0xc($s3)
-/* CC5E74 80242664 0260202D */  daddu     $a0, $s3, $zero
-/* CC5E78 80242668 8C650000 */  lw        $a1, ($v1)
-/* CC5E7C 8024266C 0C0B1EAF */  jal       get_variable
-/* CC5E80 80242670 0040902D */   daddu    $s2, $v0, $zero
-/* CC5E84 80242674 AFA00028 */  sw        $zero, 0x28($sp)
-/* CC5E88 80242678 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CC5E8C 8024267C 8C630030 */  lw        $v1, 0x30($v1)
-/* CC5E90 80242680 AFA3002C */  sw        $v1, 0x2c($sp)
-/* CC5E94 80242684 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CC5E98 80242688 8C63001C */  lw        $v1, 0x1c($v1)
-/* CC5E9C 8024268C AFA30030 */  sw        $v1, 0x30($sp)
-/* CC5EA0 80242690 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CC5EA4 80242694 8C630024 */  lw        $v1, 0x24($v1)
-/* CC5EA8 80242698 AFA30034 */  sw        $v1, 0x34($sp)
-/* CC5EAC 8024269C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CC5EB0 802426A0 8C630028 */  lw        $v1, 0x28($v1)
-/* CC5EB4 802426A4 27B50028 */  addiu     $s5, $sp, 0x28
-/* CC5EB8 802426A8 AFA30038 */  sw        $v1, 0x38($sp)
-/* CC5EBC 802426AC 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CC5EC0 802426B0 3C0142C8 */  lui       $at, 0x42c8
-/* CC5EC4 802426B4 44810000 */  mtc1      $at, $f0
-/* CC5EC8 802426B8 8C63002C */  lw        $v1, 0x2c($v1)
-/* CC5ECC 802426BC 0040A02D */  daddu     $s4, $v0, $zero
-/* CC5ED0 802426C0 E7A00040 */  swc1      $f0, 0x40($sp)
-/* CC5ED4 802426C4 A7A00044 */  sh        $zero, 0x44($sp)
-/* CC5ED8 802426C8 12000009 */  beqz      $s0, .L802426F0
-/* CC5EDC 802426CC AFA3003C */   sw       $v1, 0x3c($sp)
-/* CC5EE0 802426D0 864300A8 */  lh        $v1, 0xa8($s2)
-/* CC5EE4 802426D4 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CC5EE8 802426D8 AE20008C */  sw        $zero, 0x8c($s1)
-/* CC5EEC 802426DC A22000B5 */  sb        $zero, 0xb5($s1)
-/* CC5EF0 802426E0 34420008 */  ori       $v0, $v0, 8
-/* CC5EF4 802426E4 AE230084 */  sw        $v1, 0x84($s1)
-/* CC5EF8 802426E8 080909C0 */  j         .L80242700
-/* CC5EFC 802426EC AE2200B0 */   sw       $v0, 0xb0($s1)
-.L802426F0:
-/* CC5F00 802426F0 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CC5F04 802426F4 30420004 */  andi      $v0, $v0, 4
-/* CC5F08 802426F8 10400047 */  beqz      $v0, .L80242818
-/* CC5F0C 802426FC 00000000 */   nop
-.L80242700:
-/* CC5F10 80242700 AE600070 */  sw        $zero, 0x70($s3)
-/* CC5F14 80242704 A640008E */  sh        $zero, 0x8e($s2)
-/* CC5F18 80242708 8E2300CC */  lw        $v1, 0xcc($s1)
-/* CC5F1C 8024270C 2404F7FF */  addiu     $a0, $zero, -0x801
-/* CC5F20 80242710 A2200007 */  sb        $zero, 7($s1)
-/* CC5F24 80242714 8E420000 */  lw        $v0, ($s2)
-/* CC5F28 80242718 8C630000 */  lw        $v1, ($v1)
-/* CC5F2C 8024271C 00441024 */  and       $v0, $v0, $a0
-/* CC5F30 80242720 AE420000 */  sw        $v0, ($s2)
-/* CC5F34 80242724 AE430028 */  sw        $v1, 0x28($s2)
-/* CC5F38 80242728 96220086 */  lhu       $v0, 0x86($s1)
-/* CC5F3C 8024272C A64200A8 */  sh        $v0, 0xa8($s2)
-/* CC5F40 80242730 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CC5F44 80242734 AE200090 */  sw        $zero, 0x90($s1)
-/* CC5F48 80242738 8C420034 */  lw        $v0, 0x34($v0)
-/* CC5F4C 8024273C 14400006 */  bnez      $v0, .L80242758
-/* CC5F50 80242740 2403FDFF */   addiu    $v1, $zero, -0x201
-/* CC5F54 80242744 8E420000 */  lw        $v0, ($s2)
-/* CC5F58 80242748 2403FFF7 */  addiu     $v1, $zero, -9
-/* CC5F5C 8024274C 34420200 */  ori       $v0, $v0, 0x200
-/* CC5F60 80242750 080909D9 */  j         .L80242764
-/* CC5F64 80242754 00431024 */   and      $v0, $v0, $v1
-.L80242758:
-/* CC5F68 80242758 8E420000 */  lw        $v0, ($s2)
-/* CC5F6C 8024275C 00431024 */  and       $v0, $v0, $v1
-/* CC5F70 80242760 34420008 */  ori       $v0, $v0, 8
-.L80242764:
-/* CC5F74 80242764 AE420000 */  sw        $v0, ($s2)
-/* CC5F78 80242768 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CC5F7C 8024276C 30420004 */  andi      $v0, $v0, 4
-/* CC5F80 80242770 1040001E */  beqz      $v0, .L802427EC
-/* CC5F84 80242774 24040002 */   addiu    $a0, $zero, 2
-/* CC5F88 80242778 0240282D */  daddu     $a1, $s2, $zero
-/* CC5F8C 8024277C 0000302D */  daddu     $a2, $zero, $zero
-/* CC5F90 80242780 24020063 */  addiu     $v0, $zero, 0x63
-/* CC5F94 80242784 AE620070 */  sw        $v0, 0x70($s3)
-/* CC5F98 80242788 AE600074 */  sw        $zero, 0x74($s3)
-/* CC5F9C 8024278C 864300A8 */  lh        $v1, 0xa8($s2)
-/* CC5FA0 80242790 3C013F80 */  lui       $at, 0x3f80
-/* CC5FA4 80242794 44810000 */  mtc1      $at, $f0
-/* CC5FA8 80242798 3C014000 */  lui       $at, 0x4000
-/* CC5FAC 8024279C 44811000 */  mtc1      $at, $f2
-/* CC5FB0 802427A0 3C01C1A0 */  lui       $at, 0xc1a0
-/* CC5FB4 802427A4 44812000 */  mtc1      $at, $f4
-/* CC5FB8 802427A8 24020028 */  addiu     $v0, $zero, 0x28
-/* CC5FBC 802427AC AFA2001C */  sw        $v0, 0x1c($sp)
-/* CC5FC0 802427B0 44833000 */  mtc1      $v1, $f6
-/* CC5FC4 802427B4 00000000 */  nop
-/* CC5FC8 802427B8 468031A0 */  cvt.s.w   $f6, $f6
-/* CC5FCC 802427BC 44073000 */  mfc1      $a3, $f6
-/* CC5FD0 802427C0 27A20048 */  addiu     $v0, $sp, 0x48
-/* CC5FD4 802427C4 AFA20020 */  sw        $v0, 0x20($sp)
-/* CC5FD8 802427C8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CC5FDC 802427CC E7A20014 */  swc1      $f2, 0x14($sp)
-/* CC5FE0 802427D0 0C01BFA4 */  jal       fx_emote
-/* CC5FE4 802427D4 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CC5FE8 802427D8 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CC5FEC 802427DC 2403FFFB */  addiu     $v1, $zero, -5
-/* CC5FF0 802427E0 00431024 */  and       $v0, $v0, $v1
-/* CC5FF4 802427E4 08090A06 */  j         .L80242818
-/* CC5FF8 802427E8 AE2200B0 */   sw       $v0, 0xb0($s1)
-.L802427EC:
-/* CC5FFC 802427EC 8E220000 */  lw        $v0, ($s1)
-/* CC6000 802427F0 3C034000 */  lui       $v1, 0x4000
-/* CC6004 802427F4 00431024 */  and       $v0, $v0, $v1
-/* CC6008 802427F8 10400007 */  beqz      $v0, .L80242818
-/* CC600C 802427FC 3C03BFFF */   lui      $v1, 0xbfff
-/* CC6010 80242800 2402000C */  addiu     $v0, $zero, 0xc
-/* CC6014 80242804 AE620070 */  sw        $v0, 0x70($s3)
-/* CC6018 80242808 8E220000 */  lw        $v0, ($s1)
-/* CC601C 8024280C 3463FFFF */  ori       $v1, $v1, 0xffff
-/* CC6020 80242810 00431024 */  and       $v0, $v0, $v1
-/* CC6024 80242814 AE220000 */  sw        $v0, ($s1)
-.L80242818:
-/* CC6028 80242818 8E220090 */  lw        $v0, 0x90($s1)
-/* CC602C 8024281C 1840000C */  blez      $v0, .L80242850
-/* CC6030 80242820 2442FFFF */   addiu    $v0, $v0, -1
-/* CC6034 80242824 14400087 */  bnez      $v0, L80242A44_CC6254
-/* CC6038 80242828 AE220090 */   sw       $v0, 0x90($s1)
-/* CC603C 8024282C 3C03FFAA */  lui       $v1, 0xffaa
-/* CC6040 80242830 8E420028 */  lw        $v0, 0x28($s2)
-/* CC6044 80242834 3463FFD2 */  ori       $v1, $v1, 0xffd2
-/* CC6048 80242838 00431021 */  addu      $v0, $v0, $v1
-/* CC604C 8024283C 2C420002 */  sltiu     $v0, $v0, 2
-/* CC6050 80242840 10400003 */  beqz      $v0, .L80242850
-/* CC6054 80242844 3C020055 */   lui      $v0, 0x55
-/* CC6058 80242848 3442000C */  ori       $v0, $v0, 0xc
-/* CC605C 8024284C AE420028 */  sw        $v0, 0x28($s2)
-.L80242850:
-/* CC6060 80242850 8E630070 */  lw        $v1, 0x70($s3)
-/* CC6064 80242854 2402000C */  addiu     $v0, $zero, 0xc
-/* CC6068 80242858 10620048 */  beq       $v1, $v0, .L8024297C
-/* CC606C 8024285C 2862000D */   slti     $v0, $v1, 0xd
-/* CC6070 80242860 1040000F */  beqz      $v0, .L802428A0
-/* CC6074 80242864 24100001 */   addiu    $s0, $zero, 1
-/* CC6078 80242868 1070001E */  beq       $v1, $s0, .L802428E4
-/* CC607C 8024286C 28620002 */   slti     $v0, $v1, 2
-/* CC6080 80242870 10400005 */  beqz      $v0, .L80242888
-/* CC6084 80242874 24020002 */   addiu    $v0, $zero, 2
-/* CC6088 80242878 10600015 */  beqz      $v1, .L802428D0
-/* CC608C 8024287C 0260202D */   daddu    $a0, $s3, $zero
-/* CC6090 80242880 08090A76 */  j         .L802429D8
-/* CC6094 80242884 00000000 */   nop
-.L80242888:
-/* CC6098 80242888 1062001C */  beq       $v1, $v0, .L802428FC
-/* CC609C 8024288C 24020003 */   addiu    $v0, $zero, 3
-/* CC60A0 80242890 10620035 */  beq       $v1, $v0, .L80242968
-/* CC60A4 80242894 0260202D */   daddu    $a0, $s3, $zero
-/* CC60A8 80242898 08090A76 */  j         .L802429D8
-/* CC60AC 8024289C 00000000 */   nop
-.L802428A0:
-/* CC60B0 802428A0 2402000E */  addiu     $v0, $zero, 0xe
-/* CC60B4 802428A4 1062003F */  beq       $v1, $v0, .L802429A4
-/* CC60B8 802428A8 0062102A */   slt      $v0, $v1, $v0
-/* CC60BC 802428AC 14400038 */  bnez      $v0, .L80242990
-/* CC60C0 802428B0 0260202D */   daddu    $a0, $s3, $zero
-/* CC60C4 802428B4 2402000F */  addiu     $v0, $zero, 0xf
-/* CC60C8 802428B8 10620040 */  beq       $v1, $v0, .L802429BC
-/* CC60CC 802428BC 24020063 */   addiu    $v0, $zero, 0x63
-/* CC60D0 802428C0 10620043 */  beq       $v1, $v0, .L802429D0
-/* CC60D4 802428C4 00000000 */   nop
-/* CC60D8 802428C8 08090A76 */  j         .L802429D8
-/* CC60DC 802428CC 00000000 */   nop
-.L802428D0:
-/* CC60E0 802428D0 0280282D */  daddu     $a1, $s4, $zero
-/* CC60E4 802428D4 0C012568 */  jal       func_800495A0
-/* CC60E8 802428D8 02A0302D */   daddu    $a2, $s5, $zero
-/* CC60EC 802428DC 96220086 */  lhu       $v0, 0x86($s1)
-/* CC60F0 802428E0 A64200A8 */  sh        $v0, 0xa8($s2)
-.L802428E4:
-/* CC60F4 802428E4 0260202D */  daddu     $a0, $s3, $zero
-/* CC60F8 802428E8 0280282D */  daddu     $a1, $s4, $zero
-/* CC60FC 802428EC 0C0125AE */  jal       func_800496B8
-/* CC6100 802428F0 02A0302D */   daddu    $a2, $s5, $zero
-/* CC6104 802428F4 08090A76 */  j         .L802429D8
-/* CC6108 802428F8 00000000 */   nop
-.L802428FC:
-/* CC610C 802428FC 0260202D */  daddu     $a0, $s3, $zero
-/* CC6110 80242900 0280282D */  daddu     $a1, $s4, $zero
-/* CC6114 80242904 0C0126D1 */  jal       base_UnkNpcAIFunc1
-/* CC6118 80242908 02A0302D */   daddu    $a2, $s5, $zero
-/* CC611C 8024290C 8E230088 */  lw        $v1, 0x88($s1)
-/* CC6120 80242910 24020006 */  addiu     $v0, $zero, 6
-/* CC6124 80242914 14620014 */  bne       $v1, $v0, .L80242968
-/* CC6128 80242918 0260202D */   daddu    $a0, $s3, $zero
-/* CC612C 8024291C 0C00A67F */  jal       rand_int
-/* CC6130 80242920 24040064 */   addiu    $a0, $zero, 0x64
-/* CC6134 80242924 28420021 */  slti      $v0, $v0, 0x21
-/* CC6138 80242928 5040000F */  beql      $v0, $zero, .L80242968
-/* CC613C 8024292C 0260202D */   daddu    $a0, $s3, $zero
-/* CC6140 80242930 8E22008C */  lw        $v0, 0x8c($s1)
-/* CC6144 80242934 10400005 */  beqz      $v0, .L8024294C
-/* CC6148 80242938 3C020055 */   lui      $v0, 0x55
-/* CC614C 8024293C 3442002F */  ori       $v0, $v0, 0x2f
-/* CC6150 80242940 AE20008C */  sw        $zero, 0x8c($s1)
-/* CC6154 80242944 08090A56 */  j         .L80242958
-/* CC6158 80242948 A22000B5 */   sb       $zero, 0xb5($s1)
-.L8024294C:
-/* CC615C 8024294C 3442002E */  ori       $v0, $v0, 0x2e
-/* CC6160 80242950 AE30008C */  sw        $s0, 0x8c($s1)
-/* CC6164 80242954 A23000B5 */  sb        $s0, 0xb5($s1)
-.L80242958:
-/* CC6168 80242958 AE420028 */  sw        $v0, 0x28($s2)
-/* CC616C 8024295C 24020007 */  addiu     $v0, $zero, 7
-/* CC6170 80242960 08090A91 */  j         L80242A44_CC6254
-/* CC6174 80242964 AE220090 */   sw       $v0, 0x90($s1)
-.L80242968:
-/* CC6178 80242968 0280282D */  daddu     $a1, $s4, $zero
-/* CC617C 8024296C 0C012701 */  jal       func_80049C04
-/* CC6180 80242970 02A0302D */   daddu    $a2, $s5, $zero
-/* CC6184 80242974 08090A76 */  j         .L802429D8
-/* CC6188 80242978 00000000 */   nop
-.L8024297C:
-/* CC618C 8024297C 0260202D */  daddu     $a0, $s3, $zero
-/* CC6190 80242980 0280282D */  daddu     $a1, $s4, $zero
-/* CC6194 80242984 0C0908A6 */  jal       flo_13_set_script_owner_npc_anim
-/* CC6198 80242988 02A0302D */   daddu    $a2, $s5, $zero
-/* CC619C 8024298C 0260202D */  daddu     $a0, $s3, $zero
-.L80242990:
-/* CC61A0 80242990 0280282D */  daddu     $a1, $s4, $zero
-/* CC61A4 80242994 0C0908C5 */  jal       func_80242314_CC5B24
-/* CC61A8 80242998 02A0302D */   daddu    $a2, $s5, $zero
-/* CC61AC 8024299C 08090A76 */  j         .L802429D8
-/* CC61B0 802429A0 00000000 */   nop
-.L802429A4:
-/* CC61B4 802429A4 0260202D */  daddu     $a0, $s3, $zero
-/* CC61B8 802429A8 0280282D */  daddu     $a1, $s4, $zero
-/* CC61BC 802429AC 0C090912 */  jal       flo_13_UnkNpcAIFunc12
-/* CC61C0 802429B0 02A0302D */   daddu    $a2, $s5, $zero
-/* CC61C4 802429B4 08090A76 */  j         .L802429D8
-/* CC61C8 802429B8 00000000 */   nop
-.L802429BC:
-/* CC61CC 802429BC 0280282D */  daddu     $a1, $s4, $zero
-/* CC61D0 802429C0 0C09096B */  jal       flo_13_set_script_owner_npc_col_height
-/* CC61D4 802429C4 02A0302D */   daddu    $a2, $s5, $zero
-/* CC61D8 802429C8 08090A76 */  j         .L802429D8
-/* CC61DC 802429CC 00000000 */   nop
-.L802429D0:
-/* CC61E0 802429D0 0C0129CF */  jal       func_8004A73C
-/* CC61E4 802429D4 0260202D */   daddu    $a0, $s3, $zero
-.L802429D8:
-/* CC61E8 802429D8 8E230088 */  lw        $v1, 0x88($s1)
-/* CC61EC 802429DC 24020006 */  addiu     $v0, $zero, 6
-/* CC61F0 802429E0 14620019 */  bne       $v1, $v0, .L80242A48
-/* CC61F4 802429E4 0000102D */   daddu    $v0, $zero, $zero
-/* CC61F8 802429E8 8E22008C */  lw        $v0, 0x8c($s1)
-/* CC61FC 802429EC 10400003 */  beqz      $v0, .L802429FC
-/* CC6200 802429F0 24020001 */   addiu    $v0, $zero, 1
-/* CC6204 802429F4 08090A80 */  j         .L80242A00
-/* CC6208 802429F8 A22200B5 */   sb       $v0, 0xb5($s1)
-.L802429FC:
-/* CC620C 802429FC A22000B5 */  sb        $zero, 0xb5($s1)
-.L80242A00:
-/* CC6210 80242A00 8E22008C */  lw        $v0, 0x8c($s1)
-/* CC6214 80242A04 1040000F */  beqz      $v0, L80242A44_CC6254
-/* CC6218 80242A08 3C03FFAA */   lui      $v1, 0xffaa
-/* CC621C 80242A0C 8E420028 */  lw        $v0, 0x28($s2)
-/* CC6220 80242A10 3463FFFC */  ori       $v1, $v1, 0xfffc
-/* CC6224 80242A14 00431821 */  addu      $v1, $v0, $v1
-/* CC6228 80242A18 2C620015 */  sltiu     $v0, $v1, 0x15
-/* CC622C 80242A1C 10400009 */  beqz      $v0, L80242A44_CC6254
-/* CC6230 80242A20 00031080 */   sll      $v0, $v1, 2
-/* CC6234 80242A24 3C018024 */  lui       $at, %hi(jtbl_80247A90_CCB2A0)
-/* CC6238 80242A28 00220821 */  addu      $at, $at, $v0
-/* CC623C 80242A2C 8C227A90 */  lw        $v0, %lo(jtbl_80247A90_CCB2A0)($at)
-/* CC6240 80242A30 00400008 */  jr        $v0
-/* CC6244 80242A34 00000000 */   nop
-glabel L80242A38_CC6248
-/* CC6248 80242A38 8E420028 */  lw        $v0, 0x28($s2)
-/* CC624C 80242A3C 24420001 */  addiu     $v0, $v0, 1
-/* CC6250 80242A40 AE420028 */  sw        $v0, 0x28($s2)
-glabel L80242A44_CC6254
-/* CC6254 80242A44 0000102D */  daddu     $v0, $zero, $zero
-.L80242A48:
-/* CC6258 80242A48 8FBF0068 */  lw        $ra, 0x68($sp)
-/* CC625C 80242A4C 8FB50064 */  lw        $s5, 0x64($sp)
-/* CC6260 80242A50 8FB40060 */  lw        $s4, 0x60($sp)
-/* CC6264 80242A54 8FB3005C */  lw        $s3, 0x5c($sp)
-/* CC6268 80242A58 8FB20058 */  lw        $s2, 0x58($sp)
-/* CC626C 80242A5C 8FB10054 */  lw        $s1, 0x54($sp)
-/* CC6270 80242A60 8FB00050 */  lw        $s0, 0x50($sp)
-/* CC6274 80242A64 03E00008 */  jr        $ra
-/* CC6278 80242A68 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s
deleted file mode 100644
index 5b7a256fdc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s
+++ /dev/null
@@ -1,616 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A6C_CC627C
-/* CC627C 80242A6C 27BDFF68 */  addiu     $sp, $sp, -0x98
-/* CC6280 80242A70 AFB5007C */  sw        $s5, 0x7c($sp)
-/* CC6284 80242A74 0080A82D */  daddu     $s5, $a0, $zero
-/* CC6288 80242A78 AFBF0080 */  sw        $ra, 0x80($sp)
-/* CC628C 80242A7C AFB40078 */  sw        $s4, 0x78($sp)
-/* CC6290 80242A80 AFB30074 */  sw        $s3, 0x74($sp)
-/* CC6294 80242A84 AFB20070 */  sw        $s2, 0x70($sp)
-/* CC6298 80242A88 AFB1006C */  sw        $s1, 0x6c($sp)
-/* CC629C 80242A8C AFB00068 */  sw        $s0, 0x68($sp)
-/* CC62A0 80242A90 F7B60090 */  sdc1      $f22, 0x90($sp)
-/* CC62A4 80242A94 F7B40088 */  sdc1      $f20, 0x88($sp)
-/* CC62A8 80242A98 8EB20148 */  lw        $s2, 0x148($s5)
-/* CC62AC 80242A9C 86440008 */  lh        $a0, 8($s2)
-/* CC62B0 80242AA0 0C00EABB */  jal       get_npc_unsafe
-/* CC62B4 80242AA4 00A0802D */   daddu    $s0, $a1, $zero
-/* CC62B8 80242AA8 8EA3000C */  lw        $v1, 0xc($s5)
-/* CC62BC 80242AAC 02A0202D */  daddu     $a0, $s5, $zero
-/* CC62C0 80242AB0 8C650000 */  lw        $a1, ($v1)
-/* CC62C4 80242AB4 0C0B1EAF */  jal       get_variable
-/* CC62C8 80242AB8 0040882D */   daddu    $s1, $v0, $zero
-/* CC62CC 80242ABC AFA00028 */  sw        $zero, 0x28($sp)
-/* CC62D0 80242AC0 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC62D4 80242AC4 8C630030 */  lw        $v1, 0x30($v1)
-/* CC62D8 80242AC8 AFA3002C */  sw        $v1, 0x2c($sp)
-/* CC62DC 80242ACC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC62E0 80242AD0 8C63001C */  lw        $v1, 0x1c($v1)
-/* CC62E4 80242AD4 AFA30030 */  sw        $v1, 0x30($sp)
-/* CC62E8 80242AD8 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC62EC 80242ADC 8C630024 */  lw        $v1, 0x24($v1)
-/* CC62F0 80242AE0 AFA30034 */  sw        $v1, 0x34($sp)
-/* CC62F4 80242AE4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC62F8 80242AE8 8C630028 */  lw        $v1, 0x28($v1)
-/* CC62FC 80242AEC 27B40028 */  addiu     $s4, $sp, 0x28
-/* CC6300 80242AF0 AFA30038 */  sw        $v1, 0x38($sp)
-/* CC6304 80242AF4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CC6308 80242AF8 3C014282 */  lui       $at, 0x4282
-/* CC630C 80242AFC 44810000 */  mtc1      $at, $f0
-/* CC6310 80242B00 8C63002C */  lw        $v1, 0x2c($v1)
-/* CC6314 80242B04 0040982D */  daddu     $s3, $v0, $zero
-/* CC6318 80242B08 E7A00040 */  swc1      $f0, 0x40($sp)
-/* CC631C 80242B0C A7A00044 */  sh        $zero, 0x44($sp)
-/* CC6320 80242B10 12000007 */  beqz      $s0, .L80242B30
-/* CC6324 80242B14 AFA3003C */   sw       $v1, 0x3c($sp)
-/* CC6328 80242B18 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* CC632C 80242B1C 862300A8 */  lh        $v1, 0xa8($s1)
-/* CC6330 80242B20 34420008 */  ori       $v0, $v0, 8
-/* CC6334 80242B24 AE430084 */  sw        $v1, 0x84($s2)
-/* CC6338 80242B28 08090AD0 */  j         .L80242B40
-/* CC633C 80242B2C AE4200B0 */   sw       $v0, 0xb0($s2)
-.L80242B30:
-/* CC6340 80242B30 8E430094 */  lw        $v1, 0x94($s2)
-/* CC6344 80242B34 24020064 */  addiu     $v0, $zero, 0x64
-/* CC6348 80242B38 1462001C */  bne       $v1, $v0, .L80242BAC
-/* CC634C 80242B3C 00000000 */   nop
-.L80242B40:
-/* CC6350 80242B40 24020064 */  addiu     $v0, $zero, 0x64
-/* CC6354 80242B44 2404F7FF */  addiu     $a0, $zero, -0x801
-/* CC6358 80242B48 AEA20070 */  sw        $v0, 0x70($s5)
-/* CC635C 80242B4C A620008E */  sh        $zero, 0x8e($s1)
-/* CC6360 80242B50 8E4300CC */  lw        $v1, 0xcc($s2)
-/* CC6364 80242B54 8E220000 */  lw        $v0, ($s1)
-/* CC6368 80242B58 3C01C47A */  lui       $at, 0xc47a
-/* CC636C 80242B5C 44810000 */  mtc1      $at, $f0
-/* CC6370 80242B60 8C630000 */  lw        $v1, ($v1)
-/* CC6374 80242B64 00441024 */  and       $v0, $v0, $a0
-/* CC6378 80242B68 AE220000 */  sw        $v0, ($s1)
-/* CC637C 80242B6C AE230028 */  sw        $v1, 0x28($s1)
-/* CC6380 80242B70 8E420000 */  lw        $v0, ($s2)
-/* CC6384 80242B74 3C030020 */  lui       $v1, 0x20
-/* CC6388 80242B78 00431025 */  or        $v0, $v0, $v1
-/* CC638C 80242B7C AE420000 */  sw        $v0, ($s2)
-/* CC6390 80242B80 8E220000 */  lw        $v0, ($s1)
-/* CC6394 80242B84 2403FDFF */  addiu     $v1, $zero, -0x201
-/* CC6398 80242B88 00431024 */  and       $v0, $v0, $v1
-/* CC639C 80242B8C 34420008 */  ori       $v0, $v0, 8
-/* CC63A0 80242B90 AE220000 */  sw        $v0, ($s1)
-/* CC63A4 80242B94 2402FFFF */  addiu     $v0, $zero, -1
-/* CC63A8 80242B98 AE400094 */  sw        $zero, 0x94($s2)
-/* CC63AC 80242B9C AE420098 */  sw        $v0, 0x98($s2)
-/* CC63B0 80242BA0 AE200038 */  sw        $zero, 0x38($s1)
-/* CC63B4 80242BA4 E620003C */  swc1      $f0, 0x3c($s1)
-/* CC63B8 80242BA8 AE200040 */  sw        $zero, 0x40($s1)
-.L80242BAC:
-/* CC63BC 80242BAC 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* CC63C0 80242BB0 30420004 */  andi      $v0, $v0, 4
-/* CC63C4 80242BB4 10400030 */  beqz      $v0, .L80242C78
-/* CC63C8 80242BB8 2403FFFB */   addiu    $v1, $zero, -5
-/* CC63CC 80242BBC A620008E */  sh        $zero, 0x8e($s1)
-/* CC63D0 80242BC0 96420086 */  lhu       $v0, 0x86($s2)
-/* CC63D4 80242BC4 A62200A8 */  sh        $v0, 0xa8($s1)
-/* CC63D8 80242BC8 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* CC63DC 80242BCC 00431024 */  and       $v0, $v0, $v1
-/* CC63E0 80242BD0 AE4200B0 */  sw        $v0, 0xb0($s2)
-/* CC63E4 80242BD4 8E220000 */  lw        $v0, ($s1)
-/* CC63E8 80242BD8 30420800 */  andi      $v0, $v0, 0x800
-/* CC63EC 80242BDC 1040000A */  beqz      $v0, .L80242C08
-/* CC63F0 80242BE0 3C02004A */   lui      $v0, 0x4a
-/* CC63F4 80242BE4 3C013F80 */  lui       $at, 0x3f80
-/* CC63F8 80242BE8 44810000 */  mtc1      $at, $f0
-/* CC63FC 80242BEC 34420018 */  ori       $v0, $v0, 0x18
-/* CC6400 80242BF0 AE220028 */  sw        $v0, 0x28($s1)
-/* CC6404 80242BF4 24020066 */  addiu     $v0, $zero, 0x66
-/* CC6408 80242BF8 AE200018 */  sw        $zero, 0x18($s1)
-/* CC640C 80242BFC AE20001C */  sw        $zero, 0x1c($s1)
-/* CC6410 80242C00 08090B1D */  j         .L80242C74
-/* CC6414 80242C04 E6200014 */   swc1     $f0, 0x14($s1)
-.L80242C08:
-/* CC6418 80242C08 24040002 */  addiu     $a0, $zero, 2
-/* CC641C 80242C0C 0220282D */  daddu     $a1, $s1, $zero
-/* CC6420 80242C10 0000302D */  daddu     $a2, $zero, $zero
-/* CC6424 80242C14 862300A8 */  lh        $v1, 0xa8($s1)
-/* CC6428 80242C18 3C013F80 */  lui       $at, 0x3f80
-/* CC642C 80242C1C 44810000 */  mtc1      $at, $f0
-/* CC6430 80242C20 3C014000 */  lui       $at, 0x4000
-/* CC6434 80242C24 44811000 */  mtc1      $at, $f2
-/* CC6438 80242C28 3C01C1A0 */  lui       $at, 0xc1a0
-/* CC643C 80242C2C 44812000 */  mtc1      $at, $f4
-/* CC6440 80242C30 24020028 */  addiu     $v0, $zero, 0x28
-/* CC6444 80242C34 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CC6448 80242C38 44834000 */  mtc1      $v1, $f8
-/* CC644C 80242C3C 00000000 */  nop
-/* CC6450 80242C40 46804220 */  cvt.s.w   $f8, $f8
-/* CC6454 80242C44 44074000 */  mfc1      $a3, $f8
-/* CC6458 80242C48 27A20048 */  addiu     $v0, $sp, 0x48
-/* CC645C 80242C4C AFA20020 */  sw        $v0, 0x20($sp)
-/* CC6460 80242C50 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CC6464 80242C54 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CC6468 80242C58 0C01BFA4 */  jal       fx_emote
-/* CC646C 80242C5C E7A40018 */   swc1     $f4, 0x18($sp)
-/* CC6470 80242C60 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CC6474 80242C64 8C420000 */  lw        $v0, ($v0)
-/* CC6478 80242C68 AE220028 */  sw        $v0, 0x28($s1)
-/* CC647C 80242C6C 240200C8 */  addiu     $v0, $zero, 0xc8
-/* CC6480 80242C70 AEA00074 */  sw        $zero, 0x74($s5)
-.L80242C74:
-/* CC6484 80242C74 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242C78:
-/* CC6488 80242C78 27A2004C */  addiu     $v0, $sp, 0x4c
-/* CC648C 80242C7C AFA20010 */  sw        $v0, 0x10($sp)
-/* CC6490 80242C80 27A20050 */  addiu     $v0, $sp, 0x50
-/* CC6494 80242C84 AFA20014 */  sw        $v0, 0x14($sp)
-/* CC6498 80242C88 27A20054 */  addiu     $v0, $sp, 0x54
-/* CC649C 80242C8C AFA20018 */  sw        $v0, 0x18($sp)
-/* CC64A0 80242C90 8E250038 */  lw        $a1, 0x38($s1)
-/* CC64A4 80242C94 8E26003C */  lw        $a2, 0x3c($s1)
-/* CC64A8 80242C98 8E270040 */  lw        $a3, 0x40($s1)
-/* CC64AC 80242C9C 0C00B94E */  jal       get_screen_coords
-/* CC64B0 80242CA0 0000202D */   daddu    $a0, $zero, $zero
-/* CC64B4 80242CA4 8EA20070 */  lw        $v0, 0x70($s5)
-/* CC64B8 80242CA8 28420064 */  slti      $v0, $v0, 0x64
-/* CC64BC 80242CAC 10400007 */  beqz      $v0, .L80242CCC
-/* CC64C0 80242CB0 00000000 */   nop
-/* CC64C4 80242CB4 8FA2004C */  lw        $v0, 0x4c($sp)
-/* CC64C8 80242CB8 24420032 */  addiu     $v0, $v0, 0x32
-/* CC64CC 80242CBC 2C4201A5 */  sltiu     $v0, $v0, 0x1a5
-/* CC64D0 80242CC0 14400002 */  bnez      $v0, .L80242CCC
-/* CC64D4 80242CC4 2402006E */   addiu    $v0, $zero, 0x6e
-/* CC64D8 80242CC8 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242CCC:
-/* CC64DC 80242CCC 8EA30070 */  lw        $v1, 0x70($s5)
-/* CC64E0 80242CD0 2402000F */  addiu     $v0, $zero, 0xf
-/* CC64E4 80242CD4 1062006B */  beq       $v1, $v0, .L80242E84
-/* CC64E8 80242CD8 28620010 */   slti     $v0, $v1, 0x10
-/* CC64EC 80242CDC 10400016 */  beqz      $v0, .L80242D38
-/* CC64F0 80242CE0 24020003 */   addiu    $v0, $zero, 3
-/* CC64F4 80242CE4 10620051 */  beq       $v1, $v0, .L80242E2C
-/* CC64F8 80242CE8 28620004 */   slti     $v0, $v1, 4
-/* CC64FC 80242CEC 10400009 */  beqz      $v0, .L80242D14
-/* CC6500 80242CF0 24020001 */   addiu    $v0, $zero, 1
-/* CC6504 80242CF4 10620044 */  beq       $v1, $v0, .L80242E08
-/* CC6508 80242CF8 28620002 */   slti     $v0, $v1, 2
-/* CC650C 80242CFC 50400048 */  beql      $v0, $zero, .L80242E20
-/* CC6510 80242D00 02A0202D */   daddu    $a0, $s5, $zero
-/* CC6514 80242D04 50600027 */  beql      $v1, $zero, .L80242DA4
-/* CC6518 80242D08 02A0202D */   daddu    $a0, $s5, $zero
-/* CC651C 80242D0C 08090CCE */  j         .L80243338
-/* CC6520 80242D10 00000000 */   nop
-.L80242D14:
-/* CC6524 80242D14 2402000D */  addiu     $v0, $zero, 0xd
-/* CC6528 80242D18 1062004D */  beq       $v1, $v0, .L80242E50
-/* CC652C 80242D1C 2862000E */   slti     $v0, $v1, 0xe
-/* CC6530 80242D20 10400052 */  beqz      $v0, .L80242E6C
-/* CC6534 80242D24 2402000C */   addiu    $v0, $zero, 0xc
-/* CC6538 80242D28 10620046 */  beq       $v1, $v0, .L80242E44
-/* CC653C 80242D2C 02A0202D */   daddu    $a0, $s5, $zero
-/* CC6540 80242D30 08090CCE */  j         .L80243338
-/* CC6544 80242D34 00000000 */   nop
-.L80242D38:
-/* CC6548 80242D38 24020067 */  addiu     $v0, $zero, 0x67
-/* CC654C 80242D3C 10620158 */  beq       $v1, $v0, .L802432A0
-/* CC6550 80242D40 28620068 */   slti     $v0, $v1, 0x68
-/* CC6554 80242D44 10400009 */  beqz      $v0, .L80242D6C
-/* CC6558 80242D48 24020065 */   addiu    $v0, $zero, 0x65
-/* CC655C 80242D4C 1062008F */  beq       $v1, $v0, .L80242F8C
-/* CC6560 80242D50 28620066 */   slti     $v0, $v1, 0x66
-/* CC6564 80242D54 104000A9 */  beqz      $v0, .L80242FFC
-/* CC6568 80242D58 24020064 */   addiu    $v0, $zero, 0x64
-/* CC656C 80242D5C 1062004F */  beq       $v1, $v0, .L80242E9C
-/* CC6570 80242D60 24020002 */   addiu    $v0, $zero, 2
-/* CC6574 80242D64 08090CCE */  j         .L80243338
-/* CC6578 80242D68 00000000 */   nop
-.L80242D6C:
-/* CC657C 80242D6C 2404006F */  addiu     $a0, $zero, 0x6f
-/* CC6580 80242D70 10640166 */  beq       $v1, $a0, .L8024330C
-/* CC6584 80242D74 28620070 */   slti     $v0, $v1, 0x70
-/* CC6588 80242D78 10400005 */  beqz      $v0, .L80242D90
-/* CC658C 80242D7C 2402006E */   addiu    $v0, $zero, 0x6e
-/* CC6590 80242D80 10620156 */  beq       $v1, $v0, .L802432DC
-/* CC6594 80242D84 2402001E */   addiu    $v0, $zero, 0x1e
-/* CC6598 80242D88 08090CCE */  j         .L80243338
-/* CC659C 80242D8C 00000000 */   nop
-.L80242D90:
-/* CC65A0 80242D90 240200C8 */  addiu     $v0, $zero, 0xc8
-/* CC65A4 80242D94 10620166 */  beq       $v1, $v0, .L80243330
-/* CC65A8 80242D98 00000000 */   nop
-/* CC65AC 80242D9C 08090CCE */  j         .L80243338
-/* CC65B0 80242DA0 00000000 */   nop
-.L80242DA4:
-/* CC65B4 80242DA4 0260282D */  daddu     $a1, $s3, $zero
-/* CC65B8 80242DA8 0C012568 */  jal       func_800495A0
-/* CC65BC 80242DAC 0280302D */   daddu    $a2, $s4, $zero
-/* CC65C0 80242DB0 96420086 */  lhu       $v0, 0x86($s2)
-/* CC65C4 80242DB4 A62200A8 */  sh        $v0, 0xa8($s1)
-/* CC65C8 80242DB8 8E4200A0 */  lw        $v0, 0xa0($s2)
-/* CC65CC 80242DBC 10400013 */  beqz      $v0, .L80242E0C
-/* CC65D0 80242DC0 02A0202D */   daddu    $a0, $s5, $zero
-/* CC65D4 80242DC4 C620003C */  lwc1      $f0, 0x3c($s1)
-/* CC65D8 80242DC8 44801000 */  mtc1      $zero, $f2
-/* CC65DC 80242DCC 44801800 */  mtc1      $zero, $f3
-/* CC65E0 80242DD0 46000021 */  cvt.d.s   $f0, $f0
-/* CC65E4 80242DD4 4622003E */  c.le.d    $f0, $f2
-/* CC65E8 80242DD8 00000000 */  nop
-/* CC65EC 80242DDC 45000005 */  bc1f      .L80242DF4
-/* CC65F0 80242DE0 2403FDFF */   addiu    $v1, $zero, -0x201
-/* CC65F4 80242DE4 8E220000 */  lw        $v0, ($s1)
-/* CC65F8 80242DE8 00431024 */  and       $v0, $v0, $v1
-/* CC65FC 80242DEC 08090B81 */  j         .L80242E04
-/* CC6600 80242DF0 34420008 */   ori      $v0, $v0, 8
-.L80242DF4:
-/* CC6604 80242DF4 8E220000 */  lw        $v0, ($s1)
-/* CC6608 80242DF8 2403FFF7 */  addiu     $v1, $zero, -9
-/* CC660C 80242DFC 34420200 */  ori       $v0, $v0, 0x200
-/* CC6610 80242E00 00431024 */  and       $v0, $v0, $v1
-.L80242E04:
-/* CC6614 80242E04 AE220000 */  sw        $v0, ($s1)
-.L80242E08:
-/* CC6618 80242E08 02A0202D */  daddu     $a0, $s5, $zero
-.L80242E0C:
-/* CC661C 80242E0C 0260282D */  daddu     $a1, $s3, $zero
-/* CC6620 80242E10 0C0125AE */  jal       func_800496B8
-/* CC6624 80242E14 0280302D */   daddu    $a2, $s4, $zero
-/* CC6628 80242E18 08090CCE */  j         .L80243338
-/* CC662C 80242E1C 00000000 */   nop
-.L80242E20:
-/* CC6630 80242E20 0260282D */  daddu     $a1, $s3, $zero
-/* CC6634 80242E24 0C0126D1 */  jal       base_UnkNpcAIFunc1
-/* CC6638 80242E28 0280302D */   daddu    $a2, $s4, $zero
-.L80242E2C:
-/* CC663C 80242E2C 02A0202D */  daddu     $a0, $s5, $zero
-/* CC6640 80242E30 0260282D */  daddu     $a1, $s3, $zero
-/* CC6644 80242E34 0C012701 */  jal       func_80049C04
-/* CC6648 80242E38 0280302D */   daddu    $a2, $s4, $zero
-/* CC664C 80242E3C 08090CCE */  j         .L80243338
-/* CC6650 80242E40 00000000 */   nop
-.L80242E44:
-/* CC6654 80242E44 0260282D */  daddu     $a1, $s3, $zero
-/* CC6658 80242E48 0C0908A6 */  jal       flo_13_set_script_owner_npc_anim
-/* CC665C 80242E4C 0280302D */   daddu    $a2, $s4, $zero
-.L80242E50:
-/* CC6660 80242E50 02A0202D */  daddu     $a0, $s5, $zero
-/* CC6664 80242E54 0260282D */  daddu     $a1, $s3, $zero
-/* CC6668 80242E58 0C0908C5 */  jal       func_80242314_CC5B24
-/* CC666C 80242E5C 0280302D */   daddu    $a2, $s4, $zero
-/* CC6670 80242E60 96420086 */  lhu       $v0, 0x86($s2)
-/* CC6674 80242E64 08090CCE */  j         .L80243338
-/* CC6678 80242E68 A62200A8 */   sh       $v0, 0xa8($s1)
-.L80242E6C:
-/* CC667C 80242E6C 02A0202D */  daddu     $a0, $s5, $zero
-/* CC6680 80242E70 0260282D */  daddu     $a1, $s3, $zero
-/* CC6684 80242E74 0C090912 */  jal       flo_13_UnkNpcAIFunc12
-/* CC6688 80242E78 0280302D */   daddu    $a2, $s4, $zero
-/* CC668C 80242E7C 08090CCE */  j         .L80243338
-/* CC6690 80242E80 00000000 */   nop
-.L80242E84:
-/* CC6694 80242E84 02A0202D */  daddu     $a0, $s5, $zero
-/* CC6698 80242E88 0260282D */  daddu     $a1, $s3, $zero
-/* CC669C 80242E8C 0C09096B */  jal       flo_13_set_script_owner_npc_col_height
-/* CC66A0 80242E90 0280302D */   daddu    $a2, $s4, $zero
-/* CC66A4 80242E94 08090CCE */  j         .L80243338
-/* CC66A8 80242E98 00000000 */   nop
-.L80242E9C:
-/* CC66AC 80242E9C 8E430094 */  lw        $v1, 0x94($s2)
-/* CC66B0 80242EA0 14620125 */  bne       $v1, $v0, .L80243338
-/* CC66B4 80242EA4 00000000 */   nop
-/* CC66B8 80242EA8 0C00FB3A */  jal       get_enemy
-/* CC66BC 80242EAC 8E440098 */   lw       $a0, 0x98($s2)
-/* CC66C0 80242EB0 0C00EABB */  jal       get_npc_unsafe
-/* CC66C4 80242EB4 84440008 */   lh       $a0, 8($v0)
-/* CC66C8 80242EB8 C440000C */  lwc1      $f0, 0xc($v0)
-/* CC66CC 80242EBC 3C018024 */  lui       $at, %hi(D_80247AE8_CCB2F8)
-/* CC66D0 80242EC0 D4227AE8 */  ldc1      $f2, %lo(D_80247AE8_CCB2F8)($at)
-/* CC66D4 80242EC4 46000021 */  cvt.d.s   $f0, $f0
-/* CC66D8 80242EC8 4622003C */  c.lt.d    $f0, $f2
-/* CC66DC 80242ECC 00000000 */  nop
-/* CC66E0 80242ED0 45000008 */  bc1f      .L80242EF4
-/* CC66E4 80242ED4 00000000 */   nop
-/* CC66E8 80242ED8 C4400038 */  lwc1      $f0, 0x38($v0)
-/* CC66EC 80242EDC 3C014028 */  lui       $at, 0x4028
-/* CC66F0 80242EE0 44811800 */  mtc1      $at, $f3
-/* CC66F4 80242EE4 44801000 */  mtc1      $zero, $f2
-/* CC66F8 80242EE8 46000021 */  cvt.d.s   $f0, $f0
-/* CC66FC 80242EEC 08090BC3 */  j         .L80242F0C
-/* CC6700 80242EF0 46220000 */   add.d    $f0, $f0, $f2
-.L80242EF4:
-/* CC6704 80242EF4 C4400038 */  lwc1      $f0, 0x38($v0)
-/* CC6708 80242EF8 3C014028 */  lui       $at, 0x4028
-/* CC670C 80242EFC 44811800 */  mtc1      $at, $f3
-/* CC6710 80242F00 44801000 */  mtc1      $zero, $f2
-/* CC6714 80242F04 46000021 */  cvt.d.s   $f0, $f0
-/* CC6718 80242F08 46220001 */  sub.d     $f0, $f0, $f2
-.L80242F0C:
-/* CC671C 80242F0C 46200020 */  cvt.s.d   $f0, $f0
-/* CC6720 80242F10 E6200038 */  swc1      $f0, 0x38($s1)
-/* CC6724 80242F14 3C04004A */  lui       $a0, 0x4a
-/* CC6728 80242F18 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CC672C 80242F1C 3C014039 */  lui       $at, 0x4039
-/* CC6730 80242F20 44811800 */  mtc1      $at, $f3
-/* CC6734 80242F24 44801000 */  mtc1      $zero, $f2
-/* CC6738 80242F28 46000021 */  cvt.d.s   $f0, $f0
-/* CC673C 80242F2C 46220000 */  add.d     $f0, $f0, $f2
-/* CC6740 80242F30 34840018 */  ori       $a0, $a0, 0x18
-/* CC6744 80242F34 3C013FF0 */  lui       $at, 0x3ff0
-/* CC6748 80242F38 44811800 */  mtc1      $at, $f3
-/* CC674C 80242F3C 44801000 */  mtc1      $zero, $f2
-/* CC6750 80242F40 46200020 */  cvt.s.d   $f0, $f0
-/* CC6754 80242F44 E620003C */  swc1      $f0, 0x3c($s1)
-/* CC6758 80242F48 C4400040 */  lwc1      $f0, 0x40($v0)
-/* CC675C 80242F4C 8E220000 */  lw        $v0, ($s1)
-/* CC6760 80242F50 2403FFFD */  addiu     $v1, $zero, -3
-/* CC6764 80242F54 AE200048 */  sw        $zero, 0x48($s1)
-/* CC6768 80242F58 AE200034 */  sw        $zero, 0x34($s1)
-/* CC676C 80242F5C AE240028 */  sw        $a0, 0x28($s1)
-/* CC6770 80242F60 34420008 */  ori       $v0, $v0, 8
-/* CC6774 80242F64 00431024 */  and       $v0, $v0, $v1
-/* CC6778 80242F68 2403FDFF */  addiu     $v1, $zero, -0x201
-/* CC677C 80242F6C 00431024 */  and       $v0, $v0, $v1
-/* CC6780 80242F70 46000021 */  cvt.d.s   $f0, $f0
-/* CC6784 80242F74 46220000 */  add.d     $f0, $f0, $f2
-/* CC6788 80242F78 AE220000 */  sw        $v0, ($s1)
-/* CC678C 80242F7C 24020065 */  addiu     $v0, $zero, 0x65
-/* CC6790 80242F80 46200020 */  cvt.s.d   $f0, $f0
-/* CC6794 80242F84 E6200040 */  swc1      $f0, 0x40($s1)
-/* CC6798 80242F88 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242F8C:
-/* CC679C 80242F8C 8E430094 */  lw        $v1, 0x94($s2)
-/* CC67A0 80242F90 24020003 */  addiu     $v0, $zero, 3
-/* CC67A4 80242F94 146200E8 */  bne       $v1, $v0, .L80243338
-/* CC67A8 80242F98 24020004 */   addiu    $v0, $zero, 4
-/* CC67AC 80242F9C AE420094 */  sw        $v0, 0x94($s2)
-/* CC67B0 80242FA0 C62C0038 */  lwc1      $f12, 0x38($s1)
-/* CC67B4 80242FA4 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CC67B8 80242FA8 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CC67BC 80242FAC C62E0040 */  lwc1      $f14, 0x40($s1)
-/* CC67C0 80242FB0 8C460028 */  lw        $a2, 0x28($v0)
-/* CC67C4 80242FB4 0C00A720 */  jal       atan2
-/* CC67C8 80242FB8 8C470030 */   lw       $a3, 0x30($v0)
-/* CC67CC 80242FBC 3C014020 */  lui       $at, 0x4020
-/* CC67D0 80242FC0 44811000 */  mtc1      $at, $f2
-/* CC67D4 80242FC4 3C014100 */  lui       $at, 0x4100
-/* CC67D8 80242FC8 44812000 */  mtc1      $at, $f4
-/* CC67DC 80242FCC 3C013F4C */  lui       $at, 0x3f4c
-/* CC67E0 80242FD0 3421CCCD */  ori       $at, $at, 0xcccd
-/* CC67E4 80242FD4 44813000 */  mtc1      $at, $f6
-/* CC67E8 80242FD8 8E220000 */  lw        $v0, ($s1)
-/* CC67EC 80242FDC E620000C */  swc1      $f0, 0xc($s1)
-/* CC67F0 80242FE0 34420800 */  ori       $v0, $v0, 0x800
-/* CC67F4 80242FE4 AE220000 */  sw        $v0, ($s1)
-/* CC67F8 80242FE8 24020066 */  addiu     $v0, $zero, 0x66
-/* CC67FC 80242FEC E6220018 */  swc1      $f2, 0x18($s1)
-/* CC6800 80242FF0 E624001C */  swc1      $f4, 0x1c($s1)
-/* CC6804 80242FF4 E6260014 */  swc1      $f6, 0x14($s1)
-/* CC6808 80242FF8 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242FFC:
-/* CC680C 80242FFC C6200018 */  lwc1      $f0, 0x18($s1)
-/* CC6810 80243000 44801000 */  mtc1      $zero, $f2
-/* CC6814 80243004 44801800 */  mtc1      $zero, $f3
-/* CC6818 80243008 46000021 */  cvt.d.s   $f0, $f0
-/* CC681C 8024300C 4620103C */  c.lt.d    $f2, $f0
-/* CC6820 80243010 00000000 */  nop
-/* CC6824 80243014 4500001F */  bc1f      .L80243094
-/* CC6828 80243018 27A50058 */   addiu    $a1, $sp, 0x58
-/* CC682C 8024301C C6200038 */  lwc1      $f0, 0x38($s1)
-/* CC6830 80243020 C622003C */  lwc1      $f2, 0x3c($s1)
-/* CC6834 80243024 C6240040 */  lwc1      $f4, 0x40($s1)
-/* CC6838 80243028 C6260018 */  lwc1      $f6, 0x18($s1)
-/* CC683C 8024302C E7A00058 */  swc1      $f0, 0x58($sp)
-/* CC6840 80243030 E7A2005C */  swc1      $f2, 0x5c($sp)
-/* CC6844 80243034 E7A40060 */  swc1      $f4, 0x60($sp)
-/* CC6848 80243038 E7A60010 */  swc1      $f6, 0x10($sp)
-/* CC684C 8024303C C620000C */  lwc1      $f0, 0xc($s1)
-/* CC6850 80243040 E7A00014 */  swc1      $f0, 0x14($sp)
-/* CC6854 80243044 862200A8 */  lh        $v0, 0xa8($s1)
-/* CC6858 80243048 44820000 */  mtc1      $v0, $f0
-/* CC685C 8024304C 00000000 */  nop
-/* CC6860 80243050 46800020 */  cvt.s.w   $f0, $f0
-/* CC6864 80243054 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CC6868 80243058 862200A6 */  lh        $v0, 0xa6($s1)
-/* CC686C 8024305C 27A6005C */  addiu     $a2, $sp, 0x5c
-/* CC6870 80243060 44820000 */  mtc1      $v0, $f0
-/* CC6874 80243064 00000000 */  nop
-/* CC6878 80243068 46800020 */  cvt.s.w   $f0, $f0
-/* CC687C 8024306C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* CC6880 80243070 8E240080 */  lw        $a0, 0x80($s1)
-/* CC6884 80243074 0C037711 */  jal       func_800DDC44
-/* CC6888 80243078 27A70060 */   addiu    $a3, $sp, 0x60
-/* CC688C 8024307C 54400005 */  bnel      $v0, $zero, .L80243094
-/* CC6890 80243080 AE200018 */   sw       $zero, 0x18($s1)
-/* CC6894 80243084 8E250018 */  lw        $a1, 0x18($s1)
-/* CC6898 80243088 8E26000C */  lw        $a2, 0xc($s1)
-/* CC689C 8024308C 0C00EA95 */  jal       npc_move_heading
-/* CC68A0 80243090 0220202D */   daddu    $a0, $s1, $zero
-.L80243094:
-/* CC68A4 80243094 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CC68A8 80243098 4480B000 */  mtc1      $zero, $f22
-/* CC68AC 8024309C 4480B800 */  mtc1      $zero, $f23
-/* CC68B0 802430A0 46000021 */  cvt.d.s   $f0, $f0
-/* CC68B4 802430A4 4636003C */  c.lt.d    $f0, $f22
-/* CC68B8 802430A8 00000000 */  nop
-/* CC68BC 802430AC 45000074 */  bc1f      .L80243280
-/* CC68C0 802430B0 27A50058 */   addiu    $a1, $sp, 0x58
-/* CC68C4 802430B4 27A6005C */  addiu     $a2, $sp, 0x5c
-/* CC68C8 802430B8 27A20064 */  addiu     $v0, $sp, 0x64
-/* CC68CC 802430BC C622003C */  lwc1      $f2, 0x3c($s1)
-/* CC68D0 802430C0 C6260038 */  lwc1      $f6, 0x38($s1)
-/* CC68D4 802430C4 3C01402A */  lui       $at, 0x402a
-/* CC68D8 802430C8 4481A800 */  mtc1      $at, $f21
-/* CC68DC 802430CC 4480A000 */  mtc1      $zero, $f20
-/* CC68E0 802430D0 460010A1 */  cvt.d.s   $f2, $f2
-/* CC68E4 802430D4 46341080 */  add.d     $f2, $f2, $f20
-/* CC68E8 802430D8 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CC68EC 802430DC C6240040 */  lwc1      $f4, 0x40($s1)
-/* CC68F0 802430E0 46000005 */  abs.s     $f0, $f0
-/* CC68F4 802430E4 E7A40060 */  swc1      $f4, 0x60($sp)
-/* CC68F8 802430E8 3C014030 */  lui       $at, 0x4030
-/* CC68FC 802430EC 44812800 */  mtc1      $at, $f5
-/* CC6900 802430F0 44802000 */  mtc1      $zero, $f4
-/* CC6904 802430F4 46000021 */  cvt.d.s   $f0, $f0
-/* CC6908 802430F8 E7A60058 */  swc1      $f6, 0x58($sp)
-/* CC690C 802430FC 46240000 */  add.d     $f0, $f0, $f4
-/* CC6910 80243100 462010A0 */  cvt.s.d   $f2, $f2
-/* CC6914 80243104 E7A2005C */  swc1      $f2, 0x5c($sp)
-/* CC6918 80243108 46200020 */  cvt.s.d   $f0, $f0
-/* CC691C 8024310C E7A00064 */  swc1      $f0, 0x64($sp)
-/* CC6920 80243110 AFA20010 */  sw        $v0, 0x10($sp)
-/* CC6924 80243114 8E240080 */  lw        $a0, 0x80($s1)
-/* CC6928 80243118 0C0372DF */  jal       func_800DCB7C
-/* CC692C 8024311C 27A70060 */   addiu    $a3, $sp, 0x60
-/* CC6930 80243120 10400057 */  beqz      $v0, .L80243280
-/* CC6934 80243124 00000000 */   nop
-/* CC6938 80243128 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CC693C 8024312C C7A20064 */  lwc1      $f2, 0x64($sp)
-/* CC6940 80243130 46000005 */  abs.s     $f0, $f0
-/* CC6944 80243134 46000021 */  cvt.d.s   $f0, $f0
-/* CC6948 80243138 46340000 */  add.d     $f0, $f0, $f20
-/* CC694C 8024313C 460010A1 */  cvt.d.s   $f2, $f2
-/* CC6950 80243140 4620103E */  c.le.d    $f2, $f0
-/* CC6954 80243144 00000000 */  nop
-/* CC6958 80243148 4500004D */  bc1f      .L80243280
-/* CC695C 8024314C 00000000 */   nop
-/* CC6960 80243150 C7A0005C */  lwc1      $f0, 0x5c($sp)
-/* CC6964 80243154 E620003C */  swc1      $f0, 0x3c($s1)
-/* CC6968 80243158 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CC696C 8024315C C6200038 */  lwc1      $f0, 0x38($s1)
-/* CC6970 80243160 4600020D */  trunc.w.s $f8, $f0
-/* CC6974 80243164 E4480000 */  swc1      $f8, ($v0)
-/* CC6978 80243168 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CC697C 8024316C C620003C */  lwc1      $f0, 0x3c($s1)
-/* CC6980 80243170 4600020D */  trunc.w.s $f8, $f0
-/* CC6984 80243174 E4480004 */  swc1      $f8, 4($v0)
-/* CC6988 80243178 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CC698C 8024317C C6200040 */  lwc1      $f0, 0x40($s1)
-/* CC6990 80243180 4600020D */  trunc.w.s $f8, $f0
-/* CC6994 80243184 E4480008 */  swc1      $f8, 8($v0)
-/* CC6998 80243188 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CC699C 8024318C C6200038 */  lwc1      $f0, 0x38($s1)
-/* CC69A0 80243190 4600020D */  trunc.w.s $f8, $f0
-/* CC69A4 80243194 E448001C */  swc1      $f8, 0x1c($v0)
-/* CC69A8 80243198 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CC69AC 8024319C C620003C */  lwc1      $f0, 0x3c($s1)
-/* CC69B0 802431A0 4600020D */  trunc.w.s $f8, $f0
-/* CC69B4 802431A4 E4480020 */  swc1      $f8, 0x20($v0)
-/* CC69B8 802431A8 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CC69BC 802431AC C6200040 */  lwc1      $f0, 0x40($s1)
-/* CC69C0 802431B0 4600020D */  trunc.w.s $f8, $f0
-/* CC69C4 802431B4 E4480024 */  swc1      $f8, 0x24($v0)
-/* CC69C8 802431B8 8E4300A0 */  lw        $v1, 0xa0($s2)
-/* CC69CC 802431BC 24020005 */  addiu     $v0, $zero, 5
-/* CC69D0 802431C0 1060000B */  beqz      $v1, .L802431F0
-/* CC69D4 802431C4 AE420094 */   sw       $v0, 0x94($s2)
-/* CC69D8 802431C8 C620003C */  lwc1      $f0, 0x3c($s1)
-/* CC69DC 802431CC 46000021 */  cvt.d.s   $f0, $f0
-/* CC69E0 802431D0 4636003E */  c.le.d    $f0, $f22
-/* CC69E4 802431D4 00000000 */  nop
-/* CC69E8 802431D8 4501000D */  bc1t      .L80243210
-/* CC69EC 802431DC 2403FFF7 */   addiu    $v1, $zero, -9
-/* CC69F0 802431E0 8E220000 */  lw        $v0, ($s1)
-/* CC69F4 802431E4 34420200 */  ori       $v0, $v0, 0x200
-/* CC69F8 802431E8 08090C88 */  j         .L80243220
-/* CC69FC 802431EC 00431024 */   and      $v0, $v0, $v1
-.L802431F0:
-/* CC6A00 802431F0 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CC6A04 802431F4 8C420034 */  lw        $v0, 0x34($v0)
-/* CC6A08 802431F8 14400005 */  bnez      $v0, .L80243210
-/* CC6A0C 802431FC 2403FFF7 */   addiu    $v1, $zero, -9
-/* CC6A10 80243200 8E220000 */  lw        $v0, ($s1)
-/* CC6A14 80243204 34420200 */  ori       $v0, $v0, 0x200
-/* CC6A18 80243208 08090C88 */  j         .L80243220
-/* CC6A1C 8024320C 00431024 */   and      $v0, $v0, $v1
-.L80243210:
-/* CC6A20 80243210 8E220000 */  lw        $v0, ($s1)
-/* CC6A24 80243214 2403FDFF */  addiu     $v1, $zero, -0x201
-/* CC6A28 80243218 00431024 */  and       $v0, $v0, $v1
-/* CC6A2C 8024321C 34420008 */  ori       $v0, $v0, 8
-.L80243220:
-/* CC6A30 80243220 AE220000 */  sw        $v0, ($s1)
-/* CC6A34 80243224 C62C0038 */  lwc1      $f12, 0x38($s1)
-/* CC6A38 80243228 C62E0040 */  lwc1      $f14, 0x40($s1)
-/* CC6A3C 8024322C 8E220000 */  lw        $v0, ($s1)
-/* CC6A40 80243230 3C04800F */  lui       $a0, %hi(gPlayerStatusPtr)
-/* CC6A44 80243234 8C847B30 */  lw        $a0, %lo(gPlayerStatusPtr)($a0)
-/* CC6A48 80243238 3C030004 */  lui       $v1, 4
-/* CC6A4C 8024323C AE20001C */  sw        $zero, 0x1c($s1)
-/* CC6A50 80243240 00431025 */  or        $v0, $v0, $v1
-/* CC6A54 80243244 2403F7FF */  addiu     $v1, $zero, -0x801
-/* CC6A58 80243248 00431024 */  and       $v0, $v0, $v1
-/* CC6A5C 8024324C AE220000 */  sw        $v0, ($s1)
-/* CC6A60 80243250 8C860028 */  lw        $a2, 0x28($a0)
-/* CC6A64 80243254 0C00A720 */  jal       atan2
-/* CC6A68 80243258 8C870030 */   lw       $a3, 0x30($a0)
-/* CC6A6C 8024325C 3C02004A */  lui       $v0, 0x4a
-/* CC6A70 80243260 3442001A */  ori       $v0, $v0, 0x1a
-/* CC6A74 80243264 AE220028 */  sw        $v0, 0x28($s1)
-/* CC6A78 80243268 24020003 */  addiu     $v0, $zero, 3
-/* CC6A7C 8024326C A622008E */  sh        $v0, 0x8e($s1)
-/* CC6A80 80243270 24020067 */  addiu     $v0, $zero, 0x67
-/* CC6A84 80243274 E620000C */  swc1      $f0, 0xc($s1)
-/* CC6A88 80243278 08090CCE */  j         .L80243338
-/* CC6A8C 8024327C AEA20070 */   sw       $v0, 0x70($s5)
-.L80243280:
-/* CC6A90 80243280 C624003C */  lwc1      $f4, 0x3c($s1)
-/* CC6A94 80243284 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CC6A98 80243288 46002100 */  add.s     $f4, $f4, $f0
-/* CC6A9C 8024328C C6220014 */  lwc1      $f2, 0x14($s1)
-/* CC6AA0 80243290 46020001 */  sub.s     $f0, $f0, $f2
-/* CC6AA4 80243294 E624003C */  swc1      $f4, 0x3c($s1)
-/* CC6AA8 80243298 08090CCE */  j         .L80243338
-/* CC6AAC 8024329C E620001C */   swc1     $f0, 0x1c($s1)
-.L802432A0:
-/* CC6AB0 802432A0 9622008E */  lhu       $v0, 0x8e($s1)
-/* CC6AB4 802432A4 2442FFFF */  addiu     $v0, $v0, -1
-/* CC6AB8 802432A8 A622008E */  sh        $v0, 0x8e($s1)
-/* CC6ABC 802432AC 00021400 */  sll       $v0, $v0, 0x10
-/* CC6AC0 802432B0 1C400021 */  bgtz      $v0, .L80243338
-/* CC6AC4 802432B4 3C03004A */   lui      $v1, 0x4a
-/* CC6AC8 802432B8 3C04FFFB */  lui       $a0, 0xfffb
-/* CC6ACC 802432BC 3484FFFF */  ori       $a0, $a0, 0xffff
-/* CC6AD0 802432C0 8E220000 */  lw        $v0, ($s1)
-/* CC6AD4 802432C4 34630001 */  ori       $v1, $v1, 1
-/* CC6AD8 802432C8 AE230028 */  sw        $v1, 0x28($s1)
-/* CC6ADC 802432CC 00441024 */  and       $v0, $v0, $a0
-/* CC6AE0 802432D0 AE220000 */  sw        $v0, ($s1)
-/* CC6AE4 802432D4 08090CCE */  j         .L80243338
-/* CC6AE8 802432D8 AEA00070 */   sw       $zero, 0x70($s5)
-.L802432DC:
-/* CC6AEC 802432DC 3C01C47A */  lui       $at, 0xc47a
-/* CC6AF0 802432E0 44810000 */  mtc1      $at, $f0
-/* CC6AF4 802432E4 8E230000 */  lw        $v1, ($s1)
-/* CC6AF8 802432E8 A622008E */  sh        $v0, 0x8e($s1)
-/* CC6AFC 802432EC 2402FDFF */  addiu     $v0, $zero, -0x201
-/* CC6B00 802432F0 AE200038 */  sw        $zero, 0x38($s1)
-/* CC6B04 802432F4 AE200040 */  sw        $zero, 0x40($s1)
-/* CC6B08 802432F8 3463000A */  ori       $v1, $v1, 0xa
-/* CC6B0C 802432FC 00621824 */  and       $v1, $v1, $v0
-/* CC6B10 80243300 E620003C */  swc1      $f0, 0x3c($s1)
-/* CC6B14 80243304 AE230000 */  sw        $v1, ($s1)
-/* CC6B18 80243308 AEA40070 */  sw        $a0, 0x70($s5)
-.L8024330C:
-/* CC6B1C 8024330C 9622008E */  lhu       $v0, 0x8e($s1)
-/* CC6B20 80243310 2442FFFF */  addiu     $v0, $v0, -1
-/* CC6B24 80243314 A622008E */  sh        $v0, 0x8e($s1)
-/* CC6B28 80243318 00021400 */  sll       $v0, $v0, 0x10
-/* CC6B2C 8024331C 1C400006 */  bgtz      $v0, .L80243338
-/* CC6B30 80243320 24020064 */   addiu    $v0, $zero, 0x64
-/* CC6B34 80243324 AE400094 */  sw        $zero, 0x94($s2)
-/* CC6B38 80243328 08090CCE */  j         .L80243338
-/* CC6B3C 8024332C AEA20070 */   sw       $v0, 0x70($s5)
-.L80243330:
-/* CC6B40 80243330 0C0129CF */  jal       func_8004A73C
-/* CC6B44 80243334 02A0202D */   daddu    $a0, $s5, $zero
-.L80243338:
-/* CC6B48 80243338 8FBF0080 */  lw        $ra, 0x80($sp)
-/* CC6B4C 8024333C 8FB5007C */  lw        $s5, 0x7c($sp)
-/* CC6B50 80243340 8FB40078 */  lw        $s4, 0x78($sp)
-/* CC6B54 80243344 8FB30074 */  lw        $s3, 0x74($sp)
-/* CC6B58 80243348 8FB20070 */  lw        $s2, 0x70($sp)
-/* CC6B5C 8024334C 8FB1006C */  lw        $s1, 0x6c($sp)
-/* CC6B60 80243350 8FB00068 */  lw        $s0, 0x68($sp)
-/* CC6B64 80243354 D7B60090 */  ldc1      $f22, 0x90($sp)
-/* CC6B68 80243358 D7B40088 */  ldc1      $f20, 0x88($sp)
-/* CC6B6C 8024335C 0000102D */  daddu     $v0, $zero, $zero
-/* CC6B70 80243360 03E00008 */  jr        $ra
-/* CC6B74 80243364 27BD0098 */   addiu    $sp, $sp, 0x98
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368_CC6B78.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368_CC6B78.s
deleted file mode 100644
index 6a4ad7c180..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368_CC6B78.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243368_CC6B78
-/* CC6B78 80243368 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CC6B7C 8024336C AFB00010 */  sw        $s0, 0x10($sp)
-/* CC6B80 80243370 0080802D */  daddu     $s0, $a0, $zero
-/* CC6B84 80243374 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CC6B88 80243378 C60C0084 */  lwc1      $f12, 0x84($s0)
-/* CC6B8C 8024337C 46806320 */  cvt.s.w   $f12, $f12
-/* CC6B90 80243380 C6020090 */  lwc1      $f2, 0x90($s0)
-/* CC6B94 80243384 468010A0 */  cvt.s.w   $f2, $f2
-/* CC6B98 80243388 44061000 */  mfc1      $a2, $f2
-/* CC6B9C 8024338C C6020098 */  lwc1      $f2, 0x98($s0)
-/* CC6BA0 80243390 468010A0 */  cvt.s.w   $f2, $f2
-/* CC6BA4 80243394 44071000 */  mfc1      $a3, $f2
-/* CC6BA8 80243398 C60E008C */  lwc1      $f14, 0x8c($s0)
-/* CC6BAC 8024339C 0C00A720 */  jal       atan2
-/* CC6BB0 802433A0 468073A0 */   cvt.s.w  $f14, $f14
-/* CC6BB4 802433A4 4600008D */  trunc.w.s $f2, $f0
-/* CC6BB8 802433A8 E60200AC */  swc1      $f2, 0xac($s0)
-/* CC6BBC 802433AC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CC6BC0 802433B0 8FB00010 */  lw        $s0, 0x10($sp)
-/* CC6BC4 802433B4 24020002 */  addiu     $v0, $zero, 2
-/* CC6BC8 802433B8 03E00008 */  jr        $ra
-/* CC6BCC 802433BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s
deleted file mode 100644
index f546485cb7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s
+++ /dev/null
@@ -1,75 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802433C0_CC6BD0
-/* CC6BD0 802433C0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CC6BD4 802433C4 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CC6BD8 802433C8 0080982D */  daddu     $s3, $a0, $zero
-/* CC6BDC 802433CC AFB00020 */  sw        $s0, 0x20($sp)
-/* CC6BE0 802433D0 00A0802D */  daddu     $s0, $a1, $zero
-/* CC6BE4 802433D4 24040001 */  addiu     $a0, $zero, 1
-/* CC6BE8 802433D8 AFBF0030 */  sw        $ra, 0x30($sp)
-/* CC6BEC 802433DC AFB20028 */  sw        $s2, 0x28($sp)
-/* CC6BF0 802433E0 0C00EABB */  jal       get_npc_unsafe
-/* CC6BF4 802433E4 AFB10024 */   sw       $s1, 0x24($sp)
-/* CC6BF8 802433E8 8E63000C */  lw        $v1, 0xc($s3)
-/* CC6BFC 802433EC 0260202D */  daddu     $a0, $s3, $zero
-/* CC6C00 802433F0 8C650000 */  lw        $a1, ($v1)
-/* CC6C04 802433F4 0C0B1EAF */  jal       get_variable
-/* CC6C08 802433F8 0040902D */   daddu    $s2, $v0, $zero
-/* CC6C0C 802433FC 12000002 */  beqz      $s0, .L80243408
-/* CC6C10 80243400 AE620074 */   sw       $v0, 0x74($s3)
-/* CC6C14 80243404 AE600070 */  sw        $zero, 0x70($s3)
-.L80243408:
-/* CC6C18 80243408 3C026666 */  lui       $v0, 0x6666
-/* CC6C1C 8024340C 8E640070 */  lw        $a0, 0x70($s3)
-/* CC6C20 80243410 34426667 */  ori       $v0, $v0, 0x6667
-/* CC6C24 80243414 00820018 */  mult      $a0, $v0
-/* CC6C28 80243418 000417C3 */  sra       $v0, $a0, 0x1f
-/* CC6C2C 8024341C 00004010 */  mfhi      $t0
-/* CC6C30 80243420 00081843 */  sra       $v1, $t0, 1
-/* CC6C34 80243424 00621823 */  subu      $v1, $v1, $v0
-/* CC6C38 80243428 00031080 */  sll       $v0, $v1, 2
-/* CC6C3C 8024342C 00431021 */  addu      $v0, $v0, $v1
-/* CC6C40 80243430 1482001B */  bne       $a0, $v0, .L802434A0
-/* CC6C44 80243434 3C020020 */   lui      $v0, 0x20
-/* CC6C48 80243438 34420002 */  ori       $v0, $v0, 2
-/* CC6C4C 8024343C 27B1001A */  addiu     $s1, $sp, 0x1a
-/* CC6C50 80243440 27B00018 */  addiu     $s0, $sp, 0x18
-/* CC6C54 80243444 AFB10010 */  sw        $s1, 0x10($sp)
-/* CC6C58 80243448 AFA20014 */  sw        $v0, 0x14($sp)
-/* CC6C5C 8024344C 8E460040 */  lw        $a2, 0x40($s2)
-/* CC6C60 80243450 C64C0038 */  lwc1      $f12, 0x38($s2)
-/* CC6C64 80243454 C64E003C */  lwc1      $f14, 0x3c($s2)
-/* CC6C68 80243458 0C052781 */  jal       sfx_get_spatialized_sound_params
-/* CC6C6C 8024345C 0200382D */   daddu    $a3, $s0, $zero
-/* CC6C70 80243460 3C0543FA */  lui       $a1, 0x43fa
-/* CC6C74 80243464 8E620074 */  lw        $v0, 0x74($s3)
-/* CC6C78 80243468 0000202D */  daddu     $a0, $zero, $zero
-/* CC6C7C 8024346C AFA20010 */  sw        $v0, 0x10($sp)
-/* CC6C80 80243470 8E670070 */  lw        $a3, 0x70($s3)
-/* CC6C84 80243474 0C00A8ED */  jal       update_lerp
-/* CC6C88 80243478 0000302D */   daddu    $a2, $zero, $zero
-/* CC6C8C 8024347C 24040295 */  addiu     $a0, $zero, 0x295
-/* CC6C90 80243480 4600008D */  trunc.w.s $f2, $f0
-/* CC6C94 80243484 44071000 */  mfc1      $a3, $f2
-/* CC6C98 80243488 00000000 */  nop
-/* CC6C9C 8024348C 00073C00 */  sll       $a3, $a3, 0x10
-/* CC6CA0 80243490 92050001 */  lbu       $a1, 1($s0)
-/* CC6CA4 80243494 92260001 */  lbu       $a2, 1($s1)
-/* CC6CA8 80243498 0C0526AE */  jal       sfx_play_sound_with_params
-/* CC6CAC 8024349C 00073C03 */   sra      $a3, $a3, 0x10
-.L802434A0:
-/* CC6CB0 802434A0 8E630070 */  lw        $v1, 0x70($s3)
-/* CC6CB4 802434A4 8E620074 */  lw        $v0, 0x74($s3)
-/* CC6CB8 802434A8 24630001 */  addiu     $v1, $v1, 1
-/* CC6CBC 802434AC 0043102A */  slt       $v0, $v0, $v1
-/* CC6CC0 802434B0 AE630070 */  sw        $v1, 0x70($s3)
-/* CC6CC4 802434B4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CC6CC8 802434B8 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CC6CCC 802434BC 8FB20028 */  lw        $s2, 0x28($sp)
-/* CC6CD0 802434C0 8FB10024 */  lw        $s1, 0x24($sp)
-/* CC6CD4 802434C4 8FB00020 */  lw        $s0, 0x20($sp)
-/* CC6CD8 802434C8 00021040 */  sll       $v0, $v0, 1
-/* CC6CDC 802434CC 03E00008 */  jr        $ra
-/* CC6CE0 802434D0 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s
deleted file mode 100644
index 18bf0f4f28..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s
+++ /dev/null
@@ -1,69 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802434D4_CC6CE4
-/* CC6CE4 802434D4 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* CC6CE8 802434D8 AFB20028 */  sw        $s2, 0x28($sp)
-/* CC6CEC 802434DC 0080902D */  daddu     $s2, $a0, $zero
-/* CC6CF0 802434E0 AFB00020 */  sw        $s0, 0x20($sp)
-/* CC6CF4 802434E4 00A0802D */  daddu     $s0, $a1, $zero
-/* CC6CF8 802434E8 0000202D */  daddu     $a0, $zero, $zero
-/* CC6CFC 802434EC AFBF002C */  sw        $ra, 0x2c($sp)
-/* CC6D00 802434F0 0C00EABB */  jal       get_npc_unsafe
-/* CC6D04 802434F4 AFB10024 */   sw       $s1, 0x24($sp)
-/* CC6D08 802434F8 12000002 */  beqz      $s0, .L80243504
-/* CC6D0C 802434FC 0040282D */   daddu    $a1, $v0, $zero
-/* CC6D10 80243500 AE400070 */  sw        $zero, 0x70($s2)
-.L80243504:
-/* CC6D14 80243504 3C026666 */  lui       $v0, 0x6666
-/* CC6D18 80243508 8E440070 */  lw        $a0, 0x70($s2)
-/* CC6D1C 8024350C 34426667 */  ori       $v0, $v0, 0x6667
-/* CC6D20 80243510 00820018 */  mult      $a0, $v0
-/* CC6D24 80243514 000417C3 */  sra       $v0, $a0, 0x1f
-/* CC6D28 80243518 00004010 */  mfhi      $t0
-/* CC6D2C 8024351C 00081843 */  sra       $v1, $t0, 1
-/* CC6D30 80243520 00621823 */  subu      $v1, $v1, $v0
-/* CC6D34 80243524 00031080 */  sll       $v0, $v1, 2
-/* CC6D38 80243528 00431021 */  addu      $v0, $v0, $v1
-/* CC6D3C 8024352C 1482001B */  bne       $a0, $v0, .L8024359C
-/* CC6D40 80243530 3C020020 */   lui      $v0, 0x20
-/* CC6D44 80243534 34420002 */  ori       $v0, $v0, 2
-/* CC6D48 80243538 27B1001A */  addiu     $s1, $sp, 0x1a
-/* CC6D4C 8024353C 27B00018 */  addiu     $s0, $sp, 0x18
-/* CC6D50 80243540 AFB10010 */  sw        $s1, 0x10($sp)
-/* CC6D54 80243544 AFA20014 */  sw        $v0, 0x14($sp)
-/* CC6D58 80243548 8CA60040 */  lw        $a2, 0x40($a1)
-/* CC6D5C 8024354C C4AC0038 */  lwc1      $f12, 0x38($a1)
-/* CC6D60 80243550 C4AE003C */  lwc1      $f14, 0x3c($a1)
-/* CC6D64 80243554 0C052781 */  jal       sfx_get_spatialized_sound_params
-/* CC6D68 80243558 0200382D */   daddu    $a3, $s0, $zero
-/* CC6D6C 8024355C 0000202D */  daddu     $a0, $zero, $zero
-/* CC6D70 80243560 3C0543FA */  lui       $a1, 0x43fa
-/* CC6D74 80243564 24020050 */  addiu     $v0, $zero, 0x50
-/* CC6D78 80243568 AFA20010 */  sw        $v0, 0x10($sp)
-/* CC6D7C 8024356C 8E470070 */  lw        $a3, 0x70($s2)
-/* CC6D80 80243570 0C00A8ED */  jal       update_lerp
-/* CC6D84 80243574 0000302D */   daddu    $a2, $zero, $zero
-/* CC6D88 80243578 24040295 */  addiu     $a0, $zero, 0x295
-/* CC6D8C 8024357C 4600008D */  trunc.w.s $f2, $f0
-/* CC6D90 80243580 44071000 */  mfc1      $a3, $f2
-/* CC6D94 80243584 00000000 */  nop
-/* CC6D98 80243588 00073C00 */  sll       $a3, $a3, 0x10
-/* CC6D9C 8024358C 92050001 */  lbu       $a1, 1($s0)
-/* CC6DA0 80243590 92260001 */  lbu       $a2, 1($s1)
-/* CC6DA4 80243594 0C0526AE */  jal       sfx_play_sound_with_params
-/* CC6DA8 80243598 00073C03 */   sra      $a3, $a3, 0x10
-.L8024359C:
-/* CC6DAC 8024359C 8E430070 */  lw        $v1, 0x70($s2)
-/* CC6DB0 802435A0 24630001 */  addiu     $v1, $v1, 1
-/* CC6DB4 802435A4 28620051 */  slti      $v0, $v1, 0x51
-/* CC6DB8 802435A8 38420001 */  xori      $v0, $v0, 1
-/* CC6DBC 802435AC AE430070 */  sw        $v1, 0x70($s2)
-/* CC6DC0 802435B0 8FBF002C */  lw        $ra, 0x2c($sp)
-/* CC6DC4 802435B4 8FB20028 */  lw        $s2, 0x28($sp)
-/* CC6DC8 802435B8 8FB10024 */  lw        $s1, 0x24($sp)
-/* CC6DCC 802435BC 8FB00020 */  lw        $s0, 0x20($sp)
-/* CC6DD0 802435C0 00021040 */  sll       $v0, $v0, 1
-/* CC6DD4 802435C4 03E00008 */  jr        $ra
-/* CC6DD8 802435C8 27BD0030 */   addiu    $sp, $sp, 0x30
-/* CC6DDC 802435CC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s
deleted file mode 100644
index 479a2dae41..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802435D0_CC6DE0
-/* CC6DE0 802435D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CC6DE4 802435D4 3C048024 */  lui       $a0, %hi(D_80247AF0_CCB300)
-/* CC6DE8 802435D8 24847AF0 */  addiu     $a0, $a0, %lo(D_80247AF0_CCB300)
-/* CC6DEC 802435DC 27A50010 */  addiu     $a1, $sp, 0x10
-/* CC6DF0 802435E0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* CC6DF4 802435E4 AFB1001C */  sw        $s1, 0x1c($sp)
-/* CC6DF8 802435E8 0C016B3A */  jal       load_asset_by_name
-/* CC6DFC 802435EC AFB00018 */   sw       $s0, 0x18($sp)
-/* CC6E00 802435F0 0040802D */  daddu     $s0, $v0, $zero
-/* CC6E04 802435F4 0200202D */  daddu     $a0, $s0, $zero
-/* CC6E08 802435F8 3C118024 */  lui       $s1, %hi(D_80247B00_EE64C0)
-/* CC6E0C 802435FC 26317B00 */  addiu     $s1, $s1, %lo(D_80247B00_EE64C0)
-/* CC6E10 80243600 0C01BB7C */  jal       decode_yay0
-/* CC6E14 80243604 0220282D */   daddu    $a1, $s1, $zero
-/* CC6E18 80243608 0C00AB1E */  jal       general_heap_free
-/* CC6E1C 8024360C 0200202D */   daddu    $a0, $s0, $zero
-/* CC6E20 80243610 3C048025 */  lui       $a0, %hi(D_8024BA90)
-/* CC6E24 80243614 2484BA90 */  addiu     $a0, $a0, %lo(D_8024BA90)
-/* CC6E28 80243618 3C028024 */  lui       $v0, %hi(D_80247D00)
-/* CC6E2C 8024361C 24427D00 */  addiu     $v0, $v0, %lo(D_80247D00)
-/* CC6E30 80243620 AC820000 */  sw        $v0, ($a0)
-/* CC6E34 80243624 24020096 */  addiu     $v0, $zero, 0x96
-/* CC6E38 80243628 A4820008 */  sh        $v0, 8($a0)
-/* CC6E3C 8024362C 24020069 */  addiu     $v0, $zero, 0x69
-/* CC6E40 80243630 A482000A */  sh        $v0, 0xa($a0)
-/* CC6E44 80243634 24020002 */  addiu     $v0, $zero, 2
-/* CC6E48 80243638 AC82000C */  sw        $v0, 0xc($a0)
-/* CC6E4C 8024363C 24020001 */  addiu     $v0, $zero, 1
-/* CC6E50 80243640 AC910004 */  sw        $s1, 4($a0)
-/* CC6E54 80243644 0C0496CB */  jal       set_message_images
-/* CC6E58 80243648 AC820010 */   sw       $v0, 0x10($a0)
-/* CC6E5C 8024364C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CC6E60 80243650 8FB1001C */  lw        $s1, 0x1c($sp)
-/* CC6E64 80243654 8FB00018 */  lw        $s0, 0x18($sp)
-/* CC6E68 80243658 24020002 */  addiu     $v0, $zero, 2
-/* CC6E6C 8024365C 03E00008 */  jr        $ra
-/* CC6E70 80243660 27BD0028 */   addiu    $sp, $sp, 0x28
-/* CC6E74 80243664 00000000 */  nop
-/* CC6E78 80243668 00000000 */  nop
-/* CC6E7C 8024366C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/flo_14_func_80240504_CCB814.s
similarity index 92%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/flo_14_func_80240504_CCB814.s
index 91bc152b25..1b53c81760 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/flo_14_func_80240504_CCB814.s
@@ -1,6 +1,14 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+glabel flo_14_D_80245320_CD0630
+.double 0.04
+
+glabel flo_14_D_80245328_CD0638
+.double 0.98
+
+.section .text
 glabel func_80240504_CCB814
 /* CCB814 80240504 27BDFF88 */  addiu     $sp, $sp, -0x78
 /* CCB818 80240508 AFBF0064 */  sw        $ra, 0x64($sp)
@@ -9,20 +17,20 @@ glabel func_80240504_CCB814
 /* CCB824 80240514 F7B40068 */  sdc1      $f20, 0x68($sp)
 /* CCB828 80240518 0C019D28 */  jal       guMtxIdentF
 /* CCB82C 8024051C 27A40010 */   addiu    $a0, $sp, 0x10
-/* CCB830 80240520 3C108024 */  lui       $s0, %hi(D_80243B14_CCEE24)
-/* CCB834 80240524 26103B14 */  addiu     $s0, $s0, %lo(D_80243B14_CCEE24)
+/* CCB830 80240520 3C108024 */  lui       $s0, %hi(flo_14_D_80243B14_CCEE24)
+/* CCB834 80240524 26103B14 */  addiu     $s0, $s0, %lo(flo_14_D_80243B14_CCEE24)
 /* CCB838 80240528 C6000000 */  lwc1      $f0, ($s0)
 /* CCB83C 8024052C 3C014130 */  lui       $at, 0x4130
 /* CCB840 80240530 44816000 */  mtc1      $at, $f12
 /* CCB844 80240534 0C00A85B */  jal       sin_rad
 /* CCB848 80240538 460C0303 */   div.s    $f12, $f0, $f12
-/* CCB84C 8024053C 3C018024 */  lui       $at, %hi(D_80245320_CD0630)
-/* CCB850 80240540 D4345320 */  ldc1      $f20, %lo(D_80245320_CD0630)($at)
+/* CCB84C 8024053C 3C018024 */  lui       $at, %hi(flo_14_D_80245320_CD0630)
+/* CCB850 80240540 D4345320 */  ldc1      $f20, %lo(flo_14_D_80245320_CD0630)($at)
 /* CCB854 80240544 46000021 */  cvt.d.s   $f0, $f0
 /* CCB858 80240548 46340002 */  mul.d     $f0, $f0, $f20
 /* CCB85C 8024054C 00000000 */  nop
-/* CCB860 80240550 3C018024 */  lui       $at, %hi(D_80245328_CD0638)
-/* CCB864 80240554 D4365328 */  ldc1      $f22, %lo(D_80245328_CD0638)($at)
+/* CCB860 80240550 3C018024 */  lui       $at, %hi(flo_14_D_80245328_CD0638)
+/* CCB864 80240554 D4365328 */  ldc1      $f22, %lo(flo_14_D_80245328_CD0638)($at)
 /* CCB868 80240558 C6020000 */  lwc1      $f2, ($s0)
 /* CCB86C 8024055C 3C014140 */  lui       $at, 0x4140
 /* CCB870 80240560 44816000 */  mtc1      $at, $f12
@@ -167,8 +175,8 @@ glabel func_80240504_CCB814
 /* CCBA9C 8024078C 3C02DE00 */  lui       $v0, 0xde00
 /* CCBAA0 80240790 0C0470BB */  jal       func_8011C2EC
 /* CCBAA4 80240794 AE020000 */   sw       $v0, ($s0)
-/* CCBAA8 80240798 3C038024 */  lui       $v1, %hi(D_80243B14_CCEE24)
-/* CCBAAC 8024079C 24633B14 */  addiu     $v1, $v1, %lo(D_80243B14_CCEE24)
+/* CCBAA8 80240798 3C038024 */  lui       $v1, %hi(flo_14_D_80243B14_CCEE24)
+/* CCBAAC 8024079C 24633B14 */  addiu     $v1, $v1, %lo(flo_14_D_80243B14_CCEE24)
 /* CCBAB0 802407A0 C4600000 */  lwc1      $f0, ($v1)
 /* CCBAB4 802407A4 3C013F80 */  lui       $at, 0x3f80
 /* CCBAB8 802407A8 44811000 */  mtc1      $at, $f2
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024030C_CCB61C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024030C_CCB61C.s
deleted file mode 100644
index 4262e3e595..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024030C_CCB61C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_CCB61C
-/* CCB61C 8024030C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CCB620 80240310 0000202D */  daddu     $a0, $zero, $zero
-/* CCB624 80240314 0080282D */  daddu     $a1, $a0, $zero
-/* CCB628 80240318 0080302D */  daddu     $a2, $a0, $zero
-/* CCB62C 8024031C 0080382D */  daddu     $a3, $a0, $zero
-/* CCB630 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CCB634 80240324 AFA00010 */  sw        $zero, 0x10($sp)
-/* CCB638 80240328 0C01CA54 */  jal       func_80072950
-/* CCB63C 8024032C AFA00014 */   sw       $zero, 0x14($sp)
-/* CCB640 80240330 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CCB644 80240334 24020002 */  addiu     $v0, $zero, 2
-/* CCB648 80240338 03E00008 */  jr        $ra
-/* CCB64C 8024033C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240340_CCB650.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240340_CCB650.s
deleted file mode 100644
index 2c5fdf4bba..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240340_CCB650.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_CCB650
-/* CCB650 80240340 8C820084 */  lw        $v0, 0x84($a0)
-/* CCB654 80240344 8C830090 */  lw        $v1, 0x90($a0)
-/* CCB658 80240348 00431023 */  subu      $v0, $v0, $v1
-/* CCB65C 8024034C 44821000 */  mtc1      $v0, $f2
-/* CCB660 80240350 00000000 */  nop
-/* CCB664 80240354 468010A0 */  cvt.s.w   $f2, $f2
-/* CCB668 80240358 8C820088 */  lw        $v0, 0x88($a0)
-/* CCB66C 8024035C 8C830094 */  lw        $v1, 0x94($a0)
-/* CCB670 80240360 46021082 */  mul.s     $f2, $f2, $f2
-/* CCB674 80240364 00000000 */  nop
-/* CCB678 80240368 00431023 */  subu      $v0, $v0, $v1
-/* CCB67C 8024036C 44822000 */  mtc1      $v0, $f4
-/* CCB680 80240370 00000000 */  nop
-/* CCB684 80240374 46802120 */  cvt.s.w   $f4, $f4
-/* CCB688 80240378 8C82008C */  lw        $v0, 0x8c($a0)
-/* CCB68C 8024037C 46042102 */  mul.s     $f4, $f4, $f4
-/* CCB690 80240380 00000000 */  nop
-/* CCB694 80240384 8C830098 */  lw        $v1, 0x98($a0)
-/* CCB698 80240388 00431023 */  subu      $v0, $v0, $v1
-/* CCB69C 8024038C 44820000 */  mtc1      $v0, $f0
-/* CCB6A0 80240390 00000000 */  nop
-/* CCB6A4 80240394 46800020 */  cvt.s.w   $f0, $f0
-/* CCB6A8 80240398 46000002 */  mul.s     $f0, $f0, $f0
-/* CCB6AC 8024039C 00000000 */  nop
-/* CCB6B0 802403A0 46041080 */  add.s     $f2, $f2, $f4
-/* CCB6B4 802403A4 46001080 */  add.s     $f2, $f2, $f0
-/* CCB6B8 802403A8 3C014561 */  lui       $at, 0x4561
-/* CCB6BC 802403AC 44810000 */  mtc1      $at, $f0
-/* CCB6C0 802403B0 00000000 */  nop
-/* CCB6C4 802403B4 4600103C */  c.lt.s    $f2, $f0
-/* CCB6C8 802403B8 00000000 */  nop
-/* CCB6CC 802403BC 45010002 */  bc1t      .L802403C8
-/* CCB6D0 802403C0 24020001 */   addiu    $v0, $zero, 1
-/* CCB6D4 802403C4 0000102D */  daddu     $v0, $zero, $zero
-.L802403C8:
-/* CCB6D8 802403C8 AC820084 */  sw        $v0, 0x84($a0)
-/* CCB6DC 802403CC 03E00008 */  jr        $ra
-/* CCB6E0 802403D0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s
deleted file mode 100644
index 6f5aee6437..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403D4_CCB6E4
-/* CCB6E4 802403D4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCB6E8 802403D8 3C028011 */  lui       $v0, %hi(gPlayerData+0x12)
-/* CCB6EC 802403DC 8042F2A2 */  lb        $v0, %lo(gPlayerData+0x12)($v0)
-/* CCB6F0 802403E0 0080182D */  daddu     $v1, $a0, $zero
-/* CCB6F4 802403E4 1040000C */  beqz      $v0, .L80240418
-/* CCB6F8 802403E8 AFBF0010 */   sw       $ra, 0x10($sp)
-/* CCB6FC 802403EC 2404FFFC */  addiu     $a0, $zero, -4
-/* CCB700 802403F0 24020001 */  addiu     $v0, $zero, 1
-/* CCB704 802403F4 0C00EABB */  jal       get_npc_unsafe
-/* CCB708 802403F8 AC6200BC */   sw       $v0, 0xbc($v1)
-/* CCB70C 802403FC 0000202D */  daddu     $a0, $zero, $zero
-/* CCB710 80240400 3C05FD05 */  lui       $a1, 0xfd05
-/* CCB714 80240404 8C460000 */  lw        $a2, ($v0)
-/* CCB718 80240408 0C0B2026 */  jal       set_variable
-/* CCB71C 8024040C 34A50F80 */   ori      $a1, $a1, 0xf80
-/* CCB720 80240410 08090108 */  j         .L80240420
-/* CCB724 80240414 24020002 */   addiu    $v0, $zero, 2
-.L80240418:
-/* CCB728 80240418 AC6000BC */  sw        $zero, 0xbc($v1)
-/* CCB72C 8024041C 24020002 */  addiu     $v0, $zero, 2
-.L80240420:
-/* CCB730 80240420 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CCB734 80240424 03E00008 */  jr        $ra
-/* CCB738 80240428 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024042C_CCB73C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024042C_CCB73C.s
deleted file mode 100644
index 24829f7eef..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024042C_CCB73C.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024042C_CCB73C
-/* CCB73C 8024042C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCB740 80240430 2404FFFC */  addiu     $a0, $zero, -4
-/* CCB744 80240434 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CCB748 80240438 0C00EABB */  jal       get_npc_unsafe
-/* CCB74C 8024043C AFB00010 */   sw       $s0, 0x10($sp)
-/* CCB750 80240440 0000202D */  daddu     $a0, $zero, $zero
-/* CCB754 80240444 3C05FD05 */  lui       $a1, 0xfd05
-/* CCB758 80240448 34A50F80 */  ori       $a1, $a1, 0xf80
-/* CCB75C 8024044C 0C0B1EAF */  jal       get_variable
-/* CCB760 80240450 0040802D */   daddu    $s0, $v0, $zero
-/* CCB764 80240454 AE020000 */  sw        $v0, ($s0)
-/* CCB768 80240458 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CCB76C 8024045C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CCB770 80240460 24020002 */  addiu     $v0, $zero, 2
-/* CCB774 80240464 03E00008 */  jr        $ra
-/* CCB778 80240468 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s
deleted file mode 100644
index 7084324fa5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_8024046C_CCB77C.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024046C_CCB77C
-/* CCB77C 8024046C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CCB780 80240470 AFB1001C */  sw        $s1, 0x1c($sp)
-/* CCB784 80240474 0080882D */  daddu     $s1, $a0, $zero
-/* CCB788 80240478 AFBF0020 */  sw        $ra, 0x20($sp)
-/* CCB78C 8024047C AFB00018 */  sw        $s0, 0x18($sp)
-/* CCB790 80240480 8E30000C */  lw        $s0, 0xc($s1)
-/* CCB794 80240484 8E050000 */  lw        $a1, ($s0)
-/* CCB798 80240488 0C0B1EAF */  jal       get_variable
-/* CCB79C 8024048C 26100004 */   addiu    $s0, $s0, 4
-/* CCB7A0 80240490 AE220070 */  sw        $v0, 0x70($s1)
-/* CCB7A4 80240494 8E050000 */  lw        $a1, ($s0)
-/* CCB7A8 80240498 26100004 */  addiu     $s0, $s0, 4
-/* CCB7AC 8024049C 0C0B1EAF */  jal       get_variable
-/* CCB7B0 802404A0 0220202D */   daddu    $a0, $s1, $zero
-/* CCB7B4 802404A4 AE220074 */  sw        $v0, 0x74($s1)
-/* CCB7B8 802404A8 8E050000 */  lw        $a1, ($s0)
-/* CCB7BC 802404AC 0C0B1EAF */  jal       get_variable
-/* CCB7C0 802404B0 0220202D */   daddu    $a0, $s1, $zero
-/* CCB7C4 802404B4 24040194 */  addiu     $a0, $zero, 0x194
-/* CCB7C8 802404B8 0000282D */  daddu     $a1, $zero, $zero
-/* CCB7CC 802404BC C6200070 */  lwc1      $f0, 0x70($s1)
-/* CCB7D0 802404C0 46800020 */  cvt.s.w   $f0, $f0
-/* CCB7D4 802404C4 C6220074 */  lwc1      $f2, 0x74($s1)
-/* CCB7D8 802404C8 468010A0 */  cvt.s.w   $f2, $f2
-/* CCB7DC 802404CC 44060000 */  mfc1      $a2, $f0
-/* CCB7E0 802404D0 44071000 */  mfc1      $a3, $f2
-/* CCB7E4 802404D4 44820000 */  mtc1      $v0, $f0
-/* CCB7E8 802404D8 00000000 */  nop
-/* CCB7EC 802404DC 46800020 */  cvt.s.w   $f0, $f0
-/* CCB7F0 802404E0 AE220078 */  sw        $v0, 0x78($s1)
-/* CCB7F4 802404E4 0C05267B */  jal       sfx_adjust_env_sound_pos
-/* CCB7F8 802404E8 E7A00010 */   swc1     $f0, 0x10($sp)
-/* CCB7FC 802404EC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CCB800 802404F0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* CCB804 802404F4 8FB00018 */  lw        $s0, 0x18($sp)
-/* CCB808 802404F8 24020002 */  addiu     $v0, $zero, 2
-/* CCB80C 802404FC 03E00008 */  jr        $ra
-/* CCB810 80240500 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s
deleted file mode 100644
index 862d201959..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s
+++ /dev/null
@@ -1,221 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802407D4_CCBAE4
-/* CCBAE4 802407D4 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* CCBAE8 802407D8 24040001 */  addiu     $a0, $zero, 1
-/* CCBAEC 802407DC 27A50010 */  addiu     $a1, $sp, 0x10
-/* CCBAF0 802407E0 27A60014 */  addiu     $a2, $sp, 0x14
-/* CCBAF4 802407E4 AFBF0030 */  sw        $ra, 0x30($sp)
-/* CCBAF8 802407E8 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CCBAFC 802407EC AFB20028 */  sw        $s2, 0x28($sp)
-/* CCBB00 802407F0 AFB10024 */  sw        $s1, 0x24($sp)
-/* CCBB04 802407F4 AFB00020 */  sw        $s0, 0x20($sp)
-/* CCBB08 802407F8 F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* CCBB0C 802407FC F7B80048 */  sdc1      $f24, 0x48($sp)
-/* CCBB10 80240800 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* CCBB14 80240804 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* CCBB18 80240808 0C0470AC */  jal       func_8011C2B0
-/* CCBB1C 8024080C 27A70018 */   addiu    $a3, $sp, 0x18
-/* CCBB20 80240810 8FA20018 */  lw        $v0, 0x18($sp)
-/* CCBB24 80240814 18400072 */  blez      $v0, .L802409E0
-/* CCBB28 80240818 0000902D */   daddu    $s2, $zero, $zero
-/* CCBB2C 8024081C 3C138024 */  lui       $s3, %hi(D_80243B18_CCEE28)
-/* CCBB30 80240820 26733B18 */  addiu     $s3, $s3, %lo(D_80243B18_CCEE28)
-/* CCBB34 80240824 3C014334 */  lui       $at, 0x4334
-/* CCBB38 80240828 4481D000 */  mtc1      $at, $f26
-/* CCBB3C 8024082C 3C018024 */  lui       $at, %hi(D_80245330_CD0640)
-/* CCBB40 80240830 D4385330 */  ldc1      $f24, %lo(D_80245330_CD0640)($at)
-/* CCBB44 80240834 3C018024 */  lui       $at, %hi(D_80245338_CD0648)
-/* CCBB48 80240838 D4365338 */  ldc1      $f22, %lo(D_80245338_CD0648)($at)
-/* CCBB4C 8024083C 00122100 */  sll       $a0, $s2, 4
-.L80240840:
-/* CCBB50 80240840 8FA20010 */  lw        $v0, 0x10($sp)
-/* CCBB54 80240844 8FA30014 */  lw        $v1, 0x14($sp)
-/* CCBB58 80240848 00448021 */  addu      $s0, $v0, $a0
-/* CCBB5C 8024084C 86020000 */  lh        $v0, ($s0)
-/* CCBB60 80240850 28420259 */  slti      $v0, $v0, 0x259
-/* CCBB64 80240854 1040005D */  beqz      $v0, .L802409CC
-/* CCBB68 80240858 00648821 */   addu     $s1, $v1, $a0
-/* CCBB6C 8024085C C66C0000 */  lwc1      $f12, ($s3)
-/* CCBB70 80240860 46806320 */  cvt.s.w   $f12, $f12
-/* CCBB74 80240864 461A6303 */  div.s     $f12, $f12, $f26
-/* CCBB78 80240868 46006321 */  cvt.d.s   $f12, $f12
-/* CCBB7C 8024086C 46386302 */  mul.d     $f12, $f12, $f24
-/* CCBB80 80240870 00000000 */  nop
-/* CCBB84 80240874 0C00A85B */  jal       sin_rad
-/* CCBB88 80240878 46206320 */   cvt.s.d  $f12, $f12
-/* CCBB8C 8024087C C66C0000 */  lwc1      $f12, ($s3)
-/* CCBB90 80240880 46806320 */  cvt.s.w   $f12, $f12
-/* CCBB94 80240884 461A6303 */  div.s     $f12, $f12, $f26
-/* CCBB98 80240888 46006321 */  cvt.d.s   $f12, $f12
-/* CCBB9C 8024088C 46386302 */  mul.d     $f12, $f12, $f24
-/* CCBBA0 80240890 00000000 */  nop
-/* CCBBA4 80240894 3C018024 */  lui       $at, %hi(D_80245340_CD0650)
-/* CCBBA8 80240898 D4225340 */  ldc1      $f2, %lo(D_80245340_CD0650)($at)
-/* CCBBAC 8024089C 46000521 */  cvt.d.s   $f20, $f0
-/* CCBBB0 802408A0 4622A502 */  mul.d     $f20, $f20, $f2
-/* CCBBB4 802408A4 00000000 */  nop
-/* CCBBB8 802408A8 3C018024 */  lui       $at, %hi(D_80245348_CD0658)
-/* CCBBBC 802408AC D4205348 */  ldc1      $f0, %lo(D_80245348_CD0658)($at)
-/* CCBBC0 802408B0 4620A500 */  add.d     $f20, $f20, $f0
-/* CCBBC4 802408B4 46206320 */  cvt.s.d   $f12, $f12
-/* CCBBC8 802408B8 0C00A85B */  jal       sin_rad
-/* CCBBCC 802408BC 4620A520 */   cvt.s.d  $f20, $f20
-/* CCBBD0 802408C0 46000021 */  cvt.d.s   $f0, $f0
-/* CCBBD4 802408C4 46360002 */  mul.d     $f0, $f0, $f22
-/* CCBBD8 802408C8 00000000 */  nop
-/* CCBBDC 802408CC 86020000 */  lh        $v0, ($s0)
-/* CCBBE0 802408D0 2442FD98 */  addiu     $v0, $v0, -0x268
-/* CCBBE4 802408D4 44822000 */  mtc1      $v0, $f4
-/* CCBBE8 802408D8 00000000 */  nop
-/* CCBBEC 802408DC 46802120 */  cvt.s.w   $f4, $f4
-/* CCBBF0 802408E0 46142102 */  mul.s     $f4, $f4, $f20
-/* CCBBF4 802408E4 00000000 */  nop
-/* CCBBF8 802408E8 4620B001 */  sub.d     $f0, $f22, $f0
-/* CCBBFC 802408EC 3C01C240 */  lui       $at, 0xc240
-/* CCBC00 802408F0 44813000 */  mtc1      $at, $f6
-/* CCBC04 802408F4 46200020 */  cvt.s.d   $f0, $f0
-/* CCBC08 802408F8 46060182 */  mul.s     $f6, $f0, $f6
-/* CCBC0C 802408FC 00000000 */  nop
-/* CCBC10 80240900 3C01441A */  lui       $at, 0x441a
-/* CCBC14 80240904 44811000 */  mtc1      $at, $f2
-/* CCBC18 80240908 00000000 */  nop
-/* CCBC1C 8024090C 46022100 */  add.s     $f4, $f4, $f2
-/* CCBC20 80240910 46062100 */  add.s     $f4, $f4, $f6
-/* CCBC24 80240914 3C0141C8 */  lui       $at, 0x41c8
-/* CCBC28 80240918 44813000 */  mtc1      $at, $f6
-/* CCBC2C 8024091C 00000000 */  nop
-/* CCBC30 80240920 46060182 */  mul.s     $f6, $f0, $f6
-/* CCBC34 80240924 00000000 */  nop
-/* CCBC38 80240928 4600220D */  trunc.w.s $f8, $f4
-/* CCBC3C 8024092C 44024000 */  mfc1      $v0, $f8
-/* CCBC40 80240930 00000000 */  nop
-/* CCBC44 80240934 A6220000 */  sh        $v0, ($s1)
-/* CCBC48 80240938 86020002 */  lh        $v0, 2($s0)
-/* CCBC4C 8024093C 2442FFD4 */  addiu     $v0, $v0, -0x2c
-/* CCBC50 80240940 44821000 */  mtc1      $v0, $f2
-/* CCBC54 80240944 00000000 */  nop
-/* CCBC58 80240948 468010A0 */  cvt.s.w   $f2, $f2
-/* CCBC5C 8024094C 46141082 */  mul.s     $f2, $f2, $f20
-/* CCBC60 80240950 00000000 */  nop
-/* CCBC64 80240954 3C014230 */  lui       $at, 0x4230
-/* CCBC68 80240958 44812000 */  mtc1      $at, $f4
-/* CCBC6C 8024095C 00000000 */  nop
-/* CCBC70 80240960 46041080 */  add.s     $f2, $f2, $f4
-/* CCBC74 80240964 46061080 */  add.s     $f2, $f2, $f6
-/* CCBC78 80240968 3C01C2AE */  lui       $at, 0xc2ae
-/* CCBC7C 8024096C 44812000 */  mtc1      $at, $f4
-/* CCBC80 80240970 00000000 */  nop
-/* CCBC84 80240974 46040002 */  mul.s     $f0, $f0, $f4
-/* CCBC88 80240978 00000000 */  nop
-/* CCBC8C 8024097C 4600120D */  trunc.w.s $f8, $f2
-/* CCBC90 80240980 44024000 */  mfc1      $v0, $f8
-/* CCBC94 80240984 00000000 */  nop
-/* CCBC98 80240988 A6220002 */  sh        $v0, 2($s1)
-/* CCBC9C 8024098C 86020004 */  lh        $v0, 4($s0)
-/* CCBCA0 80240990 2442FF8F */  addiu     $v0, $v0, -0x71
-/* CCBCA4 80240994 44821000 */  mtc1      $v0, $f2
-/* CCBCA8 80240998 00000000 */  nop
-/* CCBCAC 8024099C 468010A0 */  cvt.s.w   $f2, $f2
-/* CCBCB0 802409A0 46141082 */  mul.s     $f2, $f2, $f20
-/* CCBCB4 802409A4 00000000 */  nop
-/* CCBCB8 802409A8 3C0142E2 */  lui       $at, 0x42e2
-/* CCBCBC 802409AC 44812000 */  mtc1      $at, $f4
-/* CCBCC0 802409B0 00000000 */  nop
-/* CCBCC4 802409B4 46041080 */  add.s     $f2, $f2, $f4
-/* CCBCC8 802409B8 46001080 */  add.s     $f2, $f2, $f0
-/* CCBCCC 802409BC 4600120D */  trunc.w.s $f8, $f2
-/* CCBCD0 802409C0 44024000 */  mfc1      $v0, $f8
-/* CCBCD4 802409C4 00000000 */  nop
-/* CCBCD8 802409C8 A6220004 */  sh        $v0, 4($s1)
-.L802409CC:
-/* CCBCDC 802409CC 8FA20018 */  lw        $v0, 0x18($sp)
-/* CCBCE0 802409D0 26520001 */  addiu     $s2, $s2, 1
-/* CCBCE4 802409D4 0242102A */  slt       $v0, $s2, $v0
-/* CCBCE8 802409D8 1440FF99 */  bnez      $v0, .L80240840
-/* CCBCEC 802409DC 00122100 */   sll      $a0, $s2, 4
-.L802409E0:
-/* CCBCF0 802409E0 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* CCBCF4 802409E4 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* CCBCF8 802409E8 8C620000 */  lw        $v0, ($v1)
-/* CCBCFC 802409EC 24040001 */  addiu     $a0, $zero, 1
-/* CCBD00 802409F0 0040802D */  daddu     $s0, $v0, $zero
-/* CCBD04 802409F4 24420008 */  addiu     $v0, $v0, 8
-/* CCBD08 802409F8 AC620000 */  sw        $v0, ($v1)
-/* CCBD0C 802409FC 3C02DE00 */  lui       $v0, 0xde00
-/* CCBD10 80240A00 0C0470BB */  jal       func_8011C2EC
-/* CCBD14 80240A04 AE020000 */   sw       $v0, ($s0)
-/* CCBD18 80240A08 0000202D */  daddu     $a0, $zero, $zero
-/* CCBD1C 80240A0C 3C05F971 */  lui       $a1, 0xf971
-/* CCBD20 80240A10 34A588A4 */  ori       $a1, $a1, 0x88a4
-/* CCBD24 80240A14 0C0B1EAF */  jal       get_variable
-/* CCBD28 80240A18 AE020004 */   sw       $v0, 4($s0)
-/* CCBD2C 80240A1C 10400017 */  beqz      $v0, .L80240A7C
-/* CCBD30 80240A20 00000000 */   nop
-/* CCBD34 80240A24 3C048024 */  lui       $a0, %hi(D_80243B18_CCEE28)
-/* CCBD38 80240A28 24843B18 */  addiu     $a0, $a0, %lo(D_80243B18_CCEE28)
-/* CCBD3C 80240A2C 8C830000 */  lw        $v1, ($a0)
-/* CCBD40 80240A30 2862005B */  slti      $v0, $v1, 0x5b
-/* CCBD44 80240A34 14400005 */  bnez      $v0, .L80240A4C
-/* CCBD48 80240A38 2862FFA6 */   slti     $v0, $v1, -0x5a
-/* CCBD4C 80240A3C 2462FE98 */  addiu     $v0, $v1, -0x168
-/* CCBD50 80240A40 AC820000 */  sw        $v0, ($a0)
-/* CCBD54 80240A44 8C830000 */  lw        $v1, ($a0)
-/* CCBD58 80240A48 2862FFA6 */  slti      $v0, $v1, -0x5a
-.L80240A4C:
-/* CCBD5C 80240A4C 14400002 */  bnez      $v0, .L80240A58
-/* CCBD60 80240A50 24620014 */   addiu    $v0, $v1, 0x14
-/* CCBD64 80240A54 24620005 */  addiu     $v0, $v1, 5
-.L80240A58:
-/* CCBD68 80240A58 AC820000 */  sw        $v0, ($a0)
-/* CCBD6C 80240A5C 3C038024 */  lui       $v1, %hi(D_80243B18_CCEE28)
-/* CCBD70 80240A60 24633B18 */  addiu     $v1, $v1, %lo(D_80243B18_CCEE28)
-/* CCBD74 80240A64 8C620000 */  lw        $v0, ($v1)
-/* CCBD78 80240A68 2842005A */  slti      $v0, $v0, 0x5a
-/* CCBD7C 80240A6C 14400013 */  bnez      $v0, .L80240ABC
-/* CCBD80 80240A70 2402005A */   addiu    $v0, $zero, 0x5a
-/* CCBD84 80240A74 080902AF */  j         .L80240ABC
-/* CCBD88 80240A78 AC620000 */   sw       $v0, ($v1)
-.L80240A7C:
-/* CCBD8C 80240A7C 3C028024 */  lui       $v0, %hi(D_80243B18_CCEE28)
-/* CCBD90 80240A80 8C423B18 */  lw        $v0, %lo(D_80243B18_CCEE28)($v0)
-/* CCBD94 80240A84 2442FF73 */  addiu     $v0, $v0, -0x8d
-/* CCBD98 80240A88 2C420077 */  sltiu     $v0, $v0, 0x77
-/* CCBD9C 80240A8C 10400004 */  beqz      $v0, .L80240AA0
-/* CCBDA0 80240A90 24020001 */   addiu    $v0, $zero, 1
-/* CCBDA4 80240A94 3C018024 */  lui       $at, %hi(D_802431CC_CCE4DC)
-/* CCBDA8 80240A98 080902AA */  j         .L80240AA8
-/* CCBDAC 80240A9C AC2231CC */   sw       $v0, %lo(D_802431CC_CCE4DC)($at)
-.L80240AA0:
-/* CCBDB0 80240AA0 3C018024 */  lui       $at, %hi(D_802431CC_CCE4DC)
-/* CCBDB4 80240AA4 AC2031CC */  sw        $zero, %lo(D_802431CC_CCE4DC)($at)
-.L80240AA8:
-/* CCBDB8 80240AA8 3C038024 */  lui       $v1, %hi(D_80243B18_CCEE28)
-/* CCBDBC 80240AAC 24633B18 */  addiu     $v1, $v1, %lo(D_80243B18_CCEE28)
-/* CCBDC0 80240AB0 8C620000 */  lw        $v0, ($v1)
-/* CCBDC4 80240AB4 24420005 */  addiu     $v0, $v0, 5
-/* CCBDC8 80240AB8 AC620000 */  sw        $v0, ($v1)
-.L80240ABC:
-/* CCBDCC 80240ABC 3C048024 */  lui       $a0, %hi(D_80243B18_CCEE28)
-/* CCBDD0 80240AC0 24843B18 */  addiu     $a0, $a0, %lo(D_80243B18_CCEE28)
-/* CCBDD4 80240AC4 8C830000 */  lw        $v1, ($a0)
-/* CCBDD8 80240AC8 28620168 */  slti      $v0, $v1, 0x168
-/* CCBDDC 80240ACC 14400002 */  bnez      $v0, .L80240AD8
-/* CCBDE0 80240AD0 2462FE98 */   addiu    $v0, $v1, -0x168
-/* CCBDE4 80240AD4 AC820000 */  sw        $v0, ($a0)
-.L80240AD8:
-/* CCBDE8 80240AD8 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CCBDEC 80240ADC 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CCBDF0 80240AE0 8FB20028 */  lw        $s2, 0x28($sp)
-/* CCBDF4 80240AE4 8FB10024 */  lw        $s1, 0x24($sp)
-/* CCBDF8 80240AE8 8FB00020 */  lw        $s0, 0x20($sp)
-/* CCBDFC 80240AEC D7BA0050 */  ldc1      $f26, 0x50($sp)
-/* CCBE00 80240AF0 D7B80048 */  ldc1      $f24, 0x48($sp)
-/* CCBE04 80240AF4 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* CCBE08 80240AF8 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* CCBE0C 80240AFC 03E00008 */  jr        $ra
-/* CCBE10 80240B00 27BD0058 */   addiu    $sp, $sp, 0x58
-/* CCBE14 80240B04 00000000 */  nop
-/* CCBE18 80240B08 00000000 */  nop
-/* CCBE1C 80240B0C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/flo_14_func_80240CC0_CCBFD0.s
similarity index 99%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/flo_14_func_80240CC0_CCBFD0.s
index 3001629ff5..e8708b2a7b 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/flo_14_func_80240CC0_CCBFD0.s
@@ -1,7 +1,17 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80240CC0_CCBFD0
+.section .rodata
+
+glabel D_80245358_CD0668
+.double 0.09
+
+glabel D_80245360_CD0670
+.double 0.09
+
+.section .text
+
+glabel flo_14_func_80240CC0_CCBFD0
 /* CCBFD0 80240CC0 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* CCBFD4 80240CC4 AFB3004C */  sw        $s3, 0x4c($sp)
 /* CCBFD8 80240CC8 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s
deleted file mode 100644
index f713ec88b9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B10_CCBE20
-/* CCBE20 80240B10 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CCBE24 80240B14 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CCBE28 80240B18 0080982D */  daddu     $s3, $a0, $zero
-/* CCBE2C 80240B1C AFBF0030 */  sw        $ra, 0x30($sp)
-/* CCBE30 80240B20 AFB20028 */  sw        $s2, 0x28($sp)
-/* CCBE34 80240B24 AFB10024 */  sw        $s1, 0x24($sp)
-/* CCBE38 80240B28 AFB00020 */  sw        $s0, 0x20($sp)
-/* CCBE3C 80240B2C 8E710148 */  lw        $s1, 0x148($s3)
-/* CCBE40 80240B30 86240008 */  lh        $a0, 8($s1)
-/* CCBE44 80240B34 0C00EABB */  jal       get_npc_unsafe
-/* CCBE48 80240B38 00A0902D */   daddu    $s2, $a1, $zero
-/* CCBE4C 80240B3C 8E440004 */  lw        $a0, 4($s2)
-/* CCBE50 80240B40 0040802D */  daddu     $s0, $v0, $zero
-/* CCBE54 80240B44 00041FC2 */  srl       $v1, $a0, 0x1f
-/* CCBE58 80240B48 00832021 */  addu      $a0, $a0, $v1
-/* CCBE5C 80240B4C 00042043 */  sra       $a0, $a0, 1
-/* CCBE60 80240B50 0C00A67F */  jal       rand_int
-/* CCBE64 80240B54 24840001 */   addiu    $a0, $a0, 1
-/* CCBE68 80240B58 8E430004 */  lw        $v1, 4($s2)
-/* CCBE6C 80240B5C 000327C2 */  srl       $a0, $v1, 0x1f
-/* CCBE70 80240B60 00641821 */  addu      $v1, $v1, $a0
-/* CCBE74 80240B64 00031843 */  sra       $v1, $v1, 1
-/* CCBE78 80240B68 00621821 */  addu      $v1, $v1, $v0
-/* CCBE7C 80240B6C A603008E */  sh        $v1, 0x8e($s0)
-/* CCBE80 80240B70 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CCBE84 80240B74 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CCBE88 80240B78 C4640000 */  lwc1      $f4, ($v1)
-/* CCBE8C 80240B7C 46802120 */  cvt.s.w   $f4, $f4
-/* CCBE90 80240B80 C4620008 */  lwc1      $f2, 8($v1)
-/* CCBE94 80240B84 468010A0 */  cvt.s.w   $f2, $f2
-/* CCBE98 80240B88 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CCBE9C 80240B8C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CCBEA0 80240B90 44061000 */  mfc1      $a2, $f2
-/* CCBEA4 80240B94 C440000C */  lwc1      $f0, 0xc($v0)
-/* CCBEA8 80240B98 46800020 */  cvt.s.w   $f0, $f0
-/* CCBEAC 80240B9C E7A00014 */  swc1      $f0, 0x14($sp)
-/* CCBEB0 80240BA0 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CCBEB4 80240BA4 44052000 */  mfc1      $a1, $f4
-/* CCBEB8 80240BA8 C4400010 */  lwc1      $f0, 0x10($v0)
-/* CCBEBC 80240BAC 46800020 */  cvt.s.w   $f0, $f0
-/* CCBEC0 80240BB0 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CCBEC4 80240BB4 8C640018 */  lw        $a0, 0x18($v1)
-/* CCBEC8 80240BB8 0C0123F5 */  jal       is_point_within_region
-/* CCBECC 80240BBC 8E070038 */   lw       $a3, 0x38($s0)
-/* CCBED0 80240BC0 1040000E */  beqz      $v0, .L80240BFC
-/* CCBED4 80240BC4 00000000 */   nop
-/* CCBED8 80240BC8 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CCBEDC 80240BCC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CCBEE0 80240BD0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CCBEE4 80240BD4 C4460000 */  lwc1      $f6, ($v0)
-/* CCBEE8 80240BD8 468031A0 */  cvt.s.w   $f6, $f6
-/* CCBEEC 80240BDC 44063000 */  mfc1      $a2, $f6
-/* CCBEF0 80240BE0 C4460008 */  lwc1      $f6, 8($v0)
-/* CCBEF4 80240BE4 468031A0 */  cvt.s.w   $f6, $f6
-/* CCBEF8 80240BE8 44073000 */  mfc1      $a3, $f6
-/* CCBEFC 80240BEC 0C00A720 */  jal       atan2
-/* CCBF00 80240BF0 00000000 */   nop
-/* CCBF04 80240BF4 0809030B */  j         .L80240C2C
-/* CCBF08 80240BF8 E600000C */   swc1     $f0, 0xc($s0)
-.L80240BFC:
-/* CCBF0C 80240BFC 0C00A67F */  jal       rand_int
-/* CCBF10 80240C00 2404003C */   addiu    $a0, $zero, 0x3c
-/* CCBF14 80240C04 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CCBF18 80240C08 44820000 */  mtc1      $v0, $f0
-/* CCBF1C 80240C0C 00000000 */  nop
-/* CCBF20 80240C10 46800020 */  cvt.s.w   $f0, $f0
-/* CCBF24 80240C14 46006300 */  add.s     $f12, $f12, $f0
-/* CCBF28 80240C18 3C0141F0 */  lui       $at, 0x41f0
-/* CCBF2C 80240C1C 44810000 */  mtc1      $at, $f0
-/* CCBF30 80240C20 0C00A6C9 */  jal       clamp_angle
-/* CCBF34 80240C24 46006301 */   sub.s    $f12, $f12, $f0
-/* CCBF38 80240C28 E600000C */  swc1      $f0, 0xc($s0)
-.L80240C2C:
-/* CCBF3C 80240C2C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CCBF40 80240C30 8C420004 */  lw        $v0, 4($v0)
-/* CCBF44 80240C34 AE020028 */  sw        $v0, 0x28($s0)
-/* CCBF48 80240C38 AE600074 */  sw        $zero, 0x74($s3)
-/* CCBF4C 80240C3C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CCBF50 80240C40 8C420014 */  lw        $v0, 0x14($v0)
-/* CCBF54 80240C44 04410004 */  bgez      $v0, .L80240C58
-/* CCBF58 80240C48 00000000 */   nop
-/* CCBF5C 80240C4C C6400000 */  lwc1      $f0, ($s2)
-/* CCBF60 80240C50 0809031E */  j         .L80240C78
-/* CCBF64 80240C54 E6000018 */   swc1     $f0, 0x18($s0)
-.L80240C58:
-/* CCBF68 80240C58 3C018024 */  lui       $at, %hi(D_80245350_CD0660)
-/* CCBF6C 80240C5C D4225350 */  ldc1      $f2, %lo(D_80245350_CD0660)($at)
-/* CCBF70 80240C60 44820000 */  mtc1      $v0, $f0
-/* CCBF74 80240C64 00000000 */  nop
-/* CCBF78 80240C68 46800021 */  cvt.d.w   $f0, $f0
-/* CCBF7C 80240C6C 46220003 */  div.d     $f0, $f0, $f2
-/* CCBF80 80240C70 46200020 */  cvt.s.d   $f0, $f0
-/* CCBF84 80240C74 E6000018 */  swc1      $f0, 0x18($s0)
-.L80240C78:
-/* CCBF88 80240C78 C600003C */  lwc1      $f0, 0x3c($s0)
-/* CCBF8C 80240C7C 3C014059 */  lui       $at, 0x4059
-/* CCBF90 80240C80 44811800 */  mtc1      $at, $f3
-/* CCBF94 80240C84 44801000 */  mtc1      $zero, $f2
-/* CCBF98 80240C88 46000021 */  cvt.d.s   $f0, $f0
-/* CCBF9C 80240C8C 46220002 */  mul.d     $f0, $f0, $f2
-/* CCBFA0 80240C90 00000000 */  nop
-/* CCBFA4 80240C94 24020001 */  addiu     $v0, $zero, 1
-/* CCBFA8 80240C98 4620018D */  trunc.w.d $f6, $f0
-/* CCBFAC 80240C9C E626007C */  swc1      $f6, 0x7c($s1)
-/* CCBFB0 80240CA0 AE620070 */  sw        $v0, 0x70($s3)
-/* CCBFB4 80240CA4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CCBFB8 80240CA8 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CCBFBC 80240CAC 8FB20028 */  lw        $s2, 0x28($sp)
-/* CCBFC0 80240CB0 8FB10024 */  lw        $s1, 0x24($sp)
-/* CCBFC4 80240CB4 8FB00020 */  lw        $s0, 0x20($sp)
-/* CCBFC8 80240CB8 03E00008 */  jr        $ra
-/* CCBFCC 80240CBC 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s
deleted file mode 100644
index 9c9d380583..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241764_CCCA74
-/* CCCA74 80241764 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCCA78 80241768 AFB00010 */  sw        $s0, 0x10($sp)
-/* CCCA7C 8024176C 0080802D */  daddu     $s0, $a0, $zero
-/* CCCA80 80241770 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CCCA84 80241774 8E020148 */  lw        $v0, 0x148($s0)
-/* CCCA88 80241778 0C00EABB */  jal       get_npc_unsafe
-/* CCCA8C 8024177C 84440008 */   lh       $a0, 8($v0)
-/* CCCA90 80241780 9443008E */  lhu       $v1, 0x8e($v0)
-/* CCCA94 80241784 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CCCA98 80241788 24640001 */  addiu     $a0, $v1, 1
-/* CCCA9C 8024178C 00031C00 */  sll       $v1, $v1, 0x10
-/* CCCAA0 80241790 00031B83 */  sra       $v1, $v1, 0xe
-/* CCCAA4 80241794 A444008E */  sh        $a0, 0x8e($v0)
-/* CCCAA8 80241798 3C018024 */  lui       $at, %hi(D_802444C0_CCF7D0)
-/* CCCAAC 8024179C 00230821 */  addu      $at, $at, $v1
-/* CCCAB0 802417A0 C42244C0 */  lwc1      $f2, %lo(D_802444C0_CCF7D0)($at)
-/* CCCAB4 802417A4 8443008E */  lh        $v1, 0x8e($v0)
-/* CCCAB8 802417A8 46020000 */  add.s     $f0, $f0, $f2
-/* CCCABC 802417AC 28630005 */  slti      $v1, $v1, 5
-/* CCCAC0 802417B0 14600003 */  bnez      $v1, .L802417C0
-/* CCCAC4 802417B4 E440003C */   swc1     $f0, 0x3c($v0)
-/* CCCAC8 802417B8 2402000C */  addiu     $v0, $zero, 0xc
-/* CCCACC 802417BC AE020070 */  sw        $v0, 0x70($s0)
-.L802417C0:
-/* CCCAD0 802417C0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CCCAD4 802417C4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CCCAD8 802417C8 03E00008 */  jr        $ra
-/* CCCADC 802417CC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s
deleted file mode 100644
index 6ac5833328..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E1C_CCD12C
-/* CCD12C 80241E1C 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CCD130 80241E20 AFB40040 */  sw        $s4, 0x40($sp)
-/* CCD134 80241E24 0080A02D */  daddu     $s4, $a0, $zero
-/* CCD138 80241E28 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CCD13C 80241E2C AFB50044 */  sw        $s5, 0x44($sp)
-/* CCD140 80241E30 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CCD144 80241E34 AFB20038 */  sw        $s2, 0x38($sp)
-/* CCD148 80241E38 AFB10034 */  sw        $s1, 0x34($sp)
-/* CCD14C 80241E3C AFB00030 */  sw        $s0, 0x30($sp)
-/* CCD150 80241E40 8E920148 */  lw        $s2, 0x148($s4)
-/* CCD154 80241E44 86440008 */  lh        $a0, 8($s2)
-/* CCD158 80241E48 8E90000C */  lw        $s0, 0xc($s4)
-/* CCD15C 80241E4C 0C00EABB */  jal       get_npc_unsafe
-/* CCD160 80241E50 00A0882D */   daddu    $s1, $a1, $zero
-/* CCD164 80241E54 0280202D */  daddu     $a0, $s4, $zero
-/* CCD168 80241E58 8E050000 */  lw        $a1, ($s0)
-/* CCD16C 80241E5C 0C0B1EAF */  jal       get_variable
-/* CCD170 80241E60 0040A82D */   daddu    $s5, $v0, $zero
-/* CCD174 80241E64 AFA00010 */  sw        $zero, 0x10($sp)
-/* CCD178 80241E68 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CCD17C 80241E6C 8C630030 */  lw        $v1, 0x30($v1)
-/* CCD180 80241E70 AFA30014 */  sw        $v1, 0x14($sp)
-/* CCD184 80241E74 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CCD188 80241E78 8C63001C */  lw        $v1, 0x1c($v1)
-/* CCD18C 80241E7C AFA30018 */  sw        $v1, 0x18($sp)
-/* CCD190 80241E80 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CCD194 80241E84 8C630024 */  lw        $v1, 0x24($v1)
-/* CCD198 80241E88 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CCD19C 80241E8C 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CCD1A0 80241E90 8C630028 */  lw        $v1, 0x28($v1)
-/* CCD1A4 80241E94 27B30010 */  addiu     $s3, $sp, 0x10
-/* CCD1A8 80241E98 AFA30020 */  sw        $v1, 0x20($sp)
-/* CCD1AC 80241E9C 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CCD1B0 80241EA0 3C0142F0 */  lui       $at, 0x42f0
-/* CCD1B4 80241EA4 44810000 */  mtc1      $at, $f0
-/* CCD1B8 80241EA8 8C63002C */  lw        $v1, 0x2c($v1)
-/* CCD1BC 80241EAC 0040802D */  daddu     $s0, $v0, $zero
-/* CCD1C0 80241EB0 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CCD1C4 80241EB4 A7A0002C */  sh        $zero, 0x2c($sp)
-/* CCD1C8 80241EB8 12200006 */  beqz      $s1, .L80241ED4
-/* CCD1CC 80241EBC AFA30024 */   sw       $v1, 0x24($sp)
-/* CCD1D0 80241EC0 02A0202D */  daddu     $a0, $s5, $zero
-/* CCD1D4 80241EC4 0240282D */  daddu     $a1, $s2, $zero
-/* CCD1D8 80241EC8 0280302D */  daddu     $a2, $s4, $zero
-/* CCD1DC 80241ECC 0C09073E */  jal       flo_14_UnkFunc5
-/* CCD1E0 80241ED0 0200382D */   daddu    $a3, $s0, $zero
-.L80241ED4:
-/* CCD1E4 80241ED4 2402FFFE */  addiu     $v0, $zero, -2
-/* CCD1E8 80241ED8 A2A200AB */  sb        $v0, 0xab($s5)
-/* CCD1EC 80241EDC 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CCD1F0 80241EE0 30620004 */  andi      $v0, $v1, 4
-/* CCD1F4 80241EE4 10400007 */  beqz      $v0, .L80241F04
-/* CCD1F8 80241EE8 00000000 */   nop
-/* CCD1FC 80241EEC 824200B4 */  lb        $v0, 0xb4($s2)
-/* CCD200 80241EF0 1440003C */  bnez      $v0, .L80241FE4
-/* CCD204 80241EF4 0000102D */   daddu    $v0, $zero, $zero
-/* CCD208 80241EF8 2402FFFB */  addiu     $v0, $zero, -5
-/* CCD20C 80241EFC 00621024 */  and       $v0, $v1, $v0
-/* CCD210 80241F00 AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80241F04:
-/* CCD214 80241F04 8E830070 */  lw        $v1, 0x70($s4)
-/* CCD218 80241F08 2C62000F */  sltiu     $v0, $v1, 0xf
-/* CCD21C 80241F0C 10400034 */  beqz      $v0, L80241FE0_CCD2F0
-/* CCD220 80241F10 00031080 */   sll      $v0, $v1, 2
-/* CCD224 80241F14 3C018024 */  lui       $at, %hi(jtbl_80245368_CD0678)
-/* CCD228 80241F18 00220821 */  addu      $at, $at, $v0
-/* CCD22C 80241F1C 8C225368 */  lw        $v0, %lo(jtbl_80245368_CD0678)($at)
-/* CCD230 80241F20 00400008 */  jr        $v0
-/* CCD234 80241F24 00000000 */   nop
-glabel L80241F28_CCD238
-/* CCD238 80241F28 0280202D */  daddu     $a0, $s4, $zero
-/* CCD23C 80241F2C 0200282D */  daddu     $a1, $s0, $zero
-/* CCD240 80241F30 0C0902C4 */  jal       func_80240B10_CCBE20
-/* CCD244 80241F34 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241F38_CCD248
-/* CCD248 80241F38 0280202D */  daddu     $a0, $s4, $zero
-/* CCD24C 80241F3C 0200282D */  daddu     $a1, $s0, $zero
-/* CCD250 80241F40 0C090330 */  jal       func_80240CC0_CCBFD0
-/* CCD254 80241F44 0260302D */   daddu    $a2, $s3, $zero
-/* CCD258 80241F48 080907F9 */  j         .L80241FE4
-/* CCD25C 80241F4C 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241F50_CCD260
-/* CCD260 80241F50 0280202D */  daddu     $a0, $s4, $zero
-/* CCD264 80241F54 0200282D */  daddu     $a1, $s0, $zero
-/* CCD268 80241F58 0C0904BA */  jal       flo_14_UnkNpcAIFunc1
-/* CCD26C 80241F5C 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241F60_CCD270
-/* CCD270 80241F60 0280202D */  daddu     $a0, $s4, $zero
-/* CCD274 80241F64 0200282D */  daddu     $a1, $s0, $zero
-/* CCD278 80241F68 0C0904EA */  jal       flo_14_UnkFunc4
-/* CCD27C 80241F6C 0260302D */   daddu    $a2, $s3, $zero
-/* CCD280 80241F70 080907F9 */  j         .L80241FE4
-/* CCD284 80241F74 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241F78_CCD288
-/* CCD288 80241F78 0280202D */  daddu     $a0, $s4, $zero
-/* CCD28C 80241F7C 0200282D */  daddu     $a1, $s0, $zero
-/* CCD290 80241F80 0C0905BB */  jal       flo_14_UnkNpcAIFunc2
-/* CCD294 80241F84 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241F88_CCD298
-/* CCD298 80241F88 0280202D */  daddu     $a0, $s4, $zero
-/* CCD29C 80241F8C 0200282D */  daddu     $a1, $s0, $zero
-/* CCD2A0 80241F90 0C0905D9 */  jal       func_80241764_CCCA74
-/* CCD2A4 80241F94 0260302D */   daddu    $a2, $s3, $zero
-/* CCD2A8 80241F98 080907F9 */  j         .L80241FE4
-/* CCD2AC 80241F9C 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241FA0_CCD2B0
-/* CCD2B0 80241FA0 0280202D */  daddu     $a0, $s4, $zero
-/* CCD2B4 80241FA4 0200282D */  daddu     $a1, $s0, $zero
-/* CCD2B8 80241FA8 0C0905F4 */  jal       flo_14_UnkNpcAIFunc14
-/* CCD2BC 80241FAC 0260302D */   daddu    $a2, $s3, $zero
-/* CCD2C0 80241FB0 080907F9 */  j         .L80241FE4
-/* CCD2C4 80241FB4 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241FB8_CCD2C8
-/* CCD2C8 80241FB8 0280202D */  daddu     $a0, $s4, $zero
-/* CCD2CC 80241FBC 0200282D */  daddu     $a1, $s0, $zero
-/* CCD2D0 80241FC0 0C090641 */  jal       flo_14_UnkNpcAIFunc3
-/* CCD2D4 80241FC4 0260302D */   daddu    $a2, $s3, $zero
-/* CCD2D8 80241FC8 080907F9 */  j         .L80241FE4
-/* CCD2DC 80241FCC 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241FD0_CCD2E0
-/* CCD2E0 80241FD0 0280202D */  daddu     $a0, $s4, $zero
-/* CCD2E4 80241FD4 0200282D */  daddu     $a1, $s0, $zero
-/* CCD2E8 80241FD8 0C09065A */  jal       flo_14_UnkFunc6
-/* CCD2EC 80241FDC 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241FE0_CCD2F0
-/* CCD2F0 80241FE0 0000102D */  daddu     $v0, $zero, $zero
-.L80241FE4:
-/* CCD2F4 80241FE4 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CCD2F8 80241FE8 8FB50044 */  lw        $s5, 0x44($sp)
-/* CCD2FC 80241FEC 8FB40040 */  lw        $s4, 0x40($sp)
-/* CCD300 80241FF0 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CCD304 80241FF4 8FB20038 */  lw        $s2, 0x38($sp)
-/* CCD308 80241FF8 8FB10034 */  lw        $s1, 0x34($sp)
-/* CCD30C 80241FFC 8FB00030 */  lw        $s0, 0x30($sp)
-/* CCD310 80242000 03E00008 */  jr        $ra
-/* CCD314 80242004 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s
deleted file mode 100644
index a38b40a50d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242234_CCD544
-/* CCD544 80242234 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCD548 80242238 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CCD54C 8024223C 10A00003 */  beqz      $a1, .L8024224C
-/* CCD550 80242240 8C86000C */   lw       $a2, 0xc($a0)
-/* CCD554 80242244 3C018024 */  lui       $at, %hi(D_802445FC_CCF90C)
-/* CCD558 80242248 AC2045FC */  sw        $zero, %lo(D_802445FC_CCF90C)($at)
-.L8024224C:
-/* CCD55C 8024224C 3C038024 */  lui       $v1, %hi(D_802445FC_CCF90C)
-/* CCD560 80242250 246345FC */  addiu     $v1, $v1, %lo(D_802445FC_CCF90C)
-/* CCD564 80242254 8C620000 */  lw        $v0, ($v1)
-/* CCD568 80242258 54400003 */  bnel      $v0, $zero, .L80242268
-/* CCD56C 8024225C AC600000 */   sw       $zero, ($v1)
-/* CCD570 80242260 0809089F */  j         .L8024227C
-/* CCD574 80242264 0000102D */   daddu    $v0, $zero, $zero
-.L80242268:
-/* CCD578 80242268 8CC50000 */  lw        $a1, ($a2)
-/* CCD57C 8024226C 3C068024 */  lui       $a2, %hi(D_80244600_CCF910)
-/* CCD580 80242270 0C0B2026 */  jal       set_variable
-/* CCD584 80242274 8CC64600 */   lw       $a2, %lo(D_80244600_CCF910)($a2)
-/* CCD588 80242278 24020002 */  addiu     $v0, $zero, 2
-.L8024227C:
-/* CCD58C 8024227C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CCD590 80242280 03E00008 */  jr        $ra
-/* CCD594 80242284 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242288_CCD598.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242288_CCD598.s
deleted file mode 100644
index 891198c44e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242288_CCD598.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242288_CCD598
-/* CCD598 80242288 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCD59C 8024228C AFBF0010 */  sw        $ra, 0x10($sp)
-/* CCD5A0 80242290 8C82000C */  lw        $v0, 0xc($a0)
-/* CCD5A4 80242294 0C0B1EAF */  jal       get_variable
-/* CCD5A8 80242298 8C450000 */   lw       $a1, ($v0)
-/* CCD5AC 8024229C 3C018024 */  lui       $at, %hi(D_80244600_CCF910)
-/* CCD5B0 802422A0 AC224600 */  sw        $v0, %lo(D_80244600_CCF910)($at)
-/* CCD5B4 802422A4 24020002 */  addiu     $v0, $zero, 2
-/* CCD5B8 802422A8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CCD5BC 802422AC 24030001 */  addiu     $v1, $zero, 1
-/* CCD5C0 802422B0 3C018024 */  lui       $at, %hi(D_802445FC_CCF90C)
-/* CCD5C4 802422B4 AC2345FC */  sw        $v1, %lo(D_802445FC_CCF90C)($at)
-/* CCD5C8 802422B8 03E00008 */  jr        $ra
-/* CCD5CC 802422BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s
deleted file mode 100644
index 9d69ecee8e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422C0_CCD5D0
-/* CCD5D0 802422C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCD5D4 802422C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CCD5D8 802422C8 8C82000C */  lw        $v0, 0xc($a0)
-/* CCD5DC 802422CC 0C0B1EAF */  jal       get_variable
-/* CCD5E0 802422D0 8C450000 */   lw       $a1, ($v0)
-/* CCD5E4 802422D4 0040182D */  daddu     $v1, $v0, $zero
-/* CCD5E8 802422D8 10600012 */  beqz      $v1, .L80242324
-/* CCD5EC 802422DC 0000202D */   daddu    $a0, $zero, $zero
-/* CCD5F0 802422E0 8C620000 */  lw        $v0, ($v1)
-/* CCD5F4 802422E4 5040000A */  beql      $v0, $zero, .L80242310
-/* CCD5F8 802422E8 00041080 */   sll      $v0, $a0, 2
-/* CCD5FC 802422EC 3C058024 */  lui       $a1, %hi(D_802453B0_EF79C0)
-/* CCD600 802422F0 24A553B0 */  addiu     $a1, $a1, %lo(D_802453B0_EF79C0)
-.L802422F4:
-/* CCD604 802422F4 24630004 */  addiu     $v1, $v1, 4
-/* CCD608 802422F8 24840001 */  addiu     $a0, $a0, 1
-/* CCD60C 802422FC ACA20000 */  sw        $v0, ($a1)
-/* CCD610 80242300 8C620000 */  lw        $v0, ($v1)
-/* CCD614 80242304 1440FFFB */  bnez      $v0, .L802422F4
-/* CCD618 80242308 24A50004 */   addiu    $a1, $a1, 4
-/* CCD61C 8024230C 00041080 */  sll       $v0, $a0, 2
-.L80242310:
-/* CCD620 80242310 3C018024 */  lui       $at, %hi(D_802453B0_EF79C0)
-/* CCD624 80242314 00220821 */  addu      $at, $at, $v0
-/* CCD628 80242318 AC2053B0 */  sw        $zero, %lo(D_802453B0_EF79C0)($at)
-/* CCD62C 8024231C 080908D3 */  j         .L8024234C
-/* CCD630 80242320 00000000 */   nop
-.L80242324:
-/* CCD634 80242324 3C038024 */  lui       $v1, %hi(D_802453B0_EF79C0)
-/* CCD638 80242328 246353B0 */  addiu     $v1, $v1, %lo(D_802453B0_EF79C0)
-/* CCD63C 8024232C 0060282D */  daddu     $a1, $v1, $zero
-.L80242330:
-/* CCD640 80242330 24820080 */  addiu     $v0, $a0, 0x80
-/* CCD644 80242334 AC620000 */  sw        $v0, ($v1)
-/* CCD648 80242338 24630004 */  addiu     $v1, $v1, 4
-/* CCD64C 8024233C 24840001 */  addiu     $a0, $a0, 1
-/* CCD650 80242340 2882005B */  slti      $v0, $a0, 0x5b
-/* CCD654 80242344 1440FFFA */  bnez      $v0, .L80242330
-/* CCD658 80242348 ACA0016C */   sw       $zero, 0x16c($a1)
-.L8024234C:
-/* CCD65C 8024234C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CCD660 80242350 24020002 */  addiu     $v0, $zero, 2
-/* CCD664 80242354 03E00008 */  jr        $ra
-/* CCD668 80242358 27BD0018 */   addiu    $sp, $sp, 0x18
-/* CCD66C 8024235C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s
deleted file mode 100644
index 1072091f0d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242360_CCD670
-/* CCD670 80242360 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CCD674 80242364 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CCD678 80242368 8C82000C */  lw        $v0, 0xc($a0)
-/* CCD67C 8024236C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x6)
-/* CCD680 80242370 84C6A556 */  lh        $a2, %lo(gCollisionStatus+0x6)($a2)
-/* CCD684 80242374 0C0B2026 */  jal       set_variable
-/* CCD688 80242378 8C450000 */   lw       $a1, ($v0)
-/* CCD68C 8024237C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CCD690 80242380 24020002 */  addiu     $v0, $zero, 2
-/* CCD694 80242384 03E00008 */  jr        $ra
-/* CCD698 80242388 27BD0018 */   addiu    $sp, $sp, 0x18
-/* CCD69C 8024238C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1E30/func_80240000_CD1E30.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1E30/func_80240000_CD1E30.s
deleted file mode 100644
index a886f68b83..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1E30/func_80240000_CD1E30.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CD1E30
-/* CD1E30 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CD1E34 80240004 24040001 */  addiu     $a0, $zero, 1
-/* CD1E38 80240008 0000282D */  daddu     $a1, $zero, $zero
-/* CD1E3C 8024000C 00A0302D */  daddu     $a2, $a1, $zero
-/* CD1E40 80240010 00A0382D */  daddu     $a3, $a1, $zero
-/* CD1E44 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CD1E48 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CD1E4C 8024001C 0C01CA54 */  jal       func_80072950
-/* CD1E50 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CD1E54 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CD1E58 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CD1E5C 8024002C 03E00008 */  jr        $ra
-/* CD1E60 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CD1E64 80240034 00000000 */  nop
-/* CD1E68 80240038 00000000 */  nop
-/* CD1E6C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1E70/func_80240040_CD1E70.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1E70/func_80240040_CD1E70.s
deleted file mode 100644
index e8c86241b2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1E70/func_80240040_CD1E70.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CD1E70
-/* CD1E70 80240040 8C820084 */  lw        $v0, 0x84($a0)
-/* CD1E74 80240044 8C830090 */  lw        $v1, 0x90($a0)
-/* CD1E78 80240048 00431023 */  subu      $v0, $v0, $v1
-/* CD1E7C 8024004C 44821000 */  mtc1      $v0, $f2
-/* CD1E80 80240050 00000000 */  nop
-/* CD1E84 80240054 468010A0 */  cvt.s.w   $f2, $f2
-/* CD1E88 80240058 8C820088 */  lw        $v0, 0x88($a0)
-/* CD1E8C 8024005C 8C830094 */  lw        $v1, 0x94($a0)
-/* CD1E90 80240060 46021082 */  mul.s     $f2, $f2, $f2
-/* CD1E94 80240064 00000000 */  nop
-/* CD1E98 80240068 00431023 */  subu      $v0, $v0, $v1
-/* CD1E9C 8024006C 44822000 */  mtc1      $v0, $f4
-/* CD1EA0 80240070 00000000 */  nop
-/* CD1EA4 80240074 46802120 */  cvt.s.w   $f4, $f4
-/* CD1EA8 80240078 8C82008C */  lw        $v0, 0x8c($a0)
-/* CD1EAC 8024007C 46042102 */  mul.s     $f4, $f4, $f4
-/* CD1EB0 80240080 00000000 */  nop
-/* CD1EB4 80240084 8C830098 */  lw        $v1, 0x98($a0)
-/* CD1EB8 80240088 00431023 */  subu      $v0, $v0, $v1
-/* CD1EBC 8024008C 44820000 */  mtc1      $v0, $f0
-/* CD1EC0 80240090 00000000 */  nop
-/* CD1EC4 80240094 46800020 */  cvt.s.w   $f0, $f0
-/* CD1EC8 80240098 46000002 */  mul.s     $f0, $f0, $f0
-/* CD1ECC 8024009C 00000000 */  nop
-/* CD1ED0 802400A0 46041080 */  add.s     $f2, $f2, $f4
-/* CD1ED4 802400A4 46001080 */  add.s     $f2, $f2, $f0
-/* CD1ED8 802400A8 3C014561 */  lui       $at, 0x4561
-/* CD1EDC 802400AC 44810000 */  mtc1      $at, $f0
-/* CD1EE0 802400B0 00000000 */  nop
-/* CD1EE4 802400B4 4600103C */  c.lt.s    $f2, $f0
-/* CD1EE8 802400B8 00000000 */  nop
-/* CD1EEC 802400BC 45010002 */  bc1t      .L802400C8
-/* CD1EF0 802400C0 24020001 */   addiu    $v0, $zero, 1
-/* CD1EF4 802400C4 0000102D */  daddu     $v0, $zero, $zero
-.L802400C8:
-/* CD1EF8 802400C8 AC820084 */  sw        $v0, 0x84($a0)
-/* CD1EFC 802400CC 03E00008 */  jr        $ra
-/* CD1F00 802400D0 24020002 */   addiu    $v0, $zero, 2
-/* CD1F04 802400D4 00000000 */  nop
-/* CD1F08 802400D8 00000000 */  nop
-/* CD1F0C 802400DC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s
similarity index 93%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s
index 4810594ca7..8d0204d288 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/flo_16_func_802402AC_CD20DC.s
@@ -22,12 +22,12 @@ glabel func_802402AC_CD20DC
 /* CD2120 802402F0 0040982D */  daddu     $s3, $v0, $zero
 /* CD2124 802402F4 0000B02D */  daddu     $s6, $zero, $zero
 /* CD2128 802402F8 02C0902D */  daddu     $s2, $s6, $zero
-/* CD212C 802402FC 3C148024 */  lui       $s4, %hi(D_80243708_CD5538)
-/* CD2130 80240300 26943708 */  addiu     $s4, $s4, %lo(D_80243708_CD5538)
+/* CD212C 802402FC 3C148024 */  lui       $s4, %hi(flo_16_D_80243708_CD5538)
+/* CD2130 80240300 26943708 */  addiu     $s4, $s4, %lo(flo_16_D_80243708_CD5538)
 /* CD2134 80240304 0260882D */  daddu     $s1, $s3, $zero
 /* CD2138 80240308 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* CD213C 8024030C 3C038024 */  lui       $v1, %hi(D_80243700_CD5530)
-/* CD2140 80240310 24633700 */  addiu     $v1, $v1, %lo(D_80243700_CD5530)
+/* CD213C 8024030C 3C038024 */  lui       $v1, %hi(flo_16_D_80243700_CD5530)
+/* CD2140 80240310 24633700 */  addiu     $v1, $v1, %lo(flo_16_D_80243700_CD5530)
 /* CD2144 80240314 AEB30078 */  sw        $s3, 0x78($s5)
 /* CD2148 80240318 00021027 */  nor       $v0, $zero, $v0
 /* CD214C 8024031C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -49,7 +49,7 @@ glabel func_802402AC_CD20DC
 /* CD2188 80240358 AE300108 */  sw        $s0, 0x108($s1)
 /* CD218C 8024035C 8C420000 */  lw        $v0, ($v0)
 /* CD2190 80240360 02E0282D */  daddu     $a1, $s7, $zero
-/* CD2194 80240364 0C09006D */  jal       func_802401B4_CD1FE4
+/* CD2194 80240364 0C09006D */  jal       flo_16_UnkFunc37
 /* CD2198 80240368 AE220084 */   sw       $v0, 0x84($s1)
 /* CD219C 8024036C 0040202D */  daddu     $a0, $v0, $zero
 /* CD21A0 80240370 04800011 */  bltz      $a0, .L802403B8
@@ -61,8 +61,8 @@ glabel func_802402AC_CD20DC
 /* CD21B8 80240388 24020001 */  addiu     $v0, $zero, 1
 /* CD21BC 8024038C AE22018C */  sw        $v0, 0x18c($s1)
 /* CD21C0 80240390 00041080 */  sll       $v0, $a0, 2
-/* CD21C4 80240394 3C068024 */  lui       $a2, %hi(D_80243718_CD5548)
-/* CD21C8 80240398 24C63718 */  addiu     $a2, $a2, %lo(D_80243718_CD5548)
+/* CD21C4 80240394 3C068024 */  lui       $a2, %hi(flo_16_D_80243718_CD5548)
+/* CD21C8 80240398 24C63718 */  addiu     $a2, $a2, %lo(flo_16_D_80243718_CD5548)
 /* CD21CC 8024039C AE230000 */  sw        $v1, ($s1)
 /* CD21D0 802403A0 001218C0 */  sll       $v1, $s2, 3
 /* CD21D4 802403A4 00431021 */  addu      $v0, $v0, $v1
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_8024011C_CD1F4C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_8024011C_CD1F4C.s
deleted file mode 100644
index 6f00d13e1f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_8024011C_CD1F4C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024011C_CD1F4C
-/* CD1F4C 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CD1F50 80240120 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CD1F54 80240124 8C82000C */  lw        $v0, 0xc($a0)
-/* CD1F58 80240128 0C0B1EAF */  jal       get_variable
-/* CD1F5C 8024012C 8C450000 */   lw       $a1, ($v0)
-/* CD1F60 80240130 0C0B95A4 */  jal       func_802E5690
-/* CD1F64 80240134 0040202D */   daddu    $a0, $v0, $zero
-/* CD1F68 80240138 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CD1F6C 8024013C 24020002 */  addiu     $v0, $zero, 2
-/* CD1F70 80240140 03E00008 */  jr        $ra
-/* CD1F74 80240144 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802401B4_CD1FE4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802401B4_CD1FE4.s
deleted file mode 100644
index 3c7d376af0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802401B4_CD1FE4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401B4_CD1FE4
-/* CD1FE4 802401B4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* CD1FE8 802401B8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* CD1FEC 802401BC 000420C0 */  sll       $a0, $a0, 3
-/* CD1FF0 802401C0 00822021 */  addu      $a0, $a0, $v0
-/* CD1FF4 802401C4 90820014 */  lbu       $v0, 0x14($a0)
-/* CD1FF8 802401C8 10400009 */  beqz      $v0, .L802401F0
-/* CD1FFC 802401CC 00000000 */   nop
-/* CD2000 802401D0 90820015 */  lbu       $v0, 0x15($a0)
-/* CD2004 802401D4 00022600 */  sll       $a0, $v0, 0x18
-/* CD2008 802401D8 00041E03 */  sra       $v1, $a0, 0x18
-/* CD200C 802401DC 00051400 */  sll       $v0, $a1, 0x10
-/* CD2010 802401E0 00021403 */  sra       $v0, $v0, 0x10
-/* CD2014 802401E4 0043102A */  slt       $v0, $v0, $v1
-/* CD2018 802401E8 10400003 */  beqz      $v0, .L802401F8
-/* CD201C 802401EC 00000000 */   nop
-.L802401F0:
-/* CD2020 802401F0 03E00008 */  jr        $ra
-/* CD2024 802401F4 2402FFFF */   addiu    $v0, $zero, -1
-.L802401F8:
-/* CD2028 802401F8 03E00008 */  jr        $ra
-/* CD202C 802401FC 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s
deleted file mode 100644
index 6543d3568a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240200_CD2030
-/* CD2030 80240200 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* CD2034 80240204 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CD2038 80240208 0080982D */  daddu     $s3, $a0, $zero
-/* CD203C 8024020C AFB00010 */  sw        $s0, 0x10($sp)
-/* CD2040 80240210 24100001 */  addiu     $s0, $zero, 1
-/* CD2044 80240214 AFB40020 */  sw        $s4, 0x20($sp)
-/* CD2048 80240218 2414FFFF */  addiu     $s4, $zero, -1
-/* CD204C 8024021C AFB50024 */  sw        $s5, 0x24($sp)
-/* CD2050 80240220 0200A82D */  daddu     $s5, $s0, $zero
-/* CD2054 80240224 AFB10014 */  sw        $s1, 0x14($sp)
-/* CD2058 80240228 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* CD205C 8024022C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* CD2060 80240230 AFBF0028 */  sw        $ra, 0x28($sp)
-/* CD2064 80240234 AFB20018 */  sw        $s2, 0x18($sp)
-/* CD2068 80240238 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* CD206C 8024023C 0280182D */  daddu     $v1, $s4, $zero
-/* CD2070 80240240 AE630084 */  sw        $v1, 0x84($s3)
-/* CD2074 80240244 00021027 */  nor       $v0, $zero, $v0
-/* CD2078 80240248 000217C2 */  srl       $v0, $v0, 0x1f
-/* CD207C 8024024C 00029400 */  sll       $s2, $v0, 0x10
-.L80240250:
-/* CD2080 80240250 92220014 */  lbu       $v0, 0x14($s1)
-/* CD2084 80240254 50400008 */  beql      $v0, $zero, .L80240278
-/* CD2088 80240258 26100001 */   addiu    $s0, $s0, 1
-/* CD208C 8024025C 0200202D */  daddu     $a0, $s0, $zero
-/* CD2090 80240260 0C09006D */  jal       func_802401B4_CD1FE4
-/* CD2094 80240264 00122C03 */   sra      $a1, $s2, 0x10
-/* CD2098 80240268 10540003 */  beq       $v0, $s4, .L80240278
-/* CD209C 8024026C 26100001 */   addiu    $s0, $s0, 1
-/* CD20A0 80240270 080900A1 */  j         .L80240284
-/* CD20A4 80240274 AE750084 */   sw       $s5, 0x84($s3)
-.L80240278:
-/* CD20A8 80240278 2A02000C */  slti      $v0, $s0, 0xc
-/* CD20AC 8024027C 1440FFF4 */  bnez      $v0, .L80240250
-/* CD20B0 80240280 26310008 */   addiu    $s1, $s1, 8
-.L80240284:
-/* CD20B4 80240284 8FBF0028 */  lw        $ra, 0x28($sp)
-/* CD20B8 80240288 8FB50024 */  lw        $s5, 0x24($sp)
-/* CD20BC 8024028C 8FB40020 */  lw        $s4, 0x20($sp)
-/* CD20C0 80240290 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CD20C4 80240294 8FB20018 */  lw        $s2, 0x18($sp)
-/* CD20C8 80240298 8FB10014 */  lw        $s1, 0x14($sp)
-/* CD20CC 8024029C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CD20D0 802402A0 24020002 */  addiu     $v0, $zero, 2
-/* CD20D4 802402A4 03E00008 */  jr        $ra
-/* CD20D8 802402A8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC_CD232C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC_CD232C.s
deleted file mode 100644
index d04438ad41..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC_CD232C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404FC_CD232C
-/* CD232C 802404FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CD2330 80240500 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CD2334 80240504 8C82000C */  lw        $v0, 0xc($a0)
-/* CD2338 80240508 0C0B1EAF */  jal       get_variable
-/* CD233C 8024050C 8C450000 */   lw       $a1, ($v0)
-/* CD2340 80240510 0C03AC5A */  jal       func_800EB168
-/* CD2344 80240514 0040202D */   daddu    $a0, $v0, $zero
-/* CD2348 80240518 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CD234C 8024051C 24020002 */  addiu     $v0, $zero, 2
-/* CD2350 80240520 03E00008 */  jr        $ra
-/* CD2354 80240524 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802405F0_CD2420.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802405F0_CD2420.s
deleted file mode 100644
index e566583d2a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802405F0_CD2420.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405F0_CD2420
-/* CD2420 802405F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CD2424 802405F4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CD2428 802405F8 8C82000C */  lw        $v0, 0xc($a0)
-/* CD242C 802405FC 0C0B1EAF */  jal       get_variable
-/* CD2430 80240600 8C450000 */   lw       $a1, ($v0)
-/* CD2434 80240604 0040202D */  daddu     $a0, $v0, $zero
-/* CD2438 80240608 8C830000 */  lw        $v1, ($a0)
-/* CD243C 8024060C 34630010 */  ori       $v1, $v1, 0x10
-/* CD2440 80240610 AC830000 */  sw        $v1, ($a0)
-/* CD2444 80240614 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CD2448 80240618 24020002 */  addiu     $v0, $zero, 2
-/* CD244C 8024061C 03E00008 */  jr        $ra
-/* CD2450 80240620 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s
deleted file mode 100644
index 12a0663fb0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s
+++ /dev/null
@@ -1,356 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406E0_CD2510
-/* CD2510 802406E0 27BDFFA0 */  addiu     $sp, $sp, -0x60
-/* CD2514 802406E4 AFB60040 */  sw        $s6, 0x40($sp)
-/* CD2518 802406E8 0080B02D */  daddu     $s6, $a0, $zero
-/* CD251C 802406EC AFB00028 */  sw        $s0, 0x28($sp)
-/* CD2520 802406F0 00A0802D */  daddu     $s0, $a1, $zero
-/* CD2524 802406F4 AFBF0044 */  sw        $ra, 0x44($sp)
-/* CD2528 802406F8 AFB5003C */  sw        $s5, 0x3c($sp)
-/* CD252C 802406FC AFB40038 */  sw        $s4, 0x38($sp)
-/* CD2530 80240700 AFB30034 */  sw        $s3, 0x34($sp)
-/* CD2534 80240704 AFB20030 */  sw        $s2, 0x30($sp)
-/* CD2538 80240708 AFB1002C */  sw        $s1, 0x2c($sp)
-/* CD253C 8024070C F7B80058 */  sdc1      $f24, 0x58($sp)
-/* CD2540 80240710 F7B60050 */  sdc1      $f22, 0x50($sp)
-/* CD2544 80240714 F7B40048 */  sdc1      $f20, 0x48($sp)
-/* CD2548 80240718 8ED3000C */  lw        $s3, 0xc($s6)
-/* CD254C 8024071C 0C00EAD2 */  jal       get_npc_safe
-/* CD2550 80240720 2404FFFC */   addiu    $a0, $zero, -4
-/* CD2554 80240724 27A50018 */  addiu     $a1, $sp, 0x18
-/* CD2558 80240728 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
-/* CD255C 8024072C 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
-/* CD2560 80240730 27A6001C */  addiu     $a2, $sp, 0x1c
-/* CD2564 80240734 00041880 */  sll       $v1, $a0, 2
-/* CD2568 80240738 00641821 */  addu      $v1, $v1, $a0
-/* CD256C 8024073C 00031880 */  sll       $v1, $v1, 2
-/* CD2570 80240740 00641823 */  subu      $v1, $v1, $a0
-/* CD2574 80240744 000320C0 */  sll       $a0, $v1, 3
-/* CD2578 80240748 00641821 */  addu      $v1, $v1, $a0
-/* CD257C 8024074C 000318C0 */  sll       $v1, $v1, 3
-/* CD2580 80240750 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* CD2584 80240754 00230821 */  addu      $at, $at, $v1
-/* CD2588 80240758 C42C1DEC */  lwc1      $f12, %lo(gCameras+0x6C)($at)
-/* CD258C 8024075C 0C00A88D */  jal       sin_cos_deg
-/* CD2590 80240760 0040A82D */   daddu    $s5, $v0, $zero
-/* CD2594 80240764 1200005D */  beqz      $s0, .L802408DC
-/* CD2598 80240768 00000000 */   nop
-/* CD259C 8024076C 0C00AB0A */  jal       general_heap_malloc
-/* CD25A0 80240770 24040068 */   addiu    $a0, $zero, 0x68
-/* CD25A4 80240774 0040902D */  daddu     $s2, $v0, $zero
-/* CD25A8 80240778 02C0202D */  daddu     $a0, $s6, $zero
-/* CD25AC 8024077C 0000882D */  daddu     $s1, $zero, $zero
-/* CD25B0 80240780 2414FFFF */  addiu     $s4, $zero, -1
-/* CD25B4 80240784 AED20060 */  sw        $s2, 0x60($s6)
-/* CD25B8 80240788 8E650000 */  lw        $a1, ($s3)
-/* CD25BC 8024078C 3C014148 */  lui       $at, 0x4148
-/* CD25C0 80240790 4481C000 */  mtc1      $at, $f24
-/* CD25C4 80240794 3C013F80 */  lui       $at, 0x3f80
-/* CD25C8 80240798 4481B000 */  mtc1      $at, $f22
-/* CD25CC 8024079C 4480A000 */  mtc1      $zero, $f20
-/* CD25D0 802407A0 0C0B1EAF */  jal       get_variable
-/* CD25D4 802407A4 0240802D */   daddu    $s0, $s2, $zero
-/* CD25D8 802407A8 0C04417A */  jal       get_entity_by_index
-/* CD25DC 802407AC 0040202D */   daddu    $a0, $v0, $zero
-/* CD25E0 802407B0 AE42005C */  sw        $v0, 0x5c($s2)
-.L802407B4:
-/* CD25E4 802407B4 8E42005C */  lw        $v0, 0x5c($s2)
-/* CD25E8 802407B8 C440004C */  lwc1      $f0, 0x4c($v0)
-/* CD25EC 802407BC 0000202D */  daddu     $a0, $zero, $zero
-/* CD25F0 802407C0 E7B60010 */  swc1      $f22, 0x10($sp)
-/* CD25F4 802407C4 AFB40014 */  sw        $s4, 0x14($sp)
-/* CD25F8 802407C8 46180000 */  add.s     $f0, $f0, $f24
-/* CD25FC 802407CC 8C450048 */  lw        $a1, 0x48($v0)
-/* CD2600 802407D0 8C470050 */  lw        $a3, 0x50($v0)
-/* CD2604 802407D4 44060000 */  mfc1      $a2, $f0
-/* CD2608 802407D8 0C01C5BC */  jal       func_800716F0
-/* CD260C 802407DC 26310001 */   addiu    $s1, $s1, 1
-/* CD2610 802407E0 AE020008 */  sw        $v0, 8($s0)
-/* CD2614 802407E4 E614002C */  swc1      $f20, 0x2c($s0)
-/* CD2618 802407E8 E6140020 */  swc1      $f20, 0x20($s0)
-/* CD261C 802407EC E6140014 */  swc1      $f20, 0x14($s0)
-/* CD2620 802407F0 E6140050 */  swc1      $f20, 0x50($s0)
-/* CD2624 802407F4 E6140044 */  swc1      $f20, 0x44($s0)
-/* CD2628 802407F8 E6140038 */  swc1      $f20, 0x38($s0)
-/* CD262C 802407FC 2A220003 */  slti      $v0, $s1, 3
-/* CD2630 80240800 1440FFEC */  bnez      $v0, .L802407B4
-/* CD2634 80240804 26100004 */   addiu    $s0, $s0, 4
-/* CD2638 80240808 0000882D */  daddu     $s1, $zero, $zero
-/* CD263C 8024080C 0240802D */  daddu     $s0, $s2, $zero
-/* CD2640 80240810 3C148024 */  lui       $s4, %hi(D_80243758_CD5588)
-/* CD2644 80240814 26943758 */  addiu     $s4, $s4, %lo(D_80243758_CD5588)
-/* CD2648 80240818 3C014248 */  lui       $at, 0x4248
-/* CD264C 8024081C 4481A000 */  mtc1      $at, $f20
-/* CD2650 80240820 24130044 */  addiu     $s3, $zero, 0x44
-/* CD2654 80240824 AE400000 */  sw        $zero, ($s2)
-/* CD2658 80240828 AE400004 */  sw        $zero, 4($s2)
-/* CD265C 8024082C AE400060 */  sw        $zero, 0x60($s2)
-/* CD2660 80240830 AE400064 */  sw        $zero, 0x64($s2)
-.L80240834:
-/* CD2664 80240834 27A40020 */  addiu     $a0, $sp, 0x20
-/* CD2668 80240838 4406A000 */  mfc1      $a2, $f20
-/* CD266C 8024083C 8E870000 */  lw        $a3, ($s4)
-/* CD2670 80240840 02532821 */  addu      $a1, $s2, $s3
-/* CD2674 80240844 0C00A7E7 */  jal       add_vec2D_polar
-/* CD2678 80240848 AFA00020 */   sw       $zero, 0x20($sp)
-/* CD267C 8024084C C7A2001C */  lwc1      $f2, 0x1c($sp)
-/* CD2680 80240850 C7A40020 */  lwc1      $f4, 0x20($sp)
-/* CD2684 80240854 46041082 */  mul.s     $f2, $f2, $f4
-/* CD2688 80240858 00000000 */  nop
-/* CD268C 8024085C C7A00018 */  lwc1      $f0, 0x18($sp)
-/* CD2690 80240860 46040002 */  mul.s     $f0, $f0, $f4
-/* CD2694 80240864 00000000 */  nop
-/* CD2698 80240868 E6020038 */  swc1      $f2, 0x38($s0)
-/* CD269C 8024086C E6000050 */  swc1      $f0, 0x50($s0)
-/* CD26A0 80240870 8E42005C */  lw        $v0, 0x5c($s2)
-/* CD26A4 80240874 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CD26A8 80240878 C4420048 */  lwc1      $f2, 0x48($v0)
-/* CD26AC 8024087C 46001080 */  add.s     $f2, $f2, $f0
-/* CD26B0 80240880 C6A00038 */  lwc1      $f0, 0x38($s5)
-/* CD26B4 80240884 46020001 */  sub.s     $f0, $f0, $f2
-/* CD26B8 80240888 E6000038 */  swc1      $f0, 0x38($s0)
-/* CD26BC 8024088C 8E42005C */  lw        $v0, 0x5c($s2)
-/* CD26C0 80240890 C6000044 */  lwc1      $f0, 0x44($s0)
-/* CD26C4 80240894 C442004C */  lwc1      $f2, 0x4c($v0)
-/* CD26C8 80240898 46001080 */  add.s     $f2, $f2, $f0
-/* CD26CC 8024089C C6A0003C */  lwc1      $f0, 0x3c($s5)
-/* CD26D0 802408A0 46020001 */  sub.s     $f0, $f0, $f2
-/* CD26D4 802408A4 E6000044 */  swc1      $f0, 0x44($s0)
-/* CD26D8 802408A8 8E42005C */  lw        $v0, 0x5c($s2)
-/* CD26DC 802408AC C6000050 */  lwc1      $f0, 0x50($s0)
-/* CD26E0 802408B0 C4420050 */  lwc1      $f2, 0x50($v0)
-/* CD26E4 802408B4 26940004 */  addiu     $s4, $s4, 4
-/* CD26E8 802408B8 46001080 */  add.s     $f2, $f2, $f0
-/* CD26EC 802408BC C6A00040 */  lwc1      $f0, 0x40($s5)
-/* CD26F0 802408C0 26730004 */  addiu     $s3, $s3, 4
-/* CD26F4 802408C4 46020001 */  sub.s     $f0, $f0, $f2
-/* CD26F8 802408C8 26310001 */  addiu     $s1, $s1, 1
-/* CD26FC 802408CC 2A220003 */  slti      $v0, $s1, 3
-/* CD2700 802408D0 E6000050 */  swc1      $f0, 0x50($s0)
-/* CD2704 802408D4 1440FFD7 */  bnez      $v0, .L80240834
-/* CD2708 802408D8 26100004 */   addiu    $s0, $s0, 4
-.L802408DC:
-/* CD270C 802408DC 8ED20060 */  lw        $s2, 0x60($s6)
-/* CD2710 802408E0 8E430000 */  lw        $v1, ($s2)
-/* CD2714 802408E4 24020001 */  addiu     $v0, $zero, 1
-/* CD2718 802408E8 10620038 */  beq       $v1, $v0, .L802409CC
-/* CD271C 802408EC 28620002 */   slti     $v0, $v1, 2
-/* CD2720 802408F0 50400005 */  beql      $v0, $zero, .L80240908
-/* CD2724 802408F4 24020002 */   addiu    $v0, $zero, 2
-/* CD2728 802408F8 10600007 */  beqz      $v1, .L80240918
-/* CD272C 802408FC 24040005 */   addiu    $a0, $zero, 5
-/* CD2730 80240900 080902AC */  j         .L80240AB0
-/* CD2734 80240904 00000000 */   nop
-.L80240908:
-/* CD2738 80240908 10620058 */  beq       $v1, $v0, .L80240A6C
-/* CD273C 8024090C 00000000 */   nop
-/* CD2740 80240910 080902AC */  j         .L80240AB0
-/* CD2744 80240914 00000000 */   nop
-.L80240918:
-/* CD2748 80240918 0000882D */  daddu     $s1, $zero, $zero
-/* CD274C 8024091C 3C148024 */  lui       $s4, %hi(D_80243758_CD5588)
-/* CD2750 80240920 26943758 */  addiu     $s4, $s4, %lo(D_80243758_CD5588)
-/* CD2754 80240924 24130020 */  addiu     $s3, $zero, 0x20
-/* CD2758 80240928 3C064248 */  lui       $a2, 0x4248
-/* CD275C 8024092C 44800000 */  mtc1      $zero, $f0
-/* CD2760 80240930 24020014 */  addiu     $v0, $zero, 0x14
-/* CD2764 80240934 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD2768 80240938 44050000 */  mfc1      $a1, $f0
-/* CD276C 8024093C 8E470060 */  lw        $a3, 0x60($s2)
-/* CD2770 80240940 4485B000 */  mtc1      $a1, $f22
-/* CD2774 80240944 0C00A8ED */  jal       update_lerp
-/* CD2778 80240948 0240802D */   daddu    $s0, $s2, $zero
-/* CD277C 8024094C 46000506 */  mov.s     $f20, $f0
-.L80240950:
-/* CD2780 80240950 4406A000 */  mfc1      $a2, $f20
-/* CD2784 80240954 27A40020 */  addiu     $a0, $sp, 0x20
-/* CD2788 80240958 E6160020 */  swc1      $f22, 0x20($s0)
-/* CD278C 8024095C 8E870000 */  lw        $a3, ($s4)
-/* CD2790 80240960 02532821 */  addu      $a1, $s2, $s3
-/* CD2794 80240964 0C00A7E7 */  jal       add_vec2D_polar
-/* CD2798 80240968 E7B60020 */   swc1     $f22, 0x20($sp)
-/* CD279C 8024096C C7A4001C */  lwc1      $f4, 0x1c($sp)
-/* CD27A0 80240970 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* CD27A4 80240974 46002102 */  mul.s     $f4, $f4, $f0
-/* CD27A8 80240978 00000000 */  nop
-/* CD27AC 8024097C C7A20018 */  lwc1      $f2, 0x18($sp)
-/* CD27B0 80240980 26940004 */  addiu     $s4, $s4, 4
-/* CD27B4 80240984 46001082 */  mul.s     $f2, $f2, $f0
-/* CD27B8 80240988 00000000 */  nop
-/* CD27BC 8024098C 26730004 */  addiu     $s3, $s3, 4
-/* CD27C0 80240990 26310001 */  addiu     $s1, $s1, 1
-/* CD27C4 80240994 2A220003 */  slti      $v0, $s1, 3
-/* CD27C8 80240998 E6040014 */  swc1      $f4, 0x14($s0)
-/* CD27CC 8024099C E602002C */  swc1      $f2, 0x2c($s0)
-/* CD27D0 802409A0 1440FFEB */  bnez      $v0, .L80240950
-/* CD27D4 802409A4 26100004 */   addiu    $s0, $s0, 4
-/* CD27D8 802409A8 8E420060 */  lw        $v0, 0x60($s2)
-/* CD27DC 802409AC 24420001 */  addiu     $v0, $v0, 1
-/* CD27E0 802409B0 AE420060 */  sw        $v0, 0x60($s2)
-/* CD27E4 802409B4 28420015 */  slti      $v0, $v0, 0x15
-/* CD27E8 802409B8 1440003D */  bnez      $v0, .L80240AB0
-/* CD27EC 802409BC 24020001 */   addiu    $v0, $zero, 1
-/* CD27F0 802409C0 AE420000 */  sw        $v0, ($s2)
-/* CD27F4 802409C4 080902AC */  j         .L80240AB0
-/* CD27F8 802409C8 AE400060 */   sw       $zero, 0x60($s2)
-.L802409CC:
-/* CD27FC 802409CC 0000882D */  daddu     $s1, $zero, $zero
-/* CD2800 802409D0 3C148024 */  lui       $s4, %hi(D_80243758_CD5588)
-/* CD2804 802409D4 26943758 */  addiu     $s4, $s4, %lo(D_80243758_CD5588)
-/* CD2808 802409D8 24130020 */  addiu     $s3, $zero, 0x20
-/* CD280C 802409DC 0240802D */  daddu     $s0, $s2, $zero
-/* CD2810 802409E0 3C014248 */  lui       $at, 0x4248
-/* CD2814 802409E4 4481A000 */  mtc1      $at, $f20
-/* CD2818 802409E8 4480B000 */  mtc1      $zero, $f22
-.L802409EC:
-/* CD281C 802409EC 4406A000 */  mfc1      $a2, $f20
-/* CD2820 802409F0 27A40020 */  addiu     $a0, $sp, 0x20
-/* CD2824 802409F4 E6160020 */  swc1      $f22, 0x20($s0)
-/* CD2828 802409F8 8E870000 */  lw        $a3, ($s4)
-/* CD282C 802409FC 02532821 */  addu      $a1, $s2, $s3
-/* CD2830 80240A00 0C00A7E7 */  jal       add_vec2D_polar
-/* CD2834 80240A04 E7B60020 */   swc1     $f22, 0x20($sp)
-/* CD2838 80240A08 C7A4001C */  lwc1      $f4, 0x1c($sp)
-/* CD283C 80240A0C C7A00020 */  lwc1      $f0, 0x20($sp)
-/* CD2840 80240A10 46002102 */  mul.s     $f4, $f4, $f0
-/* CD2844 80240A14 00000000 */  nop
-/* CD2848 80240A18 C7A20018 */  lwc1      $f2, 0x18($sp)
-/* CD284C 80240A1C 26940004 */  addiu     $s4, $s4, 4
-/* CD2850 80240A20 46001082 */  mul.s     $f2, $f2, $f0
-/* CD2854 80240A24 00000000 */  nop
-/* CD2858 80240A28 26730004 */  addiu     $s3, $s3, 4
-/* CD285C 80240A2C 26310001 */  addiu     $s1, $s1, 1
-/* CD2860 80240A30 2A220003 */  slti      $v0, $s1, 3
-/* CD2864 80240A34 E6040014 */  swc1      $f4, 0x14($s0)
-/* CD2868 80240A38 E602002C */  swc1      $f2, 0x2c($s0)
-/* CD286C 80240A3C 1440FFEB */  bnez      $v0, .L802409EC
-/* CD2870 80240A40 26100004 */   addiu    $s0, $s0, 4
-/* CD2874 80240A44 8E420060 */  lw        $v0, 0x60($s2)
-/* CD2878 80240A48 24420001 */  addiu     $v0, $v0, 1
-/* CD287C 80240A4C AE420060 */  sw        $v0, 0x60($s2)
-/* CD2880 80240A50 28420010 */  slti      $v0, $v0, 0x10
-/* CD2884 80240A54 14400016 */  bnez      $v0, .L80240AB0
-/* CD2888 80240A58 2402000F */   addiu    $v0, $zero, 0xf
-/* CD288C 80240A5C AE420060 */  sw        $v0, 0x60($s2)
-/* CD2890 80240A60 24020002 */  addiu     $v0, $zero, 2
-/* CD2894 80240A64 080902AC */  j         .L80240AB0
-/* CD2898 80240A68 AE420000 */   sw       $v0, ($s2)
-.L80240A6C:
-/* CD289C 80240A6C 8E420060 */  lw        $v0, 0x60($s2)
-/* CD28A0 80240A70 24420001 */  addiu     $v0, $v0, 1
-/* CD28A4 80240A74 AE420060 */  sw        $v0, 0x60($s2)
-/* CD28A8 80240A78 2842001F */  slti      $v0, $v0, 0x1f
-/* CD28AC 80240A7C 1440000C */  bnez      $v0, .L80240AB0
-/* CD28B0 80240A80 0000882D */   daddu    $s1, $zero, $zero
-/* CD28B4 80240A84 0240282D */  daddu     $a1, $s2, $zero
-.L80240A88:
-/* CD28B8 80240A88 8CA20008 */  lw        $v0, 8($a1)
-/* CD28BC 80240A8C 8C430000 */  lw        $v1, ($v0)
-/* CD28C0 80240A90 26310001 */  addiu     $s1, $s1, 1
-/* CD28C4 80240A94 34630010 */  ori       $v1, $v1, 0x10
-/* CD28C8 80240A98 AC430000 */  sw        $v1, ($v0)
-/* CD28CC 80240A9C 2A220003 */  slti      $v0, $s1, 3
-/* CD28D0 80240AA0 1440FFF9 */  bnez      $v0, .L80240A88
-/* CD28D4 80240AA4 24A50004 */   addiu    $a1, $a1, 4
-/* CD28D8 80240AA8 080902F9 */  j         .L80240BE4
-/* CD28DC 80240AAC 24020002 */   addiu    $v0, $zero, 2
-.L80240AB0:
-/* CD28E0 80240AB0 8E430004 */  lw        $v1, 4($s2)
-/* CD28E4 80240AB4 10600005 */  beqz      $v1, .L80240ACC
-/* CD28E8 80240AB8 24020001 */   addiu    $v0, $zero, 1
-/* CD28EC 80240ABC 1062000B */  beq       $v1, $v0, .L80240AEC
-/* CD28F0 80240AC0 0000882D */   daddu    $s1, $zero, $zero
-/* CD28F4 80240AC4 080902E8 */  j         .L80240BA0
-/* CD28F8 80240AC8 0240282D */   daddu    $a1, $s2, $zero
-.L80240ACC:
-/* CD28FC 80240ACC 8E420064 */  lw        $v0, 0x64($s2)
-/* CD2900 80240AD0 24420001 */  addiu     $v0, $v0, 1
-/* CD2904 80240AD4 AE420064 */  sw        $v0, 0x64($s2)
-/* CD2908 80240AD8 28420010 */  slti      $v0, $v0, 0x10
-/* CD290C 80240ADC 1440002F */  bnez      $v0, .L80240B9C
-/* CD2910 80240AE0 0000882D */   daddu    $s1, $zero, $zero
-/* CD2914 80240AE4 080902E4 */  j         .L80240B90
-/* CD2918 80240AE8 24020001 */   addiu    $v0, $zero, 1
-.L80240AEC:
-/* CD291C 80240AEC 4480A000 */  mtc1      $zero, $f20
-/* CD2920 80240AF0 24130014 */  addiu     $s3, $zero, 0x14
-/* CD2924 80240AF4 0240802D */  daddu     $s0, $s2, $zero
-.L80240AF8:
-/* CD2928 80240AF8 4405A000 */  mfc1      $a1, $f20
-/* CD292C 80240AFC AFB30010 */  sw        $s3, 0x10($sp)
-/* CD2930 80240B00 8E060038 */  lw        $a2, 0x38($s0)
-/* CD2934 80240B04 8E470064 */  lw        $a3, 0x64($s2)
-/* CD2938 80240B08 0C00A8ED */  jal       update_lerp
-/* CD293C 80240B0C 24040001 */   addiu    $a0, $zero, 1
-/* CD2940 80240B10 C6020014 */  lwc1      $f2, 0x14($s0)
-/* CD2944 80240B14 46001080 */  add.s     $f2, $f2, $f0
-/* CD2948 80240B18 4405A000 */  mfc1      $a1, $f20
-/* CD294C 80240B1C E6020014 */  swc1      $f2, 0x14($s0)
-/* CD2950 80240B20 AFB30010 */  sw        $s3, 0x10($sp)
-/* CD2954 80240B24 8E060044 */  lw        $a2, 0x44($s0)
-/* CD2958 80240B28 8E470064 */  lw        $a3, 0x64($s2)
-/* CD295C 80240B2C 0C00A8ED */  jal       update_lerp
-/* CD2960 80240B30 24040001 */   addiu    $a0, $zero, 1
-/* CD2964 80240B34 C6020020 */  lwc1      $f2, 0x20($s0)
-/* CD2968 80240B38 46001080 */  add.s     $f2, $f2, $f0
-/* CD296C 80240B3C 4405A000 */  mfc1      $a1, $f20
-/* CD2970 80240B40 E6020020 */  swc1      $f2, 0x20($s0)
-/* CD2974 80240B44 AFB30010 */  sw        $s3, 0x10($sp)
-/* CD2978 80240B48 8E060050 */  lw        $a2, 0x50($s0)
-/* CD297C 80240B4C 8E470064 */  lw        $a3, 0x64($s2)
-/* CD2980 80240B50 0C00A8ED */  jal       update_lerp
-/* CD2984 80240B54 24040001 */   addiu    $a0, $zero, 1
-/* CD2988 80240B58 C602002C */  lwc1      $f2, 0x2c($s0)
-/* CD298C 80240B5C 46001080 */  add.s     $f2, $f2, $f0
-/* CD2990 80240B60 26310001 */  addiu     $s1, $s1, 1
-/* CD2994 80240B64 2A220003 */  slti      $v0, $s1, 3
-/* CD2998 80240B68 E602002C */  swc1      $f2, 0x2c($s0)
-/* CD299C 80240B6C 1440FFE2 */  bnez      $v0, .L80240AF8
-/* CD29A0 80240B70 26100004 */   addiu    $s0, $s0, 4
-/* CD29A4 80240B74 8E420064 */  lw        $v0, 0x64($s2)
-/* CD29A8 80240B78 24420001 */  addiu     $v0, $v0, 1
-/* CD29AC 80240B7C AE420064 */  sw        $v0, 0x64($s2)
-/* CD29B0 80240B80 28420015 */  slti      $v0, $v0, 0x15
-/* CD29B4 80240B84 14400005 */  bnez      $v0, .L80240B9C
-/* CD29B8 80240B88 0000882D */   daddu    $s1, $zero, $zero
-/* CD29BC 80240B8C 24020002 */  addiu     $v0, $zero, 2
-.L80240B90:
-/* CD29C0 80240B90 AE420004 */  sw        $v0, 4($s2)
-/* CD29C4 80240B94 AE400064 */  sw        $zero, 0x64($s2)
-/* CD29C8 80240B98 0000882D */  daddu     $s1, $zero, $zero
-.L80240B9C:
-/* CD29CC 80240B9C 0240282D */  daddu     $a1, $s2, $zero
-.L80240BA0:
-/* CD29D0 80240BA0 8CA20008 */  lw        $v0, 8($a1)
-/* CD29D4 80240BA4 C4A00014 */  lwc1      $f0, 0x14($a1)
-/* CD29D8 80240BA8 8C42000C */  lw        $v0, 0xc($v0)
-/* CD29DC 80240BAC E4400010 */  swc1      $f0, 0x10($v0)
-/* CD29E0 80240BB0 8CA20008 */  lw        $v0, 8($a1)
-/* CD29E4 80240BB4 C4A00020 */  lwc1      $f0, 0x20($a1)
-/* CD29E8 80240BB8 8C42000C */  lw        $v0, 0xc($v0)
-/* CD29EC 80240BBC 26310001 */  addiu     $s1, $s1, 1
-/* CD29F0 80240BC0 E4400014 */  swc1      $f0, 0x14($v0)
-/* CD29F4 80240BC4 8CA20008 */  lw        $v0, 8($a1)
-/* CD29F8 80240BC8 C4A0002C */  lwc1      $f0, 0x2c($a1)
-/* CD29FC 80240BCC 8C42000C */  lw        $v0, 0xc($v0)
-/* CD2A00 80240BD0 E4400018 */  swc1      $f0, 0x18($v0)
-/* CD2A04 80240BD4 2A220003 */  slti      $v0, $s1, 3
-/* CD2A08 80240BD8 1440FFF1 */  bnez      $v0, .L80240BA0
-/* CD2A0C 80240BDC 24A50004 */   addiu    $a1, $a1, 4
-/* CD2A10 80240BE0 0000102D */  daddu     $v0, $zero, $zero
-.L80240BE4:
-/* CD2A14 80240BE4 8FBF0044 */  lw        $ra, 0x44($sp)
-/* CD2A18 80240BE8 8FB60040 */  lw        $s6, 0x40($sp)
-/* CD2A1C 80240BEC 8FB5003C */  lw        $s5, 0x3c($sp)
-/* CD2A20 80240BF0 8FB40038 */  lw        $s4, 0x38($sp)
-/* CD2A24 80240BF4 8FB30034 */  lw        $s3, 0x34($sp)
-/* CD2A28 80240BF8 8FB20030 */  lw        $s2, 0x30($sp)
-/* CD2A2C 80240BFC 8FB1002C */  lw        $s1, 0x2c($sp)
-/* CD2A30 80240C00 8FB00028 */  lw        $s0, 0x28($sp)
-/* CD2A34 80240C04 D7B80058 */  ldc1      $f24, 0x58($sp)
-/* CD2A38 80240C08 D7B60050 */  ldc1      $f22, 0x50($sp)
-/* CD2A3C 80240C0C D7B40048 */  ldc1      $f20, 0x48($sp)
-/* CD2A40 80240C10 03E00008 */  jr        $ra
-/* CD2A44 80240C14 27BD0060 */   addiu    $sp, $sp, 0x60
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240E18_CD2C48.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240E18_CD2C48.s
deleted file mode 100644
index 03598b2c13..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240E18_CD2C48.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E18_CD2C48
-/* CD2C48 80240E18 AC800084 */  sw        $zero, 0x84($a0)
-/* CD2C4C 80240E1C 3C038011 */  lui       $v1, %hi(gPlayerActionState)
-/* CD2C50 80240E20 8063F07C */  lb        $v1, %lo(gPlayerActionState)($v1)
-/* CD2C54 80240E24 2402000E */  addiu     $v0, $zero, 0xe
-/* CD2C58 80240E28 10620004 */  beq       $v1, $v0, .L80240E3C
-/* CD2C5C 80240E2C 24020001 */   addiu    $v0, $zero, 1
-/* CD2C60 80240E30 24020010 */  addiu     $v0, $zero, 0x10
-/* CD2C64 80240E34 14620002 */  bne       $v1, $v0, .L80240E40
-/* CD2C68 80240E38 24020001 */   addiu    $v0, $zero, 1
-.L80240E3C:
-/* CD2C6C 80240E3C AC820084 */  sw        $v0, 0x84($a0)
-.L80240E40:
-/* CD2C70 80240E40 03E00008 */  jr        $ra
-/* CD2C74 80240E44 24020002 */   addiu    $v0, $zero, 2
-/* CD2C78 80240E48 00000000 */  nop
-/* CD2C7C 80240E4C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/flo_16_func_80241000_CD2E30.s
similarity index 99%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/flo_16_func_80241000_CD2E30.s
index c033117750..c3526b0ac2 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/flo_16_func_80241000_CD2E30.s
@@ -1,6 +1,14 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+glabel D_802453F8_CD7228
+.double 0.09
+
+glabel D_80245400_CD7230
+.double 0.09
+
+.section .text
 glabel func_80241000_CD2E30
 /* CD2E30 80241000 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* CD2E34 80241004 AFB3004C */  sw        $s3, 0x4c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s
deleted file mode 100644
index 995c7697d3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E50_CD2C80
-/* CD2C80 80240E50 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CD2C84 80240E54 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CD2C88 80240E58 0080982D */  daddu     $s3, $a0, $zero
-/* CD2C8C 80240E5C AFBF0030 */  sw        $ra, 0x30($sp)
-/* CD2C90 80240E60 AFB20028 */  sw        $s2, 0x28($sp)
-/* CD2C94 80240E64 AFB10024 */  sw        $s1, 0x24($sp)
-/* CD2C98 80240E68 AFB00020 */  sw        $s0, 0x20($sp)
-/* CD2C9C 80240E6C 8E710148 */  lw        $s1, 0x148($s3)
-/* CD2CA0 80240E70 86240008 */  lh        $a0, 8($s1)
-/* CD2CA4 80240E74 0C00EABB */  jal       get_npc_unsafe
-/* CD2CA8 80240E78 00A0902D */   daddu    $s2, $a1, $zero
-/* CD2CAC 80240E7C 8E440004 */  lw        $a0, 4($s2)
-/* CD2CB0 80240E80 0040802D */  daddu     $s0, $v0, $zero
-/* CD2CB4 80240E84 00041FC2 */  srl       $v1, $a0, 0x1f
-/* CD2CB8 80240E88 00832021 */  addu      $a0, $a0, $v1
-/* CD2CBC 80240E8C 00042043 */  sra       $a0, $a0, 1
-/* CD2CC0 80240E90 0C00A67F */  jal       rand_int
-/* CD2CC4 80240E94 24840001 */   addiu    $a0, $a0, 1
-/* CD2CC8 80240E98 8E430004 */  lw        $v1, 4($s2)
-/* CD2CCC 80240E9C 000327C2 */  srl       $a0, $v1, 0x1f
-/* CD2CD0 80240EA0 00641821 */  addu      $v1, $v1, $a0
-/* CD2CD4 80240EA4 00031843 */  sra       $v1, $v1, 1
-/* CD2CD8 80240EA8 00621821 */  addu      $v1, $v1, $v0
-/* CD2CDC 80240EAC A603008E */  sh        $v1, 0x8e($s0)
-/* CD2CE0 80240EB0 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD2CE4 80240EB4 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CD2CE8 80240EB8 C4640000 */  lwc1      $f4, ($v1)
-/* CD2CEC 80240EBC 46802120 */  cvt.s.w   $f4, $f4
-/* CD2CF0 80240EC0 C4620008 */  lwc1      $f2, 8($v1)
-/* CD2CF4 80240EC4 468010A0 */  cvt.s.w   $f2, $f2
-/* CD2CF8 80240EC8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD2CFC 80240ECC 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD2D00 80240ED0 44061000 */  mfc1      $a2, $f2
-/* CD2D04 80240ED4 C440000C */  lwc1      $f0, 0xc($v0)
-/* CD2D08 80240ED8 46800020 */  cvt.s.w   $f0, $f0
-/* CD2D0C 80240EDC E7A00014 */  swc1      $f0, 0x14($sp)
-/* CD2D10 80240EE0 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD2D14 80240EE4 44052000 */  mfc1      $a1, $f4
-/* CD2D18 80240EE8 C4400010 */  lwc1      $f0, 0x10($v0)
-/* CD2D1C 80240EEC 46800020 */  cvt.s.w   $f0, $f0
-/* CD2D20 80240EF0 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CD2D24 80240EF4 8C640018 */  lw        $a0, 0x18($v1)
-/* CD2D28 80240EF8 0C0123F5 */  jal       is_point_within_region
-/* CD2D2C 80240EFC 8E070038 */   lw       $a3, 0x38($s0)
-/* CD2D30 80240F00 1040000E */  beqz      $v0, .L80240F3C
-/* CD2D34 80240F04 00000000 */   nop
-/* CD2D38 80240F08 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD2D3C 80240F0C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CD2D40 80240F10 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CD2D44 80240F14 C4460000 */  lwc1      $f6, ($v0)
-/* CD2D48 80240F18 468031A0 */  cvt.s.w   $f6, $f6
-/* CD2D4C 80240F1C 44063000 */  mfc1      $a2, $f6
-/* CD2D50 80240F20 C4460008 */  lwc1      $f6, 8($v0)
-/* CD2D54 80240F24 468031A0 */  cvt.s.w   $f6, $f6
-/* CD2D58 80240F28 44073000 */  mfc1      $a3, $f6
-/* CD2D5C 80240F2C 0C00A720 */  jal       atan2
-/* CD2D60 80240F30 00000000 */   nop
-/* CD2D64 80240F34 080903DB */  j         .L80240F6C
-/* CD2D68 80240F38 E600000C */   swc1     $f0, 0xc($s0)
-.L80240F3C:
-/* CD2D6C 80240F3C 0C00A67F */  jal       rand_int
-/* CD2D70 80240F40 2404003C */   addiu    $a0, $zero, 0x3c
-/* CD2D74 80240F44 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CD2D78 80240F48 44820000 */  mtc1      $v0, $f0
-/* CD2D7C 80240F4C 00000000 */  nop
-/* CD2D80 80240F50 46800020 */  cvt.s.w   $f0, $f0
-/* CD2D84 80240F54 46006300 */  add.s     $f12, $f12, $f0
-/* CD2D88 80240F58 3C0141F0 */  lui       $at, 0x41f0
-/* CD2D8C 80240F5C 44810000 */  mtc1      $at, $f0
-/* CD2D90 80240F60 0C00A6C9 */  jal       clamp_angle
-/* CD2D94 80240F64 46006301 */   sub.s    $f12, $f12, $f0
-/* CD2D98 80240F68 E600000C */  swc1      $f0, 0xc($s0)
-.L80240F6C:
-/* CD2D9C 80240F6C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CD2DA0 80240F70 8C420004 */  lw        $v0, 4($v0)
-/* CD2DA4 80240F74 AE020028 */  sw        $v0, 0x28($s0)
-/* CD2DA8 80240F78 AE600074 */  sw        $zero, 0x74($s3)
-/* CD2DAC 80240F7C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD2DB0 80240F80 8C420014 */  lw        $v0, 0x14($v0)
-/* CD2DB4 80240F84 04410004 */  bgez      $v0, .L80240F98
-/* CD2DB8 80240F88 00000000 */   nop
-/* CD2DBC 80240F8C C6400000 */  lwc1      $f0, ($s2)
-/* CD2DC0 80240F90 080903EE */  j         .L80240FB8
-/* CD2DC4 80240F94 E6000018 */   swc1     $f0, 0x18($s0)
-.L80240F98:
-/* CD2DC8 80240F98 3C018024 */  lui       $at, %hi(D_802453F0_CD7220)
-/* CD2DCC 80240F9C D42253F0 */  ldc1      $f2, %lo(D_802453F0_CD7220)($at)
-/* CD2DD0 80240FA0 44820000 */  mtc1      $v0, $f0
-/* CD2DD4 80240FA4 00000000 */  nop
-/* CD2DD8 80240FA8 46800021 */  cvt.d.w   $f0, $f0
-/* CD2DDC 80240FAC 46220003 */  div.d     $f0, $f0, $f2
-/* CD2DE0 80240FB0 46200020 */  cvt.s.d   $f0, $f0
-/* CD2DE4 80240FB4 E6000018 */  swc1      $f0, 0x18($s0)
-.L80240FB8:
-/* CD2DE8 80240FB8 C600003C */  lwc1      $f0, 0x3c($s0)
-/* CD2DEC 80240FBC 3C014059 */  lui       $at, 0x4059
-/* CD2DF0 80240FC0 44811800 */  mtc1      $at, $f3
-/* CD2DF4 80240FC4 44801000 */  mtc1      $zero, $f2
-/* CD2DF8 80240FC8 46000021 */  cvt.d.s   $f0, $f0
-/* CD2DFC 80240FCC 46220002 */  mul.d     $f0, $f0, $f2
-/* CD2E00 80240FD0 00000000 */  nop
-/* CD2E04 80240FD4 24020001 */  addiu     $v0, $zero, 1
-/* CD2E08 80240FD8 4620018D */  trunc.w.d $f6, $f0
-/* CD2E0C 80240FDC E626007C */  swc1      $f6, 0x7c($s1)
-/* CD2E10 80240FE0 AE620070 */  sw        $v0, 0x70($s3)
-/* CD2E14 80240FE4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CD2E18 80240FE8 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CD2E1C 80240FEC 8FB20028 */  lw        $s2, 0x28($sp)
-/* CD2E20 80240FF0 8FB10024 */  lw        $s1, 0x24($sp)
-/* CD2E24 80240FF4 8FB00020 */  lw        $s0, 0x20($sp)
-/* CD2E28 80240FF8 03E00008 */  jr        $ra
-/* CD2E2C 80240FFC 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241AA4_CD38D4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241AA4_CD38D4.s
deleted file mode 100644
index 7a105354d0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241AA4_CD38D4.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241AA4_CD38D4
-/* CD38D4 80241AA4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CD38D8 80241AA8 AFB00010 */  sw        $s0, 0x10($sp)
-/* CD38DC 80241AAC 0080802D */  daddu     $s0, $a0, $zero
-/* CD38E0 80241AB0 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CD38E4 80241AB4 8E020148 */  lw        $v0, 0x148($s0)
-/* CD38E8 80241AB8 0C00EABB */  jal       get_npc_unsafe
-/* CD38EC 80241ABC 84440008 */   lh       $a0, 8($v0)
-/* CD38F0 80241AC0 9443008E */  lhu       $v1, 0x8e($v0)
-/* CD38F4 80241AC4 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CD38F8 80241AC8 24640001 */  addiu     $a0, $v1, 1
-/* CD38FC 80241ACC 00031C00 */  sll       $v1, $v1, 0x10
-/* CD3900 80241AD0 00031B83 */  sra       $v1, $v1, 0xe
-/* CD3904 80241AD4 A444008E */  sh        $a0, 0x8e($v0)
-/* CD3908 80241AD8 3C018024 */  lui       $at, %hi(D_80244010_CD5E40)
-/* CD390C 80241ADC 00230821 */  addu      $at, $at, $v1
-/* CD3910 80241AE0 C4224010 */  lwc1      $f2, %lo(D_80244010_CD5E40)($at)
-/* CD3914 80241AE4 8443008E */  lh        $v1, 0x8e($v0)
-/* CD3918 80241AE8 46020000 */  add.s     $f0, $f0, $f2
-/* CD391C 80241AEC 28630005 */  slti      $v1, $v1, 5
-/* CD3920 80241AF0 14600003 */  bnez      $v1, .L80241B00
-/* CD3924 80241AF4 E440003C */   swc1     $f0, 0x3c($v0)
-/* CD3928 80241AF8 2402000C */  addiu     $v0, $zero, 0xc
-/* CD392C 80241AFC AE020070 */  sw        $v0, 0x70($s0)
-.L80241B00:
-/* CD3930 80241B00 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CD3934 80241B04 8FB00010 */  lw        $s0, 0x10($sp)
-/* CD3938 80241B08 03E00008 */  jr        $ra
-/* CD393C 80241B0C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s
deleted file mode 100644
index 55e2474f05..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024215C_CD3F8C
-/* CD3F8C 8024215C 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CD3F90 80242160 AFB40040 */  sw        $s4, 0x40($sp)
-/* CD3F94 80242164 0080A02D */  daddu     $s4, $a0, $zero
-/* CD3F98 80242168 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CD3F9C 8024216C AFB50044 */  sw        $s5, 0x44($sp)
-/* CD3FA0 80242170 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CD3FA4 80242174 AFB20038 */  sw        $s2, 0x38($sp)
-/* CD3FA8 80242178 AFB10034 */  sw        $s1, 0x34($sp)
-/* CD3FAC 8024217C AFB00030 */  sw        $s0, 0x30($sp)
-/* CD3FB0 80242180 8E920148 */  lw        $s2, 0x148($s4)
-/* CD3FB4 80242184 86440008 */  lh        $a0, 8($s2)
-/* CD3FB8 80242188 8E90000C */  lw        $s0, 0xc($s4)
-/* CD3FBC 8024218C 0C00EABB */  jal       get_npc_unsafe
-/* CD3FC0 80242190 00A0882D */   daddu    $s1, $a1, $zero
-/* CD3FC4 80242194 0280202D */  daddu     $a0, $s4, $zero
-/* CD3FC8 80242198 8E050000 */  lw        $a1, ($s0)
-/* CD3FCC 8024219C 0C0B1EAF */  jal       get_variable
-/* CD3FD0 802421A0 0040A82D */   daddu    $s5, $v0, $zero
-/* CD3FD4 802421A4 AFA00010 */  sw        $zero, 0x10($sp)
-/* CD3FD8 802421A8 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD3FDC 802421AC 8C630030 */  lw        $v1, 0x30($v1)
-/* CD3FE0 802421B0 AFA30014 */  sw        $v1, 0x14($sp)
-/* CD3FE4 802421B4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD3FE8 802421B8 8C63001C */  lw        $v1, 0x1c($v1)
-/* CD3FEC 802421BC AFA30018 */  sw        $v1, 0x18($sp)
-/* CD3FF0 802421C0 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD3FF4 802421C4 8C630024 */  lw        $v1, 0x24($v1)
-/* CD3FF8 802421C8 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CD3FFC 802421CC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD4000 802421D0 8C630028 */  lw        $v1, 0x28($v1)
-/* CD4004 802421D4 27B30010 */  addiu     $s3, $sp, 0x10
-/* CD4008 802421D8 AFA30020 */  sw        $v1, 0x20($sp)
-/* CD400C 802421DC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD4010 802421E0 3C0142F0 */  lui       $at, 0x42f0
-/* CD4014 802421E4 44810000 */  mtc1      $at, $f0
-/* CD4018 802421E8 8C63002C */  lw        $v1, 0x2c($v1)
-/* CD401C 802421EC 0040802D */  daddu     $s0, $v0, $zero
-/* CD4020 802421F0 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CD4024 802421F4 A7A0002C */  sh        $zero, 0x2c($sp)
-/* CD4028 802421F8 12200006 */  beqz      $s1, .L80242214
-/* CD402C 802421FC AFA30024 */   sw       $v1, 0x24($sp)
-/* CD4030 80242200 02A0202D */  daddu     $a0, $s5, $zero
-/* CD4034 80242204 0240282D */  daddu     $a1, $s2, $zero
-/* CD4038 80242208 0280302D */  daddu     $a2, $s4, $zero
-/* CD403C 8024220C 0C09080E */  jal       flo_16_UnkFunc5
-/* CD4040 80242210 0200382D */   daddu    $a3, $s0, $zero
-.L80242214:
-/* CD4044 80242214 2402FFFE */  addiu     $v0, $zero, -2
-/* CD4048 80242218 A2A200AB */  sb        $v0, 0xab($s5)
-/* CD404C 8024221C 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CD4050 80242220 30620004 */  andi      $v0, $v1, 4
-/* CD4054 80242224 10400007 */  beqz      $v0, .L80242244
-/* CD4058 80242228 00000000 */   nop
-/* CD405C 8024222C 824200B4 */  lb        $v0, 0xb4($s2)
-/* CD4060 80242230 1440003C */  bnez      $v0, .L80242324
-/* CD4064 80242234 0000102D */   daddu    $v0, $zero, $zero
-/* CD4068 80242238 2402FFFB */  addiu     $v0, $zero, -5
-/* CD406C 8024223C 00621024 */  and       $v0, $v1, $v0
-/* CD4070 80242240 AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80242244:
-/* CD4074 80242244 8E830070 */  lw        $v1, 0x70($s4)
-/* CD4078 80242248 2C62000F */  sltiu     $v0, $v1, 0xf
-/* CD407C 8024224C 10400034 */  beqz      $v0, L80242320_CD4150
-/* CD4080 80242250 00031080 */   sll      $v0, $v1, 2
-/* CD4084 80242254 3C018024 */  lui       $at, %hi(jtbl_80245408_CD7238)
-/* CD4088 80242258 00220821 */  addu      $at, $at, $v0
-/* CD408C 8024225C 8C225408 */  lw        $v0, %lo(jtbl_80245408_CD7238)($at)
-/* CD4090 80242260 00400008 */  jr        $v0
-/* CD4094 80242264 00000000 */   nop
-glabel L80242268_CD4098
-/* CD4098 80242268 0280202D */  daddu     $a0, $s4, $zero
-/* CD409C 8024226C 0200282D */  daddu     $a1, $s0, $zero
-/* CD40A0 80242270 0C090394 */  jal       func_80240E50_CD2C80
-/* CD40A4 80242274 0260302D */   daddu    $a2, $s3, $zero
-glabel L80242278_CD40A8
-/* CD40A8 80242278 0280202D */  daddu     $a0, $s4, $zero
-/* CD40AC 8024227C 0200282D */  daddu     $a1, $s0, $zero
-/* CD40B0 80242280 0C090400 */  jal       func_80241000_CD2E30
-/* CD40B4 80242284 0260302D */   daddu    $a2, $s3, $zero
-/* CD40B8 80242288 080908C9 */  j         .L80242324
-/* CD40BC 8024228C 0000102D */   daddu    $v0, $zero, $zero
-glabel L80242290_CD40C0
-/* CD40C0 80242290 0280202D */  daddu     $a0, $s4, $zero
-/* CD40C4 80242294 0200282D */  daddu     $a1, $s0, $zero
-/* CD40C8 80242298 0C09058A */  jal       flo_16_UnkNpcAIFunc1
-/* CD40CC 8024229C 0260302D */   daddu    $a2, $s3, $zero
-glabel L802422A0_CD40D0
-/* CD40D0 802422A0 0280202D */  daddu     $a0, $s4, $zero
-/* CD40D4 802422A4 0200282D */  daddu     $a1, $s0, $zero
-/* CD40D8 802422A8 0C0905BA */  jal       flo_16_UnkFunc4
-/* CD40DC 802422AC 0260302D */   daddu    $a2, $s3, $zero
-/* CD40E0 802422B0 080908C9 */  j         .L80242324
-/* CD40E4 802422B4 0000102D */   daddu    $v0, $zero, $zero
-glabel L802422B8_CD40E8
-/* CD40E8 802422B8 0280202D */  daddu     $a0, $s4, $zero
-/* CD40EC 802422BC 0200282D */  daddu     $a1, $s0, $zero
-/* CD40F0 802422C0 0C09068B */  jal       flo_16_UnkNpcAIFunc2
-/* CD40F4 802422C4 0260302D */   daddu    $a2, $s3, $zero
-glabel L802422C8_CD40F8
-/* CD40F8 802422C8 0280202D */  daddu     $a0, $s4, $zero
-/* CD40FC 802422CC 0200282D */  daddu     $a1, $s0, $zero
-/* CD4100 802422D0 0C0906A9 */  jal       func_80241AA4_CD38D4
-/* CD4104 802422D4 0260302D */   daddu    $a2, $s3, $zero
-/* CD4108 802422D8 080908C9 */  j         .L80242324
-/* CD410C 802422DC 0000102D */   daddu    $v0, $zero, $zero
-glabel L802422E0_CD4110
-/* CD4110 802422E0 0280202D */  daddu     $a0, $s4, $zero
-/* CD4114 802422E4 0200282D */  daddu     $a1, $s0, $zero
-/* CD4118 802422E8 0C0906C4 */  jal       flo_16_UnkNpcAIFunc14
-/* CD411C 802422EC 0260302D */   daddu    $a2, $s3, $zero
-/* CD4120 802422F0 080908C9 */  j         .L80242324
-/* CD4124 802422F4 0000102D */   daddu    $v0, $zero, $zero
-glabel L802422F8_CD4128
-/* CD4128 802422F8 0280202D */  daddu     $a0, $s4, $zero
-/* CD412C 802422FC 0200282D */  daddu     $a1, $s0, $zero
-/* CD4130 80242300 0C090711 */  jal       flo_16_UnkNpcAIFunc3
-/* CD4134 80242304 0260302D */   daddu    $a2, $s3, $zero
-/* CD4138 80242308 080908C9 */  j         .L80242324
-/* CD413C 8024230C 0000102D */   daddu    $v0, $zero, $zero
-glabel L80242310_CD4140
-/* CD4140 80242310 0280202D */  daddu     $a0, $s4, $zero
-/* CD4144 80242314 0200282D */  daddu     $a1, $s0, $zero
-/* CD4148 80242318 0C09072A */  jal       flo_16_UnkFunc6
-/* CD414C 8024231C 0260302D */   daddu    $a2, $s3, $zero
-glabel L80242320_CD4150
-/* CD4150 80242320 0000102D */  daddu     $v0, $zero, $zero
-.L80242324:
-/* CD4154 80242324 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CD4158 80242328 8FB50044 */  lw        $s5, 0x44($sp)
-/* CD415C 8024232C 8FB40040 */  lw        $s4, 0x40($sp)
-/* CD4160 80242330 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CD4164 80242334 8FB20038 */  lw        $s2, 0x38($sp)
-/* CD4168 80242338 8FB10034 */  lw        $s1, 0x34($sp)
-/* CD416C 8024233C 8FB00030 */  lw        $s0, 0x30($sp)
-/* CD4170 80242340 03E00008 */  jr        $ra
-/* CD4174 80242344 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s
deleted file mode 100644
index b93a58dcfa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s
+++ /dev/null
@@ -1,172 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242478_CD42A8
-/* CD42A8 80242478 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* CD42AC 8024247C AFB3004C */  sw        $s3, 0x4c($sp)
-/* CD42B0 80242480 0080982D */  daddu     $s3, $a0, $zero
-/* CD42B4 80242484 AFBF0050 */  sw        $ra, 0x50($sp)
-/* CD42B8 80242488 AFB20048 */  sw        $s2, 0x48($sp)
-/* CD42BC 8024248C AFB10044 */  sw        $s1, 0x44($sp)
-/* CD42C0 80242490 AFB00040 */  sw        $s0, 0x40($sp)
-/* CD42C4 80242494 8E720148 */  lw        $s2, 0x148($s3)
-/* CD42C8 80242498 00A0882D */  daddu     $s1, $a1, $zero
-/* CD42CC 8024249C 86440008 */  lh        $a0, 8($s2)
-/* CD42D0 802424A0 0C00EABB */  jal       get_npc_unsafe
-/* CD42D4 802424A4 00C0802D */   daddu    $s0, $a2, $zero
-/* CD42D8 802424A8 0200202D */  daddu     $a0, $s0, $zero
-/* CD42DC 802424AC 0240282D */  daddu     $a1, $s2, $zero
-/* CD42E0 802424B0 24030001 */  addiu     $v1, $zero, 1
-/* CD42E4 802424B4 AFA30010 */  sw        $v1, 0x10($sp)
-/* CD42E8 802424B8 8E260024 */  lw        $a2, 0x24($s1)
-/* CD42EC 802424BC 8E270028 */  lw        $a3, 0x28($s1)
-/* CD42F0 802424C0 0C01242D */  jal       func_800490B4
-/* CD42F4 802424C4 0040802D */   daddu    $s0, $v0, $zero
-/* CD42F8 802424C8 14400020 */  bnez      $v0, .L8024254C
-/* CD42FC 802424CC 24040002 */   addiu    $a0, $zero, 2
-/* CD4300 802424D0 0200282D */  daddu     $a1, $s0, $zero
-/* CD4304 802424D4 0000302D */  daddu     $a2, $zero, $zero
-/* CD4308 802424D8 860300A8 */  lh        $v1, 0xa8($s0)
-/* CD430C 802424DC 3C013F80 */  lui       $at, 0x3f80
-/* CD4310 802424E0 44810000 */  mtc1      $at, $f0
-/* CD4314 802424E4 3C014000 */  lui       $at, 0x4000
-/* CD4318 802424E8 44811000 */  mtc1      $at, $f2
-/* CD431C 802424EC 3C01C1A0 */  lui       $at, 0xc1a0
-/* CD4320 802424F0 44812000 */  mtc1      $at, $f4
-/* CD4324 802424F4 2402000F */  addiu     $v0, $zero, 0xf
-/* CD4328 802424F8 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CD432C 802424FC 44834000 */  mtc1      $v1, $f8
-/* CD4330 80242500 00000000 */  nop
-/* CD4334 80242504 46804220 */  cvt.s.w   $f8, $f8
-/* CD4338 80242508 44074000 */  mfc1      $a3, $f8
-/* CD433C 8024250C 27A20028 */  addiu     $v0, $sp, 0x28
-/* CD4340 80242510 AFA20020 */  sw        $v0, 0x20($sp)
-/* CD4344 80242514 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD4348 80242518 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CD434C 8024251C 0C01BFA4 */  jal       fx_emote
-/* CD4350 80242520 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CD4354 80242524 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CD4358 80242528 8C430000 */  lw        $v1, ($v0)
-/* CD435C 8024252C 2402001E */  addiu     $v0, $zero, 0x1e
-/* CD4360 80242530 A602008E */  sh        $v0, 0x8e($s0)
-/* CD4364 80242534 24020014 */  addiu     $v0, $zero, 0x14
-/* CD4368 80242538 AE030028 */  sw        $v1, 0x28($s0)
-/* CD436C 8024253C AE620070 */  sw        $v0, 0x70($s3)
-/* CD4370 80242540 2402001E */  addiu     $v0, $zero, 0x1e
-/* CD4374 80242544 080909B7 */  j         .L802426DC
-/* CD4378 80242548 AE420090 */   sw       $v0, 0x90($s2)
-.L8024254C:
-/* CD437C 8024254C 8E050018 */  lw        $a1, 0x18($s0)
-/* CD4380 80242550 8E06000C */  lw        $a2, 0xc($s0)
-/* CD4384 80242554 0C00EA95 */  jal       npc_move_heading
-/* CD4388 80242558 0200202D */   daddu    $a0, $s0, $zero
-/* CD438C 8024255C 8E020000 */  lw        $v0, ($s0)
-/* CD4390 80242560 30420008 */  andi      $v0, $v0, 8
-/* CD4394 80242564 14400028 */  bnez      $v0, .L80242608
-/* CD4398 80242568 0000882D */   daddu    $s1, $zero, $zero
-/* CD439C 8024256C 27A5002C */  addiu     $a1, $sp, 0x2c
-/* CD43A0 80242570 27A60030 */  addiu     $a2, $sp, 0x30
-/* CD43A4 80242574 860200A8 */  lh        $v0, 0xa8($s0)
-/* CD43A8 80242578 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CD43AC 8024257C 44821000 */  mtc1      $v0, $f2
-/* CD43B0 80242580 00000000 */  nop
-/* CD43B4 80242584 468010A0 */  cvt.s.w   $f2, $f2
-/* CD43B8 80242588 E7A0002C */  swc1      $f0, 0x2c($sp)
-/* CD43BC 8024258C 860200A8 */  lh        $v0, 0xa8($s0)
-/* CD43C0 80242590 C604003C */  lwc1      $f4, 0x3c($s0)
-/* CD43C4 80242594 C6060040 */  lwc1      $f6, 0x40($s0)
-/* CD43C8 80242598 44820000 */  mtc1      $v0, $f0
-/* CD43CC 8024259C 00000000 */  nop
-/* CD43D0 802425A0 46800021 */  cvt.d.w   $f0, $f0
-/* CD43D4 802425A4 46022100 */  add.s     $f4, $f4, $f2
-/* CD43D8 802425A8 3C014008 */  lui       $at, 0x4008
-/* CD43DC 802425AC 44811800 */  mtc1      $at, $f3
-/* CD43E0 802425B0 44801000 */  mtc1      $zero, $f2
-/* CD43E4 802425B4 27A20038 */  addiu     $v0, $sp, 0x38
-/* CD43E8 802425B8 46220000 */  add.d     $f0, $f0, $f2
-/* CD43EC 802425BC E7A60034 */  swc1      $f6, 0x34($sp)
-/* CD43F0 802425C0 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CD43F4 802425C4 46200020 */  cvt.s.d   $f0, $f0
-/* CD43F8 802425C8 E7A00038 */  swc1      $f0, 0x38($sp)
-/* CD43FC 802425CC AFA20010 */  sw        $v0, 0x10($sp)
-/* CD4400 802425D0 8E040080 */  lw        $a0, 0x80($s0)
-/* CD4404 802425D4 0C0372DF */  jal       func_800DCB7C
-/* CD4408 802425D8 27A70034 */   addiu    $a3, $sp, 0x34
-/* CD440C 802425DC 1040000A */  beqz      $v0, .L80242608
-/* CD4410 802425E0 00000000 */   nop
-/* CD4414 802425E4 860200A8 */  lh        $v0, 0xa8($s0)
-/* CD4418 802425E8 C7A20038 */  lwc1      $f2, 0x38($sp)
-/* CD441C 802425EC 44820000 */  mtc1      $v0, $f0
-/* CD4420 802425F0 00000000 */  nop
-/* CD4424 802425F4 46800020 */  cvt.s.w   $f0, $f0
-/* CD4428 802425F8 4600103C */  c.lt.s    $f2, $f0
-/* CD442C 802425FC 00000000 */  nop
-/* CD4430 80242600 45030001 */  bc1tl     .L80242608
-/* CD4434 80242604 24110001 */   addiu    $s1, $zero, 1
-.L80242608:
-/* CD4438 80242608 12200008 */  beqz      $s1, .L8024262C
-/* CD443C 8024260C 00000000 */   nop
-/* CD4440 80242610 C7A00030 */  lwc1      $f0, 0x30($sp)
-/* CD4444 80242614 3C013FF0 */  lui       $at, 0x3ff0
-/* CD4448 80242618 44811800 */  mtc1      $at, $f3
-/* CD444C 8024261C 44801000 */  mtc1      $zero, $f2
-/* CD4450 80242620 46000021 */  cvt.d.s   $f0, $f0
-/* CD4454 80242624 080909AD */  j         .L802426B4
-/* CD4458 80242628 46220000 */   add.d    $f0, $f0, $f2
-.L8024262C:
-/* CD445C 8024262C 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CD4460 80242630 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CD4464 80242634 3C014018 */  lui       $at, 0x4018
-/* CD4468 80242638 44811800 */  mtc1      $at, $f3
-/* CD446C 8024263C 44801000 */  mtc1      $zero, $f2
-/* CD4470 80242640 C440002C */  lwc1      $f0, 0x2c($v0)
-/* CD4474 80242644 C604003C */  lwc1      $f4, 0x3c($s0)
-/* CD4478 80242648 46000021 */  cvt.d.s   $f0, $f0
-/* CD447C 8024264C 46220000 */  add.d     $f0, $f0, $f2
-/* CD4480 80242650 46002121 */  cvt.d.s   $f4, $f4
-/* CD4484 80242654 46202001 */  sub.d     $f0, $f4, $f0
-/* CD4488 80242658 462001A0 */  cvt.s.d   $f6, $f0
-/* CD448C 8024265C 44800000 */  mtc1      $zero, $f0
-/* CD4490 80242660 44800800 */  mtc1      $zero, $f1
-/* CD4494 80242664 460030A1 */  cvt.d.s   $f2, $f6
-/* CD4498 80242668 4620103C */  c.lt.d    $f2, $f0
-/* CD449C 8024266C 00000000 */  nop
-/* CD44A0 80242670 45010009 */  bc1t      .L80242698
-/* CD44A4 80242674 00000000 */   nop
-/* CD44A8 80242678 3C014010 */  lui       $at, 0x4010
-/* CD44AC 8024267C 44810800 */  mtc1      $at, $f1
-/* CD44B0 80242680 44800000 */  mtc1      $zero, $f0
-/* CD44B4 80242684 00000000 */  nop
-/* CD44B8 80242688 4622003C */  c.lt.d    $f0, $f2
-/* CD44BC 8024268C 00000000 */  nop
-/* CD44C0 80242690 4500000A */  bc1f      .L802426BC
-/* CD44C4 80242694 00000000 */   nop
-.L80242698:
-/* CD44C8 80242698 3C018024 */  lui       $at, %hi(D_80245448_CD7278)
-/* CD44CC 8024269C D4225448 */  ldc1      $f2, %lo(D_80245448_CD7278)($at)
-/* CD44D0 802426A0 46003187 */  neg.s     $f6, $f6
-/* CD44D4 802426A4 46003021 */  cvt.d.s   $f0, $f6
-/* CD44D8 802426A8 46220002 */  mul.d     $f0, $f0, $f2
-/* CD44DC 802426AC 00000000 */  nop
-/* CD44E0 802426B0 46202000 */  add.d     $f0, $f4, $f0
-.L802426B4:
-/* CD44E4 802426B4 46200020 */  cvt.s.d   $f0, $f0
-/* CD44E8 802426B8 E600003C */  swc1      $f0, 0x3c($s0)
-.L802426BC:
-/* CD44EC 802426BC 8602008E */  lh        $v0, 0x8e($s0)
-/* CD44F0 802426C0 9603008E */  lhu       $v1, 0x8e($s0)
-/* CD44F4 802426C4 18400003 */  blez      $v0, .L802426D4
-/* CD44F8 802426C8 2462FFFF */   addiu    $v0, $v1, -1
-/* CD44FC 802426CC 080909B7 */  j         .L802426DC
-/* CD4500 802426D0 A602008E */   sh       $v0, 0x8e($s0)
-.L802426D4:
-/* CD4504 802426D4 2402000C */  addiu     $v0, $zero, 0xc
-/* CD4508 802426D8 AE620070 */  sw        $v0, 0x70($s3)
-.L802426DC:
-/* CD450C 802426DC 8FBF0050 */  lw        $ra, 0x50($sp)
-/* CD4510 802426E0 8FB3004C */  lw        $s3, 0x4c($sp)
-/* CD4514 802426E4 8FB20048 */  lw        $s2, 0x48($sp)
-/* CD4518 802426E8 8FB10044 */  lw        $s1, 0x44($sp)
-/* CD451C 802426EC 8FB00040 */  lw        $s0, 0x40($sp)
-/* CD4520 802426F0 03E00008 */  jr        $ra
-/* CD4524 802426F4 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802426F8_CD4528.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802426F8_CD4528.s
deleted file mode 100644
index 3ac6288ea5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802426F8_CD4528.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802426F8_CD4528
-/* CD4528 802426F8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CD452C 802426FC AFB10014 */  sw        $s1, 0x14($sp)
-/* CD4530 80242700 0080882D */  daddu     $s1, $a0, $zero
-/* CD4534 80242704 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CD4538 80242708 AFB00010 */  sw        $s0, 0x10($sp)
-/* CD453C 8024270C 8E300148 */  lw        $s0, 0x148($s1)
-/* CD4540 80242710 0C00EABB */  jal       get_npc_unsafe
-/* CD4544 80242714 86040008 */   lh       $a0, 8($s0)
-/* CD4548 80242718 0040182D */  daddu     $v1, $v0, $zero
-/* CD454C 8024271C 9462008E */  lhu       $v0, 0x8e($v1)
-/* CD4550 80242720 2442FFFF */  addiu     $v0, $v0, -1
-/* CD4554 80242724 A462008E */  sh        $v0, 0x8e($v1)
-/* CD4558 80242728 00021400 */  sll       $v0, $v0, 0x10
-/* CD455C 8024272C 1C400004 */  bgtz      $v0, .L80242740
-/* CD4560 80242730 00000000 */   nop
-/* CD4564 80242734 AE000074 */  sw        $zero, 0x74($s0)
-/* CD4568 80242738 A460008E */  sh        $zero, 0x8e($v1)
-/* CD456C 8024273C AE200070 */  sw        $zero, 0x70($s1)
-.L80242740:
-/* CD4570 80242740 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CD4574 80242744 8FB10014 */  lw        $s1, 0x14($sp)
-/* CD4578 80242748 8FB00010 */  lw        $s0, 0x10($sp)
-/* CD457C 8024274C 03E00008 */  jr        $ra
-/* CD4580 80242750 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s
deleted file mode 100644
index bd3d16dd26..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242754_CD4584
-/* CD4584 80242754 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CD4588 80242758 AFB40040 */  sw        $s4, 0x40($sp)
-/* CD458C 8024275C 0080A02D */  daddu     $s4, $a0, $zero
-/* CD4590 80242760 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CD4594 80242764 AFB50044 */  sw        $s5, 0x44($sp)
-/* CD4598 80242768 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CD459C 8024276C AFB20038 */  sw        $s2, 0x38($sp)
-/* CD45A0 80242770 AFB10034 */  sw        $s1, 0x34($sp)
-/* CD45A4 80242774 AFB00030 */  sw        $s0, 0x30($sp)
-/* CD45A8 80242778 8E920148 */  lw        $s2, 0x148($s4)
-/* CD45AC 8024277C 86440008 */  lh        $a0, 8($s2)
-/* CD45B0 80242780 8E90000C */  lw        $s0, 0xc($s4)
-/* CD45B4 80242784 0C00EABB */  jal       get_npc_unsafe
-/* CD45B8 80242788 00A0882D */   daddu    $s1, $a1, $zero
-/* CD45BC 8024278C 0280202D */  daddu     $a0, $s4, $zero
-/* CD45C0 80242790 8E050000 */  lw        $a1, ($s0)
-/* CD45C4 80242794 0C0B1EAF */  jal       get_variable
-/* CD45C8 80242798 0040A82D */   daddu    $s5, $v0, $zero
-/* CD45CC 8024279C AFA00010 */  sw        $zero, 0x10($sp)
-/* CD45D0 802427A0 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD45D4 802427A4 8C630030 */  lw        $v1, 0x30($v1)
-/* CD45D8 802427A8 AFA30014 */  sw        $v1, 0x14($sp)
-/* CD45DC 802427AC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD45E0 802427B0 8C63001C */  lw        $v1, 0x1c($v1)
-/* CD45E4 802427B4 AFA30018 */  sw        $v1, 0x18($sp)
-/* CD45E8 802427B8 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD45EC 802427BC 8C630024 */  lw        $v1, 0x24($v1)
-/* CD45F0 802427C0 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CD45F4 802427C4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD45F8 802427C8 8C630028 */  lw        $v1, 0x28($v1)
-/* CD45FC 802427CC 27B30010 */  addiu     $s3, $sp, 0x10
-/* CD4600 802427D0 AFA30020 */  sw        $v1, 0x20($sp)
-/* CD4604 802427D4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD4608 802427D8 3C0142F0 */  lui       $at, 0x42f0
-/* CD460C 802427DC 44810000 */  mtc1      $at, $f0
-/* CD4610 802427E0 8C63002C */  lw        $v1, 0x2c($v1)
-/* CD4614 802427E4 0040802D */  daddu     $s0, $v0, $zero
-/* CD4618 802427E8 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CD461C 802427EC A7A0002C */  sh        $zero, 0x2c($sp)
-/* CD4620 802427F0 12200007 */  beqz      $s1, .L80242810
-/* CD4624 802427F4 AFA30024 */   sw       $v1, 0x24($sp)
-/* CD4628 802427F8 02A0202D */  daddu     $a0, $s5, $zero
-/* CD462C 802427FC 0240282D */  daddu     $a1, $s2, $zero
-/* CD4630 80242800 0280302D */  daddu     $a2, $s4, $zero
-/* CD4634 80242804 0C09080E */  jal       flo_16_UnkFunc5
-/* CD4638 80242808 0200382D */   daddu    $a3, $s0, $zero
-/* CD463C 8024280C AE800070 */  sw        $zero, 0x70($s4)
-.L80242810:
-/* CD4640 80242810 2402FFFE */  addiu     $v0, $zero, -2
-/* CD4644 80242814 A2A200AB */  sb        $v0, 0xab($s5)
-/* CD4648 80242818 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CD464C 8024281C 30620004 */  andi      $v0, $v1, 4
-/* CD4650 80242820 10400007 */  beqz      $v0, .L80242840
-/* CD4654 80242824 00000000 */   nop
-/* CD4658 80242828 824200B4 */  lb        $v0, 0xb4($s2)
-/* CD465C 8024282C 1440003A */  bnez      $v0, .L80242918
-/* CD4660 80242830 0000102D */   daddu    $v0, $zero, $zero
-/* CD4664 80242834 2402FFFB */  addiu     $v0, $zero, -5
-/* CD4668 80242838 00621024 */  and       $v0, $v1, $v0
-/* CD466C 8024283C AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80242840:
-/* CD4670 80242840 8E830070 */  lw        $v1, 0x70($s4)
-/* CD4674 80242844 2C620015 */  sltiu     $v0, $v1, 0x15
-/* CD4678 80242848 10400032 */  beqz      $v0, L80242914_CD4744
-/* CD467C 8024284C 00031080 */   sll      $v0, $v1, 2
-/* CD4680 80242850 3C018024 */  lui       $at, %hi(jtbl_80245450_CD7280)
-/* CD4684 80242854 00220821 */  addu      $at, $at, $v0
-/* CD4688 80242858 8C225450 */  lw        $v0, %lo(jtbl_80245450_CD7280)($at)
-/* CD468C 8024285C 00400008 */  jr        $v0
-/* CD4690 80242860 00000000 */   nop
-glabel L80242864_CD4694
-/* CD4694 80242864 0280202D */  daddu     $a0, $s4, $zero
-/* CD4698 80242868 0200282D */  daddu     $a1, $s0, $zero
-/* CD469C 8024286C 0C090394 */  jal       func_80240E50_CD2C80
-/* CD46A0 80242870 0260302D */   daddu    $a2, $s3, $zero
-glabel L80242874_CD46A4
-/* CD46A4 80242874 0280202D */  daddu     $a0, $s4, $zero
-/* CD46A8 80242878 0200282D */  daddu     $a1, $s0, $zero
-/* CD46AC 8024287C 0C090400 */  jal       func_80241000_CD2E30
-/* CD46B0 80242880 0260302D */   daddu    $a2, $s3, $zero
-/* CD46B4 80242884 08090A46 */  j         .L80242918
-/* CD46B8 80242888 0000102D */   daddu    $v0, $zero, $zero
-glabel L8024288C_CD46BC
-/* CD46BC 8024288C 0280202D */  daddu     $a0, $s4, $zero
-/* CD46C0 80242890 0200282D */  daddu     $a1, $s0, $zero
-/* CD46C4 80242894 0C09058A */  jal       flo_16_UnkNpcAIFunc1
-/* CD46C8 80242898 0260302D */   daddu    $a2, $s3, $zero
-glabel L8024289C_CD46CC
-/* CD46CC 8024289C 0280202D */  daddu     $a0, $s4, $zero
-/* CD46D0 802428A0 0200282D */  daddu     $a1, $s0, $zero
-/* CD46D4 802428A4 0C0905BA */  jal       flo_16_UnkFunc4
-/* CD46D8 802428A8 0260302D */   daddu    $a2, $s3, $zero
-/* CD46DC 802428AC 08090A46 */  j         .L80242918
-/* CD46E0 802428B0 0000102D */   daddu    $v0, $zero, $zero
-glabel L802428B4_CD46E4
-/* CD46E4 802428B4 0280202D */  daddu     $a0, $s4, $zero
-/* CD46E8 802428B8 0200282D */  daddu     $a1, $s0, $zero
-/* CD46EC 802428BC 0C09068B */  jal       flo_16_UnkNpcAIFunc2
-/* CD46F0 802428C0 0260302D */   daddu    $a2, $s3, $zero
-glabel L802428C4_CD46F4
-/* CD46F4 802428C4 0280202D */  daddu     $a0, $s4, $zero
-/* CD46F8 802428C8 0200282D */  daddu     $a1, $s0, $zero
-/* CD46FC 802428CC 0C0906A9 */  jal       func_80241AA4_CD38D4
-/* CD4700 802428D0 0260302D */   daddu    $a2, $s3, $zero
-/* CD4704 802428D4 08090A46 */  j         .L80242918
-/* CD4708 802428D8 0000102D */   daddu    $v0, $zero, $zero
-glabel L802428DC_CD470C
-/* CD470C 802428DC 0280202D */  daddu     $a0, $s4, $zero
-/* CD4710 802428E0 0200282D */  daddu     $a1, $s0, $zero
-/* CD4714 802428E4 0C0908D2 */  jal       flo_16_UnkNpcAIFunc13
-/* CD4718 802428E8 0260302D */   daddu    $a2, $s3, $zero
-glabel L802428EC_CD471C
-/* CD471C 802428EC 0280202D */  daddu     $a0, $s4, $zero
-/* CD4720 802428F0 0200282D */  daddu     $a1, $s0, $zero
-/* CD4724 802428F4 0C09091E */  jal       func_80242478_CD42A8
-/* CD4728 802428F8 0260302D */   daddu    $a2, $s3, $zero
-/* CD472C 802428FC 08090A46 */  j         .L80242918
-/* CD4730 80242900 0000102D */   daddu    $v0, $zero, $zero
-glabel L80242904_CD4734
-/* CD4734 80242904 0280202D */  daddu     $a0, $s4, $zero
-/* CD4738 80242908 0200282D */  daddu     $a1, $s0, $zero
-/* CD473C 8024290C 0C0909BE */  jal       func_802426F8_CD4528
-/* CD4740 80242910 0260302D */   daddu    $a2, $s3, $zero
-glabel L80242914_CD4744
-/* CD4744 80242914 0000102D */  daddu     $v0, $zero, $zero
-.L80242918:
-/* CD4748 80242918 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CD474C 8024291C 8FB50044 */  lw        $s5, 0x44($sp)
-/* CD4750 80242920 8FB40040 */  lw        $s4, 0x40($sp)
-/* CD4754 80242924 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CD4758 80242928 8FB20038 */  lw        $s2, 0x38($sp)
-/* CD475C 8024292C 8FB10034 */  lw        $s1, 0x34($sp)
-/* CD4760 80242930 8FB00030 */  lw        $s0, 0x30($sp)
-/* CD4764 80242934 03E00008 */  jr        $ra
-/* CD4768 80242938 27BD0050 */   addiu    $sp, $sp, 0x50
-/* CD476C 8024293C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940_CD4770.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940_CD4770.s
deleted file mode 100644
index fc86a0e232..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940_CD4770.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242940_CD4770
-/* CD4770 80242940 AC800084 */  sw        $zero, 0x84($a0)
-/* CD4774 80242944 3C038011 */  lui       $v1, %hi(gPlayerActionState)
-/* CD4778 80242948 8063F07C */  lb        $v1, %lo(gPlayerActionState)($v1)
-/* CD477C 8024294C 2402000E */  addiu     $v0, $zero, 0xe
-/* CD4780 80242950 10620004 */  beq       $v1, $v0, .L80242964
-/* CD4784 80242954 24020001 */   addiu    $v0, $zero, 1
-/* CD4788 80242958 24020010 */  addiu     $v0, $zero, 0x10
-/* CD478C 8024295C 14620002 */  bne       $v1, $v0, .L80242968
-/* CD4790 80242960 24020001 */   addiu    $v0, $zero, 1
-.L80242964:
-/* CD4794 80242964 AC820084 */  sw        $v0, 0x84($a0)
-.L80242968:
-/* CD4798 80242968 03E00008 */  jr        $ra
-/* CD479C 8024296C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD72E0/func_80240000_CD72E0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD72E0/func_80240000_CD72E0.s
deleted file mode 100644
index 18defe33cd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD72E0/func_80240000_CD72E0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CD72E0
-/* CD72E0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CD72E4 80240004 24040001 */  addiu     $a0, $zero, 1
-/* CD72E8 80240008 0000282D */  daddu     $a1, $zero, $zero
-/* CD72EC 8024000C 00A0302D */  daddu     $a2, $a1, $zero
-/* CD72F0 80240010 00A0382D */  daddu     $a3, $a1, $zero
-/* CD72F4 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CD72F8 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CD72FC 8024001C 0C01CA54 */  jal       func_80072950
-/* CD7300 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CD7304 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CD7308 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CD730C 8024002C 03E00008 */  jr        $ra
-/* CD7310 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CD7314 80240034 00000000 */  nop
-/* CD7318 80240038 00000000 */  nop
-/* CD731C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7320/func_80240040_CD7320.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7320/func_80240040_CD7320.s
deleted file mode 100644
index 82d233776e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7320/func_80240040_CD7320.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CD7320
-/* CD7320 80240040 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CD7324 80240044 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CD7328 80240048 8C82000C */  lw        $v0, 0xc($a0)
-/* CD732C 8024004C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x6)
-/* CD7330 80240050 84C6A556 */  lh        $a2, %lo(gCollisionStatus+0x6)($a2)
-/* CD7334 80240054 0C0B2026 */  jal       set_variable
-/* CD7338 80240058 8C450000 */   lw       $a1, ($v0)
-/* CD733C 8024005C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CD7340 80240060 24020002 */  addiu     $v0, $zero, 2
-/* CD7344 80240064 03E00008 */  jr        $ra
-/* CD7348 80240068 27BD0018 */   addiu    $sp, $sp, 0x18
-/* CD734C 8024006C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80240220_CD7500.s
similarity index 99%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80240220_CD7500.s
index fc3c9d0573..f414a0c9ec 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80240220_CD7500.s
@@ -1,6 +1,14 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+glabel D_80245308_CDC5E8
+.double 0.09
+
+glabel D_80245310_CDC5F0
+.double 0.09
+
+.section .text
 glabel func_80240220_CD7500
 /* CD7500 80240220 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* CD7504 80240224 AFB3004C */  sw        $s3, 0x4c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s
similarity index 98%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s
index cf75fec29e..de4fd5958b 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_80241C64_CD8F44
+glabel flo_17_func_80241C64_CD8F44
 /* CD8F44 80241C64 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* CD8F48 80241C68 AFB40050 */  sw        $s4, 0x50($sp)
 /* CD8F4C 80241C6C 0080A02D */  daddu     $s4, $a0, $zero
@@ -85,12 +85,12 @@ glabel func_80241C64_CD8F44
 .L80241D98:
 /* CD9078 80241D98 0280202D */  daddu     $a0, $s4, $zero
 /* CD907C 80241D9C 02C0282D */  daddu     $a1, $s6, $zero
-/* CD9080 80241DA0 0C09001C */  jal       func_80240070_CD7350
+/* CD9080 80241DA0 0C09001C */  jal       flo_17_func_80240070_CD7350
 /* CD9084 80241DA4 02A0302D */   daddu    $a2, $s5, $zero
 .L80241DA8:
 /* CD9088 80241DA8 0280202D */  daddu     $a0, $s4, $zero
 /* CD908C 80241DAC 02C0282D */  daddu     $a1, $s6, $zero
-/* CD9090 80241DB0 0C09056C */  jal       func_802415B0_CD8890
+/* CD9090 80241DB0 0C09056C */  jal       flo_17_func_802415B0_CD8890
 /* CD9094 80241DB4 02A0302D */   daddu    $a2, $s5, $zero
 /* CD9098 80241DB8 08090778 */  j         .L80241DE0
 /* CD909C 80241DBC 00000000 */   nop
@@ -102,7 +102,7 @@ glabel func_80241C64_CD8F44
 /* CD90B0 80241DD0 0280202D */  daddu     $a0, $s4, $zero
 .L80241DD4:
 /* CD90B4 80241DD4 02C0282D */  daddu     $a1, $s6, $zero
-/* CD90B8 80241DD8 0C090685 */  jal       func_80241A14_CD8CF4
+/* CD90B8 80241DD8 0C090685 */  jal       flo_17_func_80241A14_CD8CF4
 /* CD90BC 80241DDC 02A0302D */   daddu    $a2, $s5, $zero
 .L80241DE0:
 /* CD90C0 80241DE0 8E830070 */  lw        $v1, 0x70($s4)
@@ -117,7 +117,7 @@ glabel func_80241C64_CD8F44
 /* CD90E0 80241E00 8C460028 */  lw        $a2, 0x28($v0)
 /* CD90E4 80241E04 0C00A720 */  jal       atan2
 /* CD90E8 80241E08 8C470030 */   lw       $a3, 0x30($v0)
-/* CD90EC 80241E0C 0C09055A */  jal       func_80241568_CD8848
+/* CD90EC 80241E0C 0C09055A */  jal       flo_17_func_80241568_CD8848
 /* CD90F0 80241E10 E640000C */   swc1     $f0, 0xc($s2)
 /* CD90F4 80241E14 0440000F */  bltz      $v0, .L80241E54
 /* CD90F8 80241E18 AE62007C */   sw       $v0, 0x7c($s3)
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s
deleted file mode 100644
index ec4884ec8f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240070_CD7350
-/* CD7350 80240070 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CD7354 80240074 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CD7358 80240078 0080982D */  daddu     $s3, $a0, $zero
-/* CD735C 8024007C AFBF0030 */  sw        $ra, 0x30($sp)
-/* CD7360 80240080 AFB20028 */  sw        $s2, 0x28($sp)
-/* CD7364 80240084 AFB10024 */  sw        $s1, 0x24($sp)
-/* CD7368 80240088 AFB00020 */  sw        $s0, 0x20($sp)
-/* CD736C 8024008C 8E710148 */  lw        $s1, 0x148($s3)
-/* CD7370 80240090 86240008 */  lh        $a0, 8($s1)
-/* CD7374 80240094 0C00EABB */  jal       get_npc_unsafe
-/* CD7378 80240098 00A0902D */   daddu    $s2, $a1, $zero
-/* CD737C 8024009C 8E440004 */  lw        $a0, 4($s2)
-/* CD7380 802400A0 0040802D */  daddu     $s0, $v0, $zero
-/* CD7384 802400A4 00041FC2 */  srl       $v1, $a0, 0x1f
-/* CD7388 802400A8 00832021 */  addu      $a0, $a0, $v1
-/* CD738C 802400AC 00042043 */  sra       $a0, $a0, 1
-/* CD7390 802400B0 0C00A67F */  jal       rand_int
-/* CD7394 802400B4 24840001 */   addiu    $a0, $a0, 1
-/* CD7398 802400B8 8E430004 */  lw        $v1, 4($s2)
-/* CD739C 802400BC 000327C2 */  srl       $a0, $v1, 0x1f
-/* CD73A0 802400C0 00641821 */  addu      $v1, $v1, $a0
-/* CD73A4 802400C4 00031843 */  sra       $v1, $v1, 1
-/* CD73A8 802400C8 00621821 */  addu      $v1, $v1, $v0
-/* CD73AC 802400CC A603008E */  sh        $v1, 0x8e($s0)
-/* CD73B0 802400D0 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD73B4 802400D4 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CD73B8 802400D8 C4640000 */  lwc1      $f4, ($v1)
-/* CD73BC 802400DC 46802120 */  cvt.s.w   $f4, $f4
-/* CD73C0 802400E0 C4620008 */  lwc1      $f2, 8($v1)
-/* CD73C4 802400E4 468010A0 */  cvt.s.w   $f2, $f2
-/* CD73C8 802400E8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD73CC 802400EC 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD73D0 802400F0 44061000 */  mfc1      $a2, $f2
-/* CD73D4 802400F4 C440000C */  lwc1      $f0, 0xc($v0)
-/* CD73D8 802400F8 46800020 */  cvt.s.w   $f0, $f0
-/* CD73DC 802400FC E7A00014 */  swc1      $f0, 0x14($sp)
-/* CD73E0 80240100 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD73E4 80240104 44052000 */  mfc1      $a1, $f4
-/* CD73E8 80240108 C4400010 */  lwc1      $f0, 0x10($v0)
-/* CD73EC 8024010C 46800020 */  cvt.s.w   $f0, $f0
-/* CD73F0 80240110 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CD73F4 80240114 8C640018 */  lw        $a0, 0x18($v1)
-/* CD73F8 80240118 0C0123F5 */  jal       is_point_within_region
-/* CD73FC 8024011C 8E070038 */   lw       $a3, 0x38($s0)
-/* CD7400 80240120 1040000E */  beqz      $v0, .L8024015C
-/* CD7404 80240124 00000000 */   nop
-/* CD7408 80240128 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD740C 8024012C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CD7410 80240130 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CD7414 80240134 C4460000 */  lwc1      $f6, ($v0)
-/* CD7418 80240138 468031A0 */  cvt.s.w   $f6, $f6
-/* CD741C 8024013C 44063000 */  mfc1      $a2, $f6
-/* CD7420 80240140 C4460008 */  lwc1      $f6, 8($v0)
-/* CD7424 80240144 468031A0 */  cvt.s.w   $f6, $f6
-/* CD7428 80240148 44073000 */  mfc1      $a3, $f6
-/* CD742C 8024014C 0C00A720 */  jal       atan2
-/* CD7430 80240150 00000000 */   nop
-/* CD7434 80240154 08090063 */  j         .L8024018C
-/* CD7438 80240158 E600000C */   swc1     $f0, 0xc($s0)
-.L8024015C:
-/* CD743C 8024015C 0C00A67F */  jal       rand_int
-/* CD7440 80240160 2404003C */   addiu    $a0, $zero, 0x3c
-/* CD7444 80240164 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CD7448 80240168 44820000 */  mtc1      $v0, $f0
-/* CD744C 8024016C 00000000 */  nop
-/* CD7450 80240170 46800020 */  cvt.s.w   $f0, $f0
-/* CD7454 80240174 46006300 */  add.s     $f12, $f12, $f0
-/* CD7458 80240178 3C0141F0 */  lui       $at, 0x41f0
-/* CD745C 8024017C 44810000 */  mtc1      $at, $f0
-/* CD7460 80240180 0C00A6C9 */  jal       clamp_angle
-/* CD7464 80240184 46006301 */   sub.s    $f12, $f12, $f0
-/* CD7468 80240188 E600000C */  swc1      $f0, 0xc($s0)
-.L8024018C:
-/* CD746C 8024018C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CD7470 80240190 8C420004 */  lw        $v0, 4($v0)
-/* CD7474 80240194 AE020028 */  sw        $v0, 0x28($s0)
-/* CD7478 80240198 AE600074 */  sw        $zero, 0x74($s3)
-/* CD747C 8024019C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD7480 802401A0 8C420014 */  lw        $v0, 0x14($v0)
-/* CD7484 802401A4 04410004 */  bgez      $v0, .L802401B8
-/* CD7488 802401A8 00000000 */   nop
-/* CD748C 802401AC C6400000 */  lwc1      $f0, ($s2)
-/* CD7490 802401B0 08090076 */  j         .L802401D8
-/* CD7494 802401B4 E6000018 */   swc1     $f0, 0x18($s0)
-.L802401B8:
-/* CD7498 802401B8 3C018024 */  lui       $at, %hi(D_80245300_CDC5E0)
-/* CD749C 802401BC D4225300 */  ldc1      $f2, %lo(D_80245300_CDC5E0)($at)
-/* CD74A0 802401C0 44820000 */  mtc1      $v0, $f0
-/* CD74A4 802401C4 00000000 */  nop
-/* CD74A8 802401C8 46800021 */  cvt.d.w   $f0, $f0
-/* CD74AC 802401CC 46220003 */  div.d     $f0, $f0, $f2
-/* CD74B0 802401D0 46200020 */  cvt.s.d   $f0, $f0
-/* CD74B4 802401D4 E6000018 */  swc1      $f0, 0x18($s0)
-.L802401D8:
-/* CD74B8 802401D8 C600003C */  lwc1      $f0, 0x3c($s0)
-/* CD74BC 802401DC 3C014059 */  lui       $at, 0x4059
-/* CD74C0 802401E0 44811800 */  mtc1      $at, $f3
-/* CD74C4 802401E4 44801000 */  mtc1      $zero, $f2
-/* CD74C8 802401E8 46000021 */  cvt.d.s   $f0, $f0
-/* CD74CC 802401EC 46220002 */  mul.d     $f0, $f0, $f2
-/* CD74D0 802401F0 00000000 */  nop
-/* CD74D4 802401F4 24020001 */  addiu     $v0, $zero, 1
-/* CD74D8 802401F8 4620018D */  trunc.w.d $f6, $f0
-/* CD74DC 802401FC E626007C */  swc1      $f6, 0x7c($s1)
-/* CD74E0 80240200 AE620070 */  sw        $v0, 0x70($s3)
-/* CD74E4 80240204 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CD74E8 80240208 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CD74EC 8024020C 8FB20028 */  lw        $s2, 0x28($sp)
-/* CD74F0 80240210 8FB10024 */  lw        $s1, 0x24($sp)
-/* CD74F4 80240214 8FB00020 */  lw        $s0, 0x20($sp)
-/* CD74F8 80240218 03E00008 */  jr        $ra
-/* CD74FC 8024021C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240CC4_CD7FA4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240CC4_CD7FA4.s
deleted file mode 100644
index 02e0156673..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240CC4_CD7FA4.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CC4_CD7FA4
-/* CD7FA4 80240CC4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CD7FA8 80240CC8 AFB00010 */  sw        $s0, 0x10($sp)
-/* CD7FAC 80240CCC 0080802D */  daddu     $s0, $a0, $zero
-/* CD7FB0 80240CD0 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CD7FB4 80240CD4 8E020148 */  lw        $v0, 0x148($s0)
-/* CD7FB8 80240CD8 0C00EABB */  jal       get_npc_unsafe
-/* CD7FBC 80240CDC 84440008 */   lh       $a0, 8($v0)
-/* CD7FC0 80240CE0 9443008E */  lhu       $v1, 0x8e($v0)
-/* CD7FC4 80240CE4 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CD7FC8 80240CE8 24640001 */  addiu     $a0, $v1, 1
-/* CD7FCC 80240CEC 00031C00 */  sll       $v1, $v1, 0x10
-/* CD7FD0 80240CF0 00031B83 */  sra       $v1, $v1, 0xe
-/* CD7FD4 80240CF4 A444008E */  sh        $a0, 0x8e($v0)
-/* CD7FD8 80240CF8 3C018024 */  lui       $at, %hi(D_8024440C_CDB6EC)
-/* CD7FDC 80240CFC 00230821 */  addu      $at, $at, $v1
-/* CD7FE0 80240D00 C422440C */  lwc1      $f2, %lo(D_8024440C_CDB6EC)($at)
-/* CD7FE4 80240D04 8443008E */  lh        $v1, 0x8e($v0)
-/* CD7FE8 80240D08 46020000 */  add.s     $f0, $f0, $f2
-/* CD7FEC 80240D0C 28630005 */  slti      $v1, $v1, 5
-/* CD7FF0 80240D10 14600003 */  bnez      $v1, .L80240D20
-/* CD7FF4 80240D14 E440003C */   swc1     $f0, 0x3c($v0)
-/* CD7FF8 80240D18 2402000C */  addiu     $v0, $zero, 0xc
-/* CD7FFC 80240D1C AE020070 */  sw        $v0, 0x70($s0)
-.L80240D20:
-/* CD8000 80240D20 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CD8004 80240D24 8FB00010 */  lw        $s0, 0x10($sp)
-/* CD8008 80240D28 03E00008 */  jr        $ra
-/* CD800C 80240D2C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s
deleted file mode 100644
index 71b5af7173..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024137C_CD865C
-/* CD865C 8024137C 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CD8660 80241380 AFB40040 */  sw        $s4, 0x40($sp)
-/* CD8664 80241384 0080A02D */  daddu     $s4, $a0, $zero
-/* CD8668 80241388 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CD866C 8024138C AFB50044 */  sw        $s5, 0x44($sp)
-/* CD8670 80241390 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CD8674 80241394 AFB20038 */  sw        $s2, 0x38($sp)
-/* CD8678 80241398 AFB10034 */  sw        $s1, 0x34($sp)
-/* CD867C 8024139C AFB00030 */  sw        $s0, 0x30($sp)
-/* CD8680 802413A0 8E920148 */  lw        $s2, 0x148($s4)
-/* CD8684 802413A4 86440008 */  lh        $a0, 8($s2)
-/* CD8688 802413A8 8E90000C */  lw        $s0, 0xc($s4)
-/* CD868C 802413AC 0C00EABB */  jal       get_npc_unsafe
-/* CD8690 802413B0 00A0882D */   daddu    $s1, $a1, $zero
-/* CD8694 802413B4 0280202D */  daddu     $a0, $s4, $zero
-/* CD8698 802413B8 8E050000 */  lw        $a1, ($s0)
-/* CD869C 802413BC 0C0B1EAF */  jal       get_variable
-/* CD86A0 802413C0 0040A82D */   daddu    $s5, $v0, $zero
-/* CD86A4 802413C4 AFA00010 */  sw        $zero, 0x10($sp)
-/* CD86A8 802413C8 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD86AC 802413CC 8C630030 */  lw        $v1, 0x30($v1)
-/* CD86B0 802413D0 AFA30014 */  sw        $v1, 0x14($sp)
-/* CD86B4 802413D4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD86B8 802413D8 8C63001C */  lw        $v1, 0x1c($v1)
-/* CD86BC 802413DC AFA30018 */  sw        $v1, 0x18($sp)
-/* CD86C0 802413E0 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD86C4 802413E4 8C630024 */  lw        $v1, 0x24($v1)
-/* CD86C8 802413E8 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CD86CC 802413EC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD86D0 802413F0 8C630028 */  lw        $v1, 0x28($v1)
-/* CD86D4 802413F4 27B30010 */  addiu     $s3, $sp, 0x10
-/* CD86D8 802413F8 AFA30020 */  sw        $v1, 0x20($sp)
-/* CD86DC 802413FC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD86E0 80241400 3C0142F0 */  lui       $at, 0x42f0
-/* CD86E4 80241404 44810000 */  mtc1      $at, $f0
-/* CD86E8 80241408 8C63002C */  lw        $v1, 0x2c($v1)
-/* CD86EC 8024140C 0040802D */  daddu     $s0, $v0, $zero
-/* CD86F0 80241410 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CD86F4 80241414 A7A0002C */  sh        $zero, 0x2c($sp)
-/* CD86F8 80241418 12200006 */  beqz      $s1, .L80241434
-/* CD86FC 8024141C AFA30024 */   sw       $v1, 0x24($sp)
-/* CD8700 80241420 02A0202D */  daddu     $a0, $s5, $zero
-/* CD8704 80241424 0240282D */  daddu     $a1, $s2, $zero
-/* CD8708 80241428 0280302D */  daddu     $a2, $s4, $zero
-/* CD870C 8024142C 0C090496 */  jal       flo_17_UnkFunc5
-/* CD8710 80241430 0200382D */   daddu    $a3, $s0, $zero
-.L80241434:
-/* CD8714 80241434 2402FFFE */  addiu     $v0, $zero, -2
-/* CD8718 80241438 A2A200AB */  sb        $v0, 0xab($s5)
-/* CD871C 8024143C 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CD8720 80241440 30620004 */  andi      $v0, $v1, 4
-/* CD8724 80241444 10400007 */  beqz      $v0, .L80241464
-/* CD8728 80241448 00000000 */   nop
-/* CD872C 8024144C 824200B4 */  lb        $v0, 0xb4($s2)
-/* CD8730 80241450 1440003C */  bnez      $v0, .L80241544
-/* CD8734 80241454 0000102D */   daddu    $v0, $zero, $zero
-/* CD8738 80241458 2402FFFB */  addiu     $v0, $zero, -5
-/* CD873C 8024145C 00621024 */  and       $v0, $v1, $v0
-/* CD8740 80241460 AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80241464:
-/* CD8744 80241464 8E830070 */  lw        $v1, 0x70($s4)
-/* CD8748 80241468 2C62000F */  sltiu     $v0, $v1, 0xf
-/* CD874C 8024146C 10400034 */  beqz      $v0, L80241540_CD8820
-/* CD8750 80241470 00031080 */   sll      $v0, $v1, 2
-/* CD8754 80241474 3C018024 */  lui       $at, %hi(jtbl_80245318_CDC5F8)
-/* CD8758 80241478 00220821 */  addu      $at, $at, $v0
-/* CD875C 8024147C 8C225318 */  lw        $v0, %lo(jtbl_80245318_CDC5F8)($at)
-/* CD8760 80241480 00400008 */  jr        $v0
-/* CD8764 80241484 00000000 */   nop
-glabel L80241488_CD8768
-/* CD8768 80241488 0280202D */  daddu     $a0, $s4, $zero
-/* CD876C 8024148C 0200282D */  daddu     $a1, $s0, $zero
-/* CD8770 80241490 0C09001C */  jal       func_80240070_CD7350
-/* CD8774 80241494 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241498_CD8778
-/* CD8778 80241498 0280202D */  daddu     $a0, $s4, $zero
-/* CD877C 8024149C 0200282D */  daddu     $a1, $s0, $zero
-/* CD8780 802414A0 0C090088 */  jal       func_80240220_CD7500
-/* CD8784 802414A4 0260302D */   daddu    $a2, $s3, $zero
-/* CD8788 802414A8 08090551 */  j         .L80241544
-/* CD878C 802414AC 0000102D */   daddu    $v0, $zero, $zero
-glabel L802414B0_CD8790
-/* CD8790 802414B0 0280202D */  daddu     $a0, $s4, $zero
-/* CD8794 802414B4 0200282D */  daddu     $a1, $s0, $zero
-/* CD8798 802414B8 0C090212 */  jal       flo_17_UnkNpcAIFunc1
-/* CD879C 802414BC 0260302D */   daddu    $a2, $s3, $zero
-glabel L802414C0_CD87A0
-/* CD87A0 802414C0 0280202D */  daddu     $a0, $s4, $zero
-/* CD87A4 802414C4 0200282D */  daddu     $a1, $s0, $zero
-/* CD87A8 802414C8 0C090242 */  jal       flo_17_UnkFunc4
-/* CD87AC 802414CC 0260302D */   daddu    $a2, $s3, $zero
-/* CD87B0 802414D0 08090551 */  j         .L80241544
-/* CD87B4 802414D4 0000102D */   daddu    $v0, $zero, $zero
-glabel L802414D8_CD87B8
-/* CD87B8 802414D8 0280202D */  daddu     $a0, $s4, $zero
-/* CD87BC 802414DC 0200282D */  daddu     $a1, $s0, $zero
-/* CD87C0 802414E0 0C090313 */  jal       flo_17_UnkNpcAIFunc2
-/* CD87C4 802414E4 0260302D */   daddu    $a2, $s3, $zero
-glabel L802414E8_CD87C8
-/* CD87C8 802414E8 0280202D */  daddu     $a0, $s4, $zero
-/* CD87CC 802414EC 0200282D */  daddu     $a1, $s0, $zero
-/* CD87D0 802414F0 0C090331 */  jal       func_80240CC4_CD7FA4
-/* CD87D4 802414F4 0260302D */   daddu    $a2, $s3, $zero
-/* CD87D8 802414F8 08090551 */  j         .L80241544
-/* CD87DC 802414FC 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241500_CD87E0
-/* CD87E0 80241500 0280202D */  daddu     $a0, $s4, $zero
-/* CD87E4 80241504 0200282D */  daddu     $a1, $s0, $zero
-/* CD87E8 80241508 0C09034C */  jal       flo_17_UnkNpcAIFunc14
-/* CD87EC 8024150C 0260302D */   daddu    $a2, $s3, $zero
-/* CD87F0 80241510 08090551 */  j         .L80241544
-/* CD87F4 80241514 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241518_CD87F8
-/* CD87F8 80241518 0280202D */  daddu     $a0, $s4, $zero
-/* CD87FC 8024151C 0200282D */  daddu     $a1, $s0, $zero
-/* CD8800 80241520 0C090399 */  jal       flo_17_UnkNpcAIFunc3
-/* CD8804 80241524 0260302D */   daddu    $a2, $s3, $zero
-/* CD8808 80241528 08090551 */  j         .L80241544
-/* CD880C 8024152C 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241530_CD8810
-/* CD8810 80241530 0280202D */  daddu     $a0, $s4, $zero
-/* CD8814 80241534 0200282D */  daddu     $a1, $s0, $zero
-/* CD8818 80241538 0C0903B2 */  jal       flo_17_UnkFunc6
-/* CD881C 8024153C 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241540_CD8820
-/* CD8820 80241540 0000102D */  daddu     $v0, $zero, $zero
-.L80241544:
-/* CD8824 80241544 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CD8828 80241548 8FB50044 */  lw        $s5, 0x44($sp)
-/* CD882C 8024154C 8FB40040 */  lw        $s4, 0x40($sp)
-/* CD8830 80241550 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CD8834 80241554 8FB20038 */  lw        $s2, 0x38($sp)
-/* CD8838 80241558 8FB10034 */  lw        $s1, 0x34($sp)
-/* CD883C 8024155C 8FB00030 */  lw        $s0, 0x30($sp)
-/* CD8840 80241560 03E00008 */  jr        $ra
-/* CD8844 80241564 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568_CD8848.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568_CD8848.s
deleted file mode 100644
index c986ccf0cd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568_CD8848.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241568_CD8848
-/* CD8848 80241568 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CD884C 8024156C AFB00010 */  sw        $s0, 0x10($sp)
-/* CD8850 80241570 24100032 */  addiu     $s0, $zero, 0x32
-/* CD8854 80241574 AFBF0014 */  sw        $ra, 0x14($sp)
-.L80241578:
-/* CD8858 80241578 0C00FB3A */  jal       get_enemy
-/* CD885C 8024157C 0200202D */   daddu    $a0, $s0, $zero
-/* CD8860 80241580 8C420094 */  lw        $v0, 0x94($v0)
-/* CD8864 80241584 54400003 */  bnel      $v0, $zero, .L80241594
-/* CD8868 80241588 26100001 */   addiu    $s0, $s0, 1
-/* CD886C 8024158C 08090568 */  j         .L802415A0
-/* CD8870 80241590 0200102D */   daddu    $v0, $s0, $zero
-.L80241594:
-/* CD8874 80241594 2A020036 */  slti      $v0, $s0, 0x36
-/* CD8878 80241598 1440FFF7 */  bnez      $v0, .L80241578
-/* CD887C 8024159C 2402FFFF */   addiu    $v0, $zero, -1
-.L802415A0:
-/* CD8880 802415A0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CD8884 802415A4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CD8888 802415A8 03E00008 */  jr        $ra
-/* CD888C 802415AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802415B0_CD8890.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802415B0_CD8890.s
deleted file mode 100644
index d1ea718cc6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802415B0_CD8890.s
+++ /dev/null
@@ -1,295 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415B0_CD8890
-/* CD8890 802415B0 27BDFF78 */  addiu     $sp, $sp, -0x88
-/* CD8894 802415B4 AFB20048 */  sw        $s2, 0x48($sp)
-/* CD8898 802415B8 0080902D */  daddu     $s2, $a0, $zero
-/* CD889C 802415BC AFBF0064 */  sw        $ra, 0x64($sp)
-/* CD88A0 802415C0 AFBE0060 */  sw        $fp, 0x60($sp)
-/* CD88A4 802415C4 AFB7005C */  sw        $s7, 0x5c($sp)
-/* CD88A8 802415C8 AFB60058 */  sw        $s6, 0x58($sp)
-/* CD88AC 802415CC AFB50054 */  sw        $s5, 0x54($sp)
-/* CD88B0 802415D0 AFB40050 */  sw        $s4, 0x50($sp)
-/* CD88B4 802415D4 AFB3004C */  sw        $s3, 0x4c($sp)
-/* CD88B8 802415D8 AFB10044 */  sw        $s1, 0x44($sp)
-/* CD88BC 802415DC AFB00040 */  sw        $s0, 0x40($sp)
-/* CD88C0 802415E0 F7BA0080 */  sdc1      $f26, 0x80($sp)
-/* CD88C4 802415E4 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* CD88C8 802415E8 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* CD88CC 802415EC F7B40068 */  sdc1      $f20, 0x68($sp)
-/* CD88D0 802415F0 8E510148 */  lw        $s1, 0x148($s2)
-/* CD88D4 802415F4 00A0B82D */  daddu     $s7, $a1, $zero
-/* CD88D8 802415F8 86240008 */  lh        $a0, 8($s1)
-/* CD88DC 802415FC 0C00EABB */  jal       get_npc_unsafe
-/* CD88E0 80241600 00C0F02D */   daddu    $fp, $a2, $zero
-/* CD88E4 80241604 C620007C */  lwc1      $f0, 0x7c($s1)
-/* CD88E8 80241608 46800020 */  cvt.s.w   $f0, $f0
-/* CD88EC 8024160C 46000021 */  cvt.d.s   $f0, $f0
-/* CD88F0 80241610 0040802D */  daddu     $s0, $v0, $zero
-/* CD88F4 80241614 3C014059 */  lui       $at, 0x4059
-/* CD88F8 80241618 44813800 */  mtc1      $at, $f7
-/* CD88FC 8024161C 44803000 */  mtc1      $zero, $f6
-/* CD8900 80241620 8602008E */  lh        $v0, 0x8e($s0)
-/* CD8904 80241624 9603008E */  lhu       $v1, 0x8e($s0)
-/* CD8908 80241628 46260003 */  div.d     $f0, $f0, $f6
-/* CD890C 8024162C 462005A0 */  cvt.s.d   $f22, $f0
-/* CD8910 80241630 C6200078 */  lwc1      $f0, 0x78($s1)
-/* CD8914 80241634 46800020 */  cvt.s.w   $f0, $f0
-/* CD8918 80241638 46000021 */  cvt.d.s   $f0, $f0
-/* CD891C 8024163C 46260003 */  div.d     $f0, $f0, $f6
-/* CD8920 80241640 18400003 */  blez      $v0, .L80241650
-/* CD8924 80241644 46200620 */   cvt.s.d  $f24, $f0
-/* CD8928 80241648 2462FFFF */  addiu     $v0, $v1, -1
-/* CD892C 8024164C A602008E */  sh        $v0, 0x8e($s0)
-.L80241650:
-/* CD8930 80241650 27B40028 */  addiu     $s4, $sp, 0x28
-/* CD8934 80241654 0280282D */  daddu     $a1, $s4, $zero
-/* CD8938 80241658 27B5002C */  addiu     $s5, $sp, 0x2c
-/* CD893C 8024165C 02A0302D */  daddu     $a2, $s5, $zero
-/* CD8940 80241660 27B60030 */  addiu     $s6, $sp, 0x30
-/* CD8944 80241664 02C0382D */  daddu     $a3, $s6, $zero
-/* CD8948 80241668 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CD894C 8024166C C602003C */  lwc1      $f2, 0x3c($s0)
-/* CD8950 80241670 C6040040 */  lwc1      $f4, 0x40($s0)
-/* CD8954 80241674 3C01447A */  lui       $at, 0x447a
-/* CD8958 80241678 4481D000 */  mtc1      $at, $f26
-/* CD895C 8024167C 27B30034 */  addiu     $s3, $sp, 0x34
-/* CD8960 80241680 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CD8964 80241684 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* CD8968 80241688 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CD896C 8024168C E7BA0034 */  swc1      $f26, 0x34($sp)
-/* CD8970 80241690 C6340070 */  lwc1      $f20, 0x70($s1)
-/* CD8974 80241694 4680A520 */  cvt.s.w   $f20, $f20
-/* CD8978 80241698 4600A521 */  cvt.d.s   $f20, $f20
-/* CD897C 8024169C 4626A503 */  div.d     $f20, $f20, $f6
-/* CD8980 802416A0 AFB30010 */  sw        $s3, 0x10($sp)
-/* CD8984 802416A4 8E040080 */  lw        $a0, 0x80($s0)
-/* CD8988 802416A8 0C0372DF */  jal       func_800DCB7C
-/* CD898C 802416AC 4620A520 */   cvt.s.d  $f20, $f20
-/* CD8990 802416B0 C62C0074 */  lwc1      $f12, 0x74($s1)
-/* CD8994 802416B4 0C00A8BB */  jal       sin_deg
-/* CD8998 802416B8 46806320 */   cvt.s.w  $f12, $f12
-/* CD899C 802416BC 46140002 */  mul.s     $f0, $f0, $f20
-/* CD89A0 802416C0 00000000 */  nop
-/* CD89A4 802416C4 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* CD89A8 802416C8 46181080 */  add.s     $f2, $f2, $f24
-/* CD89AC 802416CC 46001080 */  add.s     $f2, $f2, $f0
-/* CD89B0 802416D0 E602003C */  swc1      $f2, 0x3c($s0)
-/* CD89B4 802416D4 8E220074 */  lw        $v0, 0x74($s1)
-/* CD89B8 802416D8 2442000C */  addiu     $v0, $v0, 0xc
-/* CD89BC 802416DC 44826000 */  mtc1      $v0, $f12
-/* CD89C0 802416E0 00000000 */  nop
-/* CD89C4 802416E4 0C00A6C9 */  jal       clamp_angle
-/* CD89C8 802416E8 46806320 */   cvt.s.w  $f12, $f12
-/* CD89CC 802416EC 4600020D */  trunc.w.s $f8, $f0
-/* CD89D0 802416F0 E6280074 */  swc1      $f8, 0x74($s1)
-/* CD89D4 802416F4 8EE30014 */  lw        $v1, 0x14($s7)
-/* CD89D8 802416F8 0460003C */  bltz      $v1, .L802417EC
-/* CD89DC 802416FC 00000000 */   nop
-/* CD89E0 80241700 8E420074 */  lw        $v0, 0x74($s2)
-/* CD89E4 80241704 1C400038 */  bgtz      $v0, .L802417E8
-/* CD89E8 80241708 2442FFFF */   addiu    $v0, $v0, -1
-/* CD89EC 8024170C 03C0202D */  daddu     $a0, $fp, $zero
-/* CD89F0 80241710 AE430074 */  sw        $v1, 0x74($s2)
-/* CD89F4 80241714 AFA00010 */  sw        $zero, 0x10($sp)
-/* CD89F8 80241718 8EE6000C */  lw        $a2, 0xc($s7)
-/* CD89FC 8024171C 8EE70010 */  lw        $a3, 0x10($s7)
-/* CD8A00 80241720 0C01242D */  jal       func_800490B4
-/* CD8A04 80241724 0220282D */   daddu    $a1, $s1, $zero
-/* CD8A08 80241728 1040002D */  beqz      $v0, .L802417E0
-/* CD8A0C 8024172C 0000202D */   daddu    $a0, $zero, $zero
-/* CD8A10 80241730 0200282D */  daddu     $a1, $s0, $zero
-/* CD8A14 80241734 0000302D */  daddu     $a2, $zero, $zero
-/* CD8A18 80241738 860300A8 */  lh        $v1, 0xa8($s0)
-/* CD8A1C 8024173C 3C013F80 */  lui       $at, 0x3f80
-/* CD8A20 80241740 44810000 */  mtc1      $at, $f0
-/* CD8A24 80241744 3C014000 */  lui       $at, 0x4000
-/* CD8A28 80241748 44811000 */  mtc1      $at, $f2
-/* CD8A2C 8024174C 3C01C1A0 */  lui       $at, 0xc1a0
-/* CD8A30 80241750 44812000 */  mtc1      $at, $f4
-/* CD8A34 80241754 2402000F */  addiu     $v0, $zero, 0xf
-/* CD8A38 80241758 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CD8A3C 8024175C 44834000 */  mtc1      $v1, $f8
-/* CD8A40 80241760 00000000 */  nop
-/* CD8A44 80241764 46804220 */  cvt.s.w   $f8, $f8
-/* CD8A48 80241768 44074000 */  mfc1      $a3, $f8
-/* CD8A4C 8024176C 27A20038 */  addiu     $v0, $sp, 0x38
-/* CD8A50 80241770 AFA20020 */  sw        $v0, 0x20($sp)
-/* CD8A54 80241774 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD8A58 80241778 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CD8A5C 8024177C 0C01BFA4 */  jal       fx_emote
-/* CD8A60 80241780 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CD8A64 80241784 0200202D */  daddu     $a0, $s0, $zero
-/* CD8A68 80241788 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* CD8A6C 8024178C 0C012530 */  jal       func_800494C0
-/* CD8A70 80241790 3C060020 */   lui      $a2, 0x20
-/* CD8A74 80241794 0280282D */  daddu     $a1, $s4, $zero
-/* CD8A78 80241798 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CD8A7C 8024179C C602003C */  lwc1      $f2, 0x3c($s0)
-/* CD8A80 802417A0 C6040040 */  lwc1      $f4, 0x40($s0)
-/* CD8A84 802417A4 02A0302D */  daddu     $a2, $s5, $zero
-/* CD8A88 802417A8 E7BA0034 */  swc1      $f26, 0x34($sp)
-/* CD8A8C 802417AC E7A00028 */  swc1      $f0, 0x28($sp)
-/* CD8A90 802417B0 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* CD8A94 802417B4 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CD8A98 802417B8 AFB30010 */  sw        $s3, 0x10($sp)
-/* CD8A9C 802417BC 8E040080 */  lw        $a0, 0x80($s0)
-/* CD8AA0 802417C0 0C0372DF */  jal       func_800DCB7C
-/* CD8AA4 802417C4 02C0382D */   daddu    $a3, $s6, $zero
-/* CD8AA8 802417C8 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* CD8AAC 802417CC 46180000 */  add.s     $f0, $f0, $f24
-/* CD8AB0 802417D0 2402000C */  addiu     $v0, $zero, 0xc
-/* CD8AB4 802417D4 E6000064 */  swc1      $f0, 0x64($s0)
-/* CD8AB8 802417D8 08090675 */  j         .L802419D4
-/* CD8ABC 802417DC AE420070 */   sw       $v0, 0x70($s2)
-.L802417E0:
-/* CD8AC0 802417E0 8E420074 */  lw        $v0, 0x74($s2)
-/* CD8AC4 802417E4 2442FFFF */  addiu     $v0, $v0, -1
-.L802417E8:
-/* CD8AC8 802417E8 AE420074 */  sw        $v0, 0x74($s2)
-.L802417EC:
-/* CD8ACC 802417EC 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD8AD0 802417F0 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CD8AD4 802417F4 C4620000 */  lwc1      $f2, ($v1)
-/* CD8AD8 802417F8 468010A0 */  cvt.s.w   $f2, $f2
-/* CD8ADC 802417FC C4640008 */  lwc1      $f4, 8($v1)
-/* CD8AE0 80241800 46802120 */  cvt.s.w   $f4, $f4
-/* CD8AE4 80241804 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD8AE8 80241808 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD8AEC 8024180C 44051000 */  mfc1      $a1, $f2
-/* CD8AF0 80241810 C440000C */  lwc1      $f0, 0xc($v0)
-/* CD8AF4 80241814 46800020 */  cvt.s.w   $f0, $f0
-/* CD8AF8 80241818 E7A00014 */  swc1      $f0, 0x14($sp)
-/* CD8AFC 8024181C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD8B00 80241820 44062000 */  mfc1      $a2, $f4
-/* CD8B04 80241824 C4400010 */  lwc1      $f0, 0x10($v0)
-/* CD8B08 80241828 46800020 */  cvt.s.w   $f0, $f0
-/* CD8B0C 8024182C E7A00018 */  swc1      $f0, 0x18($sp)
-/* CD8B10 80241830 8C640018 */  lw        $a0, 0x18($v1)
-/* CD8B14 80241834 0C0123F5 */  jal       is_point_within_region
-/* CD8B18 80241838 8E070038 */   lw       $a3, 0x38($s0)
-/* CD8B1C 8024183C 1040000D */  beqz      $v0, .L80241874
-/* CD8B20 80241840 00000000 */   nop
-/* CD8B24 80241844 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD8B28 80241848 C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CD8B2C 8024184C C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CD8B30 80241850 C4480000 */  lwc1      $f8, ($v0)
-/* CD8B34 80241854 46804220 */  cvt.s.w   $f8, $f8
-/* CD8B38 80241858 44064000 */  mfc1      $a2, $f8
-/* CD8B3C 8024185C C4480008 */  lwc1      $f8, 8($v0)
-/* CD8B40 80241860 46804220 */  cvt.s.w   $f8, $f8
-/* CD8B44 80241864 44074000 */  mfc1      $a3, $f8
-/* CD8B48 80241868 0C00A720 */  jal       atan2
-/* CD8B4C 8024186C 00000000 */   nop
-/* CD8B50 80241870 E600000C */  swc1      $f0, 0xc($s0)
-.L80241874:
-/* CD8B54 80241874 8602008C */  lh        $v0, 0x8c($s0)
-/* CD8B58 80241878 14400056 */  bnez      $v0, .L802419D4
-/* CD8B5C 8024187C 00000000 */   nop
-/* CD8B60 80241880 8602008E */  lh        $v0, 0x8e($s0)
-/* CD8B64 80241884 1840003D */  blez      $v0, .L8024197C
-/* CD8B68 80241888 240403E8 */   addiu    $a0, $zero, 0x3e8
-/* CD8B6C 8024188C 8E050018 */  lw        $a1, 0x18($s0)
-/* CD8B70 80241890 8E06000C */  lw        $a2, 0xc($s0)
-/* CD8B74 80241894 0C00EA95 */  jal       npc_move_heading
-/* CD8B78 80241898 0200202D */   daddu    $a0, $s0, $zero
-/* CD8B7C 8024189C 8E22006C */  lw        $v0, 0x6c($s1)
-/* CD8B80 802418A0 30420001 */  andi      $v0, $v0, 1
-/* CD8B84 802418A4 10400032 */  beqz      $v0, .L80241970
-/* CD8B88 802418A8 27A50028 */   addiu    $a1, $sp, 0x28
-/* CD8B8C 802418AC 27A6002C */  addiu     $a2, $sp, 0x2c
-/* CD8B90 802418B0 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CD8B94 802418B4 C6020040 */  lwc1      $f2, 0x40($s0)
-/* CD8B98 802418B8 3C01447A */  lui       $at, 0x447a
-/* CD8B9C 802418BC 44812000 */  mtc1      $at, $f4
-/* CD8BA0 802418C0 27A20034 */  addiu     $v0, $sp, 0x34
-/* CD8BA4 802418C4 E7B6002C */  swc1      $f22, 0x2c($sp)
-/* CD8BA8 802418C8 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CD8BAC 802418CC E7A20030 */  swc1      $f2, 0x30($sp)
-/* CD8BB0 802418D0 E7A40034 */  swc1      $f4, 0x34($sp)
-/* CD8BB4 802418D4 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD8BB8 802418D8 8E040080 */  lw        $a0, 0x80($s0)
-/* CD8BBC 802418DC 0C0372DF */  jal       func_800DCB7C
-/* CD8BC0 802418E0 27A70030 */   addiu    $a3, $sp, 0x30
-/* CD8BC4 802418E4 C7A0002C */  lwc1      $f0, 0x2c($sp)
-/* CD8BC8 802418E8 46180100 */  add.s     $f4, $f0, $f24
-/* CD8BCC 802418EC 3C014000 */  lui       $at, 0x4000
-/* CD8BD0 802418F0 44813800 */  mtc1      $at, $f7
-/* CD8BD4 802418F4 44803000 */  mtc1      $zero, $f6
-/* CD8BD8 802418F8 46162001 */  sub.s     $f0, $f4, $f22
-/* CD8BDC 802418FC E7A4002C */  swc1      $f4, 0x2c($sp)
-/* CD8BE0 80241900 460000A1 */  cvt.d.s   $f2, $f0
-/* CD8BE4 80241904 4622303C */  c.lt.d    $f6, $f2
-/* CD8BE8 80241908 00000000 */  nop
-/* CD8BEC 8024190C 45000005 */  bc1f      .L80241924
-/* CD8BF0 80241910 E7A00034 */   swc1     $f0, 0x34($sp)
-/* CD8BF4 80241914 4600B021 */  cvt.d.s   $f0, $f22
-/* CD8BF8 80241918 46260000 */  add.d     $f0, $f0, $f6
-/* CD8BFC 8024191C 08090654 */  j         .L80241950
-/* CD8C00 80241920 462005A0 */   cvt.s.d  $f22, $f0
-.L80241924:
-/* CD8C04 80241924 3C01C000 */  lui       $at, 0xc000
-/* CD8C08 80241928 44810800 */  mtc1      $at, $f1
-/* CD8C0C 8024192C 44800000 */  mtc1      $zero, $f0
-/* CD8C10 80241930 00000000 */  nop
-/* CD8C14 80241934 4620103C */  c.lt.d    $f2, $f0
-/* CD8C18 80241938 00000000 */  nop
-/* CD8C1C 8024193C 45020004 */  bc1fl     .L80241950
-/* CD8C20 80241940 46002586 */   mov.s    $f22, $f4
-/* CD8C24 80241944 4600B021 */  cvt.d.s   $f0, $f22
-/* CD8C28 80241948 46260001 */  sub.d     $f0, $f0, $f6
-/* CD8C2C 8024194C 462005A0 */  cvt.s.d   $f22, $f0
-.L80241950:
-/* CD8C30 80241950 3C014059 */  lui       $at, 0x4059
-/* CD8C34 80241954 44811800 */  mtc1      $at, $f3
-/* CD8C38 80241958 44801000 */  mtc1      $zero, $f2
-/* CD8C3C 8024195C 4600B021 */  cvt.d.s   $f0, $f22
-/* CD8C40 80241960 46220002 */  mul.d     $f0, $f0, $f2
-/* CD8C44 80241964 00000000 */  nop
-/* CD8C48 80241968 4620020D */  trunc.w.d $f8, $f0
-/* CD8C4C 8024196C E628007C */  swc1      $f8, 0x7c($s1)
-.L80241970:
-/* CD8C50 80241970 8602008E */  lh        $v0, 0x8e($s0)
-/* CD8C54 80241974 1C400017 */  bgtz      $v0, .L802419D4
-/* CD8C58 80241978 240403E8 */   addiu    $a0, $zero, 0x3e8
-.L8024197C:
-/* CD8C5C 8024197C 24020002 */  addiu     $v0, $zero, 2
-/* CD8C60 80241980 0C00A67F */  jal       rand_int
-/* CD8C64 80241984 AE420070 */   sw       $v0, 0x70($s2)
-/* CD8C68 80241988 3C035555 */  lui       $v1, 0x5555
-/* CD8C6C 8024198C 34635556 */  ori       $v1, $v1, 0x5556
-/* CD8C70 80241990 00430018 */  mult      $v0, $v1
-/* CD8C74 80241994 000227C3 */  sra       $a0, $v0, 0x1f
-/* CD8C78 80241998 00004010 */  mfhi      $t0
-/* CD8C7C 8024199C 01042023 */  subu      $a0, $t0, $a0
-/* CD8C80 802419A0 00041840 */  sll       $v1, $a0, 1
-/* CD8C84 802419A4 00641821 */  addu      $v1, $v1, $a0
-/* CD8C88 802419A8 00431023 */  subu      $v0, $v0, $v1
-/* CD8C8C 802419AC 24430002 */  addiu     $v1, $v0, 2
-/* CD8C90 802419B0 AE430074 */  sw        $v1, 0x74($s2)
-/* CD8C94 802419B4 8EE2002C */  lw        $v0, 0x2c($s7)
-/* CD8C98 802419B8 58400006 */  blezl     $v0, .L802419D4
-/* CD8C9C 802419BC AE400070 */   sw       $zero, 0x70($s2)
-/* CD8CA0 802419C0 8EE20004 */  lw        $v0, 4($s7)
-/* CD8CA4 802419C4 58400003 */  blezl     $v0, .L802419D4
-/* CD8CA8 802419C8 AE400070 */   sw       $zero, 0x70($s2)
-/* CD8CAC 802419CC 50600001 */  beql      $v1, $zero, .L802419D4
-/* CD8CB0 802419D0 AE400070 */   sw       $zero, 0x70($s2)
-.L802419D4:
-/* CD8CB4 802419D4 8FBF0064 */  lw        $ra, 0x64($sp)
-/* CD8CB8 802419D8 8FBE0060 */  lw        $fp, 0x60($sp)
-/* CD8CBC 802419DC 8FB7005C */  lw        $s7, 0x5c($sp)
-/* CD8CC0 802419E0 8FB60058 */  lw        $s6, 0x58($sp)
-/* CD8CC4 802419E4 8FB50054 */  lw        $s5, 0x54($sp)
-/* CD8CC8 802419E8 8FB40050 */  lw        $s4, 0x50($sp)
-/* CD8CCC 802419EC 8FB3004C */  lw        $s3, 0x4c($sp)
-/* CD8CD0 802419F0 8FB20048 */  lw        $s2, 0x48($sp)
-/* CD8CD4 802419F4 8FB10044 */  lw        $s1, 0x44($sp)
-/* CD8CD8 802419F8 8FB00040 */  lw        $s0, 0x40($sp)
-/* CD8CDC 802419FC D7BA0080 */  ldc1      $f26, 0x80($sp)
-/* CD8CE0 80241A00 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* CD8CE4 80241A04 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* CD8CE8 80241A08 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* CD8CEC 80241A0C 03E00008 */  jr        $ra
-/* CD8CF0 80241A10 27BD0088 */   addiu    $sp, $sp, 0x88
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s
deleted file mode 100644
index 3ceed9db5d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s
+++ /dev/null
@@ -1,156 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A14_CD8CF4
-/* CD8CF4 80241A14 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* CD8CF8 80241A18 AFB20048 */  sw        $s2, 0x48($sp)
-/* CD8CFC 80241A1C 0080902D */  daddu     $s2, $a0, $zero
-/* CD8D00 80241A20 AFBF0054 */  sw        $ra, 0x54($sp)
-/* CD8D04 80241A24 AFB40050 */  sw        $s4, 0x50($sp)
-/* CD8D08 80241A28 AFB3004C */  sw        $s3, 0x4c($sp)
-/* CD8D0C 80241A2C AFB10044 */  sw        $s1, 0x44($sp)
-/* CD8D10 80241A30 AFB00040 */  sw        $s0, 0x40($sp)
-/* CD8D14 80241A34 F7B60060 */  sdc1      $f22, 0x60($sp)
-/* CD8D18 80241A38 F7B40058 */  sdc1      $f20, 0x58($sp)
-/* CD8D1C 80241A3C 8E510148 */  lw        $s1, 0x148($s2)
-/* CD8D20 80241A40 00A0982D */  daddu     $s3, $a1, $zero
-/* CD8D24 80241A44 86240008 */  lh        $a0, 8($s1)
-/* CD8D28 80241A48 0C00EABB */  jal       get_npc_unsafe
-/* CD8D2C 80241A4C 00C0A02D */   daddu    $s4, $a2, $zero
-/* CD8D30 80241A50 0040802D */  daddu     $s0, $v0, $zero
-/* CD8D34 80241A54 C6200078 */  lwc1      $f0, 0x78($s1)
-/* CD8D38 80241A58 46800020 */  cvt.s.w   $f0, $f0
-/* CD8D3C 80241A5C 46000021 */  cvt.d.s   $f0, $f0
-/* CD8D40 80241A60 3C014059 */  lui       $at, 0x4059
-/* CD8D44 80241A64 44814800 */  mtc1      $at, $f9
-/* CD8D48 80241A68 44804000 */  mtc1      $zero, $f8
-/* CD8D4C 80241A6C 8602008E */  lh        $v0, 0x8e($s0)
-/* CD8D50 80241A70 9603008E */  lhu       $v1, 0x8e($s0)
-/* CD8D54 80241A74 46280003 */  div.d     $f0, $f0, $f8
-/* CD8D58 80241A78 18400003 */  blez      $v0, .L80241A88
-/* CD8D5C 80241A7C 462005A0 */   cvt.s.d  $f22, $f0
-/* CD8D60 80241A80 2462FFFF */  addiu     $v0, $v1, -1
-/* CD8D64 80241A84 A602008E */  sh        $v0, 0x8e($s0)
-.L80241A88:
-/* CD8D68 80241A88 27A50028 */  addiu     $a1, $sp, 0x28
-/* CD8D6C 80241A8C 27A6002C */  addiu     $a2, $sp, 0x2c
-/* CD8D70 80241A90 27A70030 */  addiu     $a3, $sp, 0x30
-/* CD8D74 80241A94 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CD8D78 80241A98 C602003C */  lwc1      $f2, 0x3c($s0)
-/* CD8D7C 80241A9C C6040040 */  lwc1      $f4, 0x40($s0)
-/* CD8D80 80241AA0 3C01447A */  lui       $at, 0x447a
-/* CD8D84 80241AA4 44813000 */  mtc1      $at, $f6
-/* CD8D88 80241AA8 27A20034 */  addiu     $v0, $sp, 0x34
-/* CD8D8C 80241AAC E7A00028 */  swc1      $f0, 0x28($sp)
-/* CD8D90 80241AB0 E7A2002C */  swc1      $f2, 0x2c($sp)
-/* CD8D94 80241AB4 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CD8D98 80241AB8 E7A60034 */  swc1      $f6, 0x34($sp)
-/* CD8D9C 80241ABC C6340070 */  lwc1      $f20, 0x70($s1)
-/* CD8DA0 80241AC0 4680A520 */  cvt.s.w   $f20, $f20
-/* CD8DA4 80241AC4 4600A521 */  cvt.d.s   $f20, $f20
-/* CD8DA8 80241AC8 4628A503 */  div.d     $f20, $f20, $f8
-/* CD8DAC 80241ACC AFA20010 */  sw        $v0, 0x10($sp)
-/* CD8DB0 80241AD0 8E040080 */  lw        $a0, 0x80($s0)
-/* CD8DB4 80241AD4 0C0372DF */  jal       func_800DCB7C
-/* CD8DB8 80241AD8 4620A520 */   cvt.s.d  $f20, $f20
-/* CD8DBC 80241ADC C62C0074 */  lwc1      $f12, 0x74($s1)
-/* CD8DC0 80241AE0 0C00A8BB */  jal       sin_deg
-/* CD8DC4 80241AE4 46806320 */   cvt.s.w  $f12, $f12
-/* CD8DC8 80241AE8 46140002 */  mul.s     $f0, $f0, $f20
-/* CD8DCC 80241AEC 00000000 */  nop
-/* CD8DD0 80241AF0 C7A2002C */  lwc1      $f2, 0x2c($sp)
-/* CD8DD4 80241AF4 46161080 */  add.s     $f2, $f2, $f22
-/* CD8DD8 80241AF8 46001080 */  add.s     $f2, $f2, $f0
-/* CD8DDC 80241AFC E602003C */  swc1      $f2, 0x3c($s0)
-/* CD8DE0 80241B00 8E220074 */  lw        $v0, 0x74($s1)
-/* CD8DE4 80241B04 2442000C */  addiu     $v0, $v0, 0xc
-/* CD8DE8 80241B08 44826000 */  mtc1      $v0, $f12
-/* CD8DEC 80241B0C 00000000 */  nop
-/* CD8DF0 80241B10 0C00A6C9 */  jal       clamp_angle
-/* CD8DF4 80241B14 46806320 */   cvt.s.w  $f12, $f12
-/* CD8DF8 80241B18 4600028D */  trunc.w.s $f10, $f0
-/* CD8DFC 80241B1C E62A0074 */  swc1      $f10, 0x74($s1)
-/* CD8E00 80241B20 0280202D */  daddu     $a0, $s4, $zero
-/* CD8E04 80241B24 24020001 */  addiu     $v0, $zero, 1
-/* CD8E08 80241B28 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD8E0C 80241B2C 8E660024 */  lw        $a2, 0x24($s3)
-/* CD8E10 80241B30 8E670028 */  lw        $a3, 0x28($s3)
-/* CD8E14 80241B34 0C01242D */  jal       func_800490B4
-/* CD8E18 80241B38 0220282D */   daddu    $a1, $s1, $zero
-/* CD8E1C 80241B3C 1040001D */  beqz      $v0, .L80241BB4
-/* CD8E20 80241B40 0000202D */   daddu    $a0, $zero, $zero
-/* CD8E24 80241B44 0200282D */  daddu     $a1, $s0, $zero
-/* CD8E28 80241B48 0000302D */  daddu     $a2, $zero, $zero
-/* CD8E2C 80241B4C 860300A8 */  lh        $v1, 0xa8($s0)
-/* CD8E30 80241B50 3C013F80 */  lui       $at, 0x3f80
-/* CD8E34 80241B54 44810000 */  mtc1      $at, $f0
-/* CD8E38 80241B58 3C014000 */  lui       $at, 0x4000
-/* CD8E3C 80241B5C 44811000 */  mtc1      $at, $f2
-/* CD8E40 80241B60 3C01C1A0 */  lui       $at, 0xc1a0
-/* CD8E44 80241B64 44812000 */  mtc1      $at, $f4
-/* CD8E48 80241B68 2402000F */  addiu     $v0, $zero, 0xf
-/* CD8E4C 80241B6C AFA2001C */  sw        $v0, 0x1c($sp)
-/* CD8E50 80241B70 44835000 */  mtc1      $v1, $f10
-/* CD8E54 80241B74 00000000 */  nop
-/* CD8E58 80241B78 468052A0 */  cvt.s.w   $f10, $f10
-/* CD8E5C 80241B7C 44075000 */  mfc1      $a3, $f10
-/* CD8E60 80241B80 27A20038 */  addiu     $v0, $sp, 0x38
-/* CD8E64 80241B84 AFA20020 */  sw        $v0, 0x20($sp)
-/* CD8E68 80241B88 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD8E6C 80241B8C E7A20014 */  swc1      $f2, 0x14($sp)
-/* CD8E70 80241B90 0C01BFA4 */  jal       fx_emote
-/* CD8E74 80241B94 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CD8E78 80241B98 0200202D */  daddu     $a0, $s0, $zero
-/* CD8E7C 80241B9C 240502F4 */  addiu     $a1, $zero, 0x2f4
-/* CD8E80 80241BA0 0C012530 */  jal       func_800494C0
-/* CD8E84 80241BA4 3C060020 */   lui      $a2, 0x20
-/* CD8E88 80241BA8 2402000C */  addiu     $v0, $zero, 0xc
-/* CD8E8C 80241BAC 0809070F */  j         .L80241C3C
-/* CD8E90 80241BB0 AE420070 */   sw       $v0, 0x70($s2)
-.L80241BB4:
-/* CD8E94 80241BB4 8602008C */  lh        $v0, 0x8c($s0)
-/* CD8E98 80241BB8 14400020 */  bnez      $v0, .L80241C3C
-/* CD8E9C 80241BBC 00000000 */   nop
-/* CD8EA0 80241BC0 8602008E */  lh        $v0, 0x8e($s0)
-/* CD8EA4 80241BC4 1C40001D */  bgtz      $v0, .L80241C3C
-/* CD8EA8 80241BC8 00000000 */   nop
-/* CD8EAC 80241BCC 8E420074 */  lw        $v0, 0x74($s2)
-/* CD8EB0 80241BD0 2442FFFF */  addiu     $v0, $v0, -1
-/* CD8EB4 80241BD4 18400018 */  blez      $v0, .L80241C38
-/* CD8EB8 80241BD8 AE420074 */   sw       $v0, 0x74($s2)
-/* CD8EBC 80241BDC C600000C */  lwc1      $f0, 0xc($s0)
-/* CD8EC0 80241BE0 3C014334 */  lui       $at, 0x4334
-/* CD8EC4 80241BE4 44816000 */  mtc1      $at, $f12
-/* CD8EC8 80241BE8 0C00A6C9 */  jal       clamp_angle
-/* CD8ECC 80241BEC 460C0300 */   add.s    $f12, $f0, $f12
-/* CD8ED0 80241BF0 240403E8 */  addiu     $a0, $zero, 0x3e8
-/* CD8ED4 80241BF4 0C00A67F */  jal       rand_int
-/* CD8ED8 80241BF8 E600000C */   swc1     $f0, 0xc($s0)
-/* CD8EDC 80241BFC 3C032E8B */  lui       $v1, 0x2e8b
-/* CD8EE0 80241C00 3463A2E9 */  ori       $v1, $v1, 0xa2e9
-/* CD8EE4 80241C04 00430018 */  mult      $v0, $v1
-/* CD8EE8 80241C08 00021FC3 */  sra       $v1, $v0, 0x1f
-/* CD8EEC 80241C0C 00004010 */  mfhi      $t0
-/* CD8EF0 80241C10 00082043 */  sra       $a0, $t0, 1
-/* CD8EF4 80241C14 00832023 */  subu      $a0, $a0, $v1
-/* CD8EF8 80241C18 00041840 */  sll       $v1, $a0, 1
-/* CD8EFC 80241C1C 00641821 */  addu      $v1, $v1, $a0
-/* CD8F00 80241C20 00031880 */  sll       $v1, $v1, 2
-/* CD8F04 80241C24 00641823 */  subu      $v1, $v1, $a0
-/* CD8F08 80241C28 00431023 */  subu      $v0, $v0, $v1
-/* CD8F0C 80241C2C 24420005 */  addiu     $v0, $v0, 5
-/* CD8F10 80241C30 0809070F */  j         .L80241C3C
-/* CD8F14 80241C34 A602008E */   sh       $v0, 0x8e($s0)
-.L80241C38:
-/* CD8F18 80241C38 AE400070 */  sw        $zero, 0x70($s2)
-.L80241C3C:
-/* CD8F1C 80241C3C 8FBF0054 */  lw        $ra, 0x54($sp)
-/* CD8F20 80241C40 8FB40050 */  lw        $s4, 0x50($sp)
-/* CD8F24 80241C44 8FB3004C */  lw        $s3, 0x4c($sp)
-/* CD8F28 80241C48 8FB20048 */  lw        $s2, 0x48($sp)
-/* CD8F2C 80241C4C 8FB10044 */  lw        $s1, 0x44($sp)
-/* CD8F30 80241C50 8FB00040 */  lw        $s0, 0x40($sp)
-/* CD8F34 80241C54 D7B60060 */  ldc1      $f22, 0x60($sp)
-/* CD8F38 80241C58 D7B40058 */  ldc1      $f20, 0x58($sp)
-/* CD8F3C 80241C5C 03E00008 */  jr        $ra
-/* CD8F40 80241C60 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s
deleted file mode 100644
index e13f91d6e7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s
+++ /dev/null
@@ -1,86 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421C0_CD94A0
-/* CD94A0 802421C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CD94A4 802421C4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CD94A8 802421C8 0080982D */  daddu     $s3, $a0, $zero
-/* CD94AC 802421CC AFBF0020 */  sw        $ra, 0x20($sp)
-/* CD94B0 802421D0 AFB20018 */  sw        $s2, 0x18($sp)
-/* CD94B4 802421D4 AFB10014 */  sw        $s1, 0x14($sp)
-/* CD94B8 802421D8 AFB00010 */  sw        $s0, 0x10($sp)
-/* CD94BC 802421DC 8E710148 */  lw        $s1, 0x148($s3)
-/* CD94C0 802421E0 86240008 */  lh        $a0, 8($s1)
-/* CD94C4 802421E4 0C00EABB */  jal       get_npc_unsafe
-/* CD94C8 802421E8 00A0902D */   daddu    $s2, $a1, $zero
-/* CD94CC 802421EC 0040802D */  daddu     $s0, $v0, $zero
-/* CD94D0 802421F0 8602008E */  lh        $v0, 0x8e($s0)
-/* CD94D4 802421F4 9603008E */  lhu       $v1, 0x8e($s0)
-/* CD94D8 802421F8 18400005 */  blez      $v0, .L80242210
-/* CD94DC 802421FC 2462FFFF */   addiu    $v0, $v1, -1
-/* CD94E0 80242200 A602008E */  sh        $v0, 0x8e($s0)
-/* CD94E4 80242204 00021400 */  sll       $v0, $v0, 0x10
-/* CD94E8 80242208 1C400033 */  bgtz      $v0, .L802422D8
-/* CD94EC 8024220C 00000000 */   nop
-.L80242210:
-/* CD94F0 80242210 8602008C */  lh        $v0, 0x8c($s0)
-/* CD94F4 80242214 14400030 */  bnez      $v0, .L802422D8
-/* CD94F8 80242218 00000000 */   nop
-/* CD94FC 8024221C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CD9500 80242220 8C420024 */  lw        $v0, 0x24($v0)
-/* CD9504 80242224 AE020028 */  sw        $v0, 0x28($s0)
-/* CD9508 80242228 C6400018 */  lwc1      $f0, 0x18($s2)
-/* CD950C 8024222C E6000018 */  swc1      $f0, 0x18($s0)
-/* CD9510 80242230 8E230088 */  lw        $v1, 0x88($s1)
-/* CD9514 80242234 24020005 */  addiu     $v0, $zero, 5
-/* CD9518 80242238 10620005 */  beq       $v1, $v0, .L80242250
-/* CD951C 8024223C 00000000 */   nop
-/* CD9520 80242240 10600003 */  beqz      $v1, .L80242250
-/* CD9524 80242244 24020001 */   addiu    $v0, $zero, 1
-/* CD9528 80242248 14620006 */  bne       $v1, $v0, .L80242264
-/* CD952C 8024224C 00000000 */   nop
-.L80242250:
-/* CD9530 80242250 8E220084 */  lw        $v0, 0x84($s1)
-/* CD9534 80242254 00021FC2 */  srl       $v1, $v0, 0x1f
-/* CD9538 80242258 00431021 */  addu      $v0, $v0, $v1
-/* CD953C 8024225C 00021043 */  sra       $v0, $v0, 1
-/* CD9540 80242260 A60200A8 */  sh        $v0, 0xa8($s0)
-.L80242264:
-/* CD9544 80242264 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CD9548 80242268 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CD954C 8024226C C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CD9550 80242270 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CD9554 80242274 8C460028 */  lw        $a2, 0x28($v0)
-/* CD9558 80242278 0C00A7B5 */  jal       dist2D
-/* CD955C 8024227C 8C470030 */   lw       $a3, 0x30($v0)
-/* CD9560 80242280 C6020018 */  lwc1      $f2, 0x18($s0)
-/* CD9564 80242284 46020003 */  div.s     $f0, $f0, $f2
-/* CD9568 80242288 3C018024 */  lui       $at, %hi(D_80245358_CDC638)
-/* CD956C 8024228C D4225358 */  ldc1      $f2, %lo(D_80245358_CDC638)($at)
-/* CD9570 80242290 46000021 */  cvt.d.s   $f0, $f0
-/* CD9574 80242294 46220000 */  add.d     $f0, $f0, $f2
-/* CD9578 80242298 4620010D */  trunc.w.d $f4, $f0
-/* CD957C 8024229C 44022000 */  mfc1      $v0, $f4
-/* CD9580 802422A0 00000000 */  nop
-/* CD9584 802422A4 A602008E */  sh        $v0, 0x8e($s0)
-/* CD9588 802422A8 00021400 */  sll       $v0, $v0, 0x10
-/* CD958C 802422AC 8E230078 */  lw        $v1, 0x78($s1)
-/* CD9590 802422B0 00021403 */  sra       $v0, $v0, 0x10
-/* CD9594 802422B4 0043102A */  slt       $v0, $v0, $v1
-/* CD9598 802422B8 10400003 */  beqz      $v0, .L802422C8
-/* CD959C 802422BC 00000000 */   nop
-/* CD95A0 802422C0 9622007A */  lhu       $v0, 0x7a($s1)
-/* CD95A4 802422C4 A602008E */  sh        $v0, 0x8e($s0)
-.L802422C8:
-/* CD95A8 802422C8 8602008E */  lh        $v0, 0x8e($s0)
-/* CD95AC 802422CC AE22007C */  sw        $v0, 0x7c($s1)
-/* CD95B0 802422D0 2402000E */  addiu     $v0, $zero, 0xe
-/* CD95B4 802422D4 AE620070 */  sw        $v0, 0x70($s3)
-.L802422D8:
-/* CD95B8 802422D8 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CD95BC 802422DC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CD95C0 802422E0 8FB20018 */  lw        $s2, 0x18($sp)
-/* CD95C4 802422E4 8FB10014 */  lw        $s1, 0x14($sp)
-/* CD95C8 802422E8 8FB00010 */  lw        $s0, 0x10($sp)
-/* CD95CC 802422EC 03E00008 */  jr        $ra
-/* CD95D0 802422F0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s
deleted file mode 100644
index b47ba4512b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s
+++ /dev/null
@@ -1,302 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802424D8_CD97B8
-/* CD97B8 802424D8 27BDFF90 */  addiu     $sp, $sp, -0x70
-/* CD97BC 802424DC AFB3005C */  sw        $s3, 0x5c($sp)
-/* CD97C0 802424E0 0080982D */  daddu     $s3, $a0, $zero
-/* CD97C4 802424E4 AFBF0068 */  sw        $ra, 0x68($sp)
-/* CD97C8 802424E8 AFB50064 */  sw        $s5, 0x64($sp)
-/* CD97CC 802424EC AFB40060 */  sw        $s4, 0x60($sp)
-/* CD97D0 802424F0 AFB20058 */  sw        $s2, 0x58($sp)
-/* CD97D4 802424F4 AFB10054 */  sw        $s1, 0x54($sp)
-/* CD97D8 802424F8 AFB00050 */  sw        $s0, 0x50($sp)
-/* CD97DC 802424FC 8E710148 */  lw        $s1, 0x148($s3)
-/* CD97E0 80242500 86240008 */  lh        $a0, 8($s1)
-/* CD97E4 80242504 0C00EABB */  jal       get_npc_unsafe
-/* CD97E8 80242508 00A0802D */   daddu    $s0, $a1, $zero
-/* CD97EC 8024250C 8E63000C */  lw        $v1, 0xc($s3)
-/* CD97F0 80242510 0260202D */  daddu     $a0, $s3, $zero
-/* CD97F4 80242514 8C650000 */  lw        $a1, ($v1)
-/* CD97F8 80242518 0C0B1EAF */  jal       get_variable
-/* CD97FC 8024251C 0040902D */   daddu    $s2, $v0, $zero
-/* CD9800 80242520 AFA00028 */  sw        $zero, 0x28($sp)
-/* CD9804 80242524 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD9808 80242528 8C630030 */  lw        $v1, 0x30($v1)
-/* CD980C 8024252C AFA3002C */  sw        $v1, 0x2c($sp)
-/* CD9810 80242530 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD9814 80242534 8C63001C */  lw        $v1, 0x1c($v1)
-/* CD9818 80242538 AFA30030 */  sw        $v1, 0x30($sp)
-/* CD981C 8024253C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD9820 80242540 8C630024 */  lw        $v1, 0x24($v1)
-/* CD9824 80242544 AFA30034 */  sw        $v1, 0x34($sp)
-/* CD9828 80242548 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD982C 8024254C 8C630028 */  lw        $v1, 0x28($v1)
-/* CD9830 80242550 27B50028 */  addiu     $s5, $sp, 0x28
-/* CD9834 80242554 AFA30038 */  sw        $v1, 0x38($sp)
-/* CD9838 80242558 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CD983C 8024255C 3C0142C8 */  lui       $at, 0x42c8
-/* CD9840 80242560 44810000 */  mtc1      $at, $f0
-/* CD9844 80242564 8C63002C */  lw        $v1, 0x2c($v1)
-/* CD9848 80242568 0040A02D */  daddu     $s4, $v0, $zero
-/* CD984C 8024256C E7A00040 */  swc1      $f0, 0x40($sp)
-/* CD9850 80242570 A7A00044 */  sh        $zero, 0x44($sp)
-/* CD9854 80242574 12000009 */  beqz      $s0, .L8024259C
-/* CD9858 80242578 AFA3003C */   sw       $v1, 0x3c($sp)
-/* CD985C 8024257C 864300A8 */  lh        $v1, 0xa8($s2)
-/* CD9860 80242580 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CD9864 80242584 AE20008C */  sw        $zero, 0x8c($s1)
-/* CD9868 80242588 A22000B5 */  sb        $zero, 0xb5($s1)
-/* CD986C 8024258C 34420008 */  ori       $v0, $v0, 8
-/* CD9870 80242590 AE230084 */  sw        $v1, 0x84($s1)
-/* CD9874 80242594 0809096B */  j         .L802425AC
-/* CD9878 80242598 AE2200B0 */   sw       $v0, 0xb0($s1)
-.L8024259C:
-/* CD987C 8024259C 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CD9880 802425A0 30420004 */  andi      $v0, $v0, 4
-/* CD9884 802425A4 10400047 */  beqz      $v0, .L802426C4
-/* CD9888 802425A8 00000000 */   nop
-.L802425AC:
-/* CD988C 802425AC AE600070 */  sw        $zero, 0x70($s3)
-/* CD9890 802425B0 A640008E */  sh        $zero, 0x8e($s2)
-/* CD9894 802425B4 8E2300CC */  lw        $v1, 0xcc($s1)
-/* CD9898 802425B8 2404F7FF */  addiu     $a0, $zero, -0x801
-/* CD989C 802425BC A2200007 */  sb        $zero, 7($s1)
-/* CD98A0 802425C0 8E420000 */  lw        $v0, ($s2)
-/* CD98A4 802425C4 8C630000 */  lw        $v1, ($v1)
-/* CD98A8 802425C8 00441024 */  and       $v0, $v0, $a0
-/* CD98AC 802425CC AE420000 */  sw        $v0, ($s2)
-/* CD98B0 802425D0 AE430028 */  sw        $v1, 0x28($s2)
-/* CD98B4 802425D4 96220086 */  lhu       $v0, 0x86($s1)
-/* CD98B8 802425D8 A64200A8 */  sh        $v0, 0xa8($s2)
-/* CD98BC 802425DC 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CD98C0 802425E0 AE200090 */  sw        $zero, 0x90($s1)
-/* CD98C4 802425E4 8C420034 */  lw        $v0, 0x34($v0)
-/* CD98C8 802425E8 14400006 */  bnez      $v0, .L80242604
-/* CD98CC 802425EC 2403FDFF */   addiu    $v1, $zero, -0x201
-/* CD98D0 802425F0 8E420000 */  lw        $v0, ($s2)
-/* CD98D4 802425F4 2403FFF7 */  addiu     $v1, $zero, -9
-/* CD98D8 802425F8 34420200 */  ori       $v0, $v0, 0x200
-/* CD98DC 802425FC 08090984 */  j         .L80242610
-/* CD98E0 80242600 00431024 */   and      $v0, $v0, $v1
-.L80242604:
-/* CD98E4 80242604 8E420000 */  lw        $v0, ($s2)
-/* CD98E8 80242608 00431024 */  and       $v0, $v0, $v1
-/* CD98EC 8024260C 34420008 */  ori       $v0, $v0, 8
-.L80242610:
-/* CD98F0 80242610 AE420000 */  sw        $v0, ($s2)
-/* CD98F4 80242614 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CD98F8 80242618 30420004 */  andi      $v0, $v0, 4
-/* CD98FC 8024261C 1040001E */  beqz      $v0, .L80242698
-/* CD9900 80242620 24040002 */   addiu    $a0, $zero, 2
-/* CD9904 80242624 0240282D */  daddu     $a1, $s2, $zero
-/* CD9908 80242628 0000302D */  daddu     $a2, $zero, $zero
-/* CD990C 8024262C 24020063 */  addiu     $v0, $zero, 0x63
-/* CD9910 80242630 AE620070 */  sw        $v0, 0x70($s3)
-/* CD9914 80242634 AE600074 */  sw        $zero, 0x74($s3)
-/* CD9918 80242638 864300A8 */  lh        $v1, 0xa8($s2)
-/* CD991C 8024263C 3C013F80 */  lui       $at, 0x3f80
-/* CD9920 80242640 44810000 */  mtc1      $at, $f0
-/* CD9924 80242644 3C014000 */  lui       $at, 0x4000
-/* CD9928 80242648 44811000 */  mtc1      $at, $f2
-/* CD992C 8024264C 3C01C1A0 */  lui       $at, 0xc1a0
-/* CD9930 80242650 44812000 */  mtc1      $at, $f4
-/* CD9934 80242654 24020028 */  addiu     $v0, $zero, 0x28
-/* CD9938 80242658 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CD993C 8024265C 44833000 */  mtc1      $v1, $f6
-/* CD9940 80242660 00000000 */  nop
-/* CD9944 80242664 468031A0 */  cvt.s.w   $f6, $f6
-/* CD9948 80242668 44073000 */  mfc1      $a3, $f6
-/* CD994C 8024266C 27A20048 */  addiu     $v0, $sp, 0x48
-/* CD9950 80242670 AFA20020 */  sw        $v0, 0x20($sp)
-/* CD9954 80242674 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD9958 80242678 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CD995C 8024267C 0C01BFA4 */  jal       fx_emote
-/* CD9960 80242680 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CD9964 80242684 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CD9968 80242688 2403FFFB */  addiu     $v1, $zero, -5
-/* CD996C 8024268C 00431024 */  and       $v0, $v0, $v1
-/* CD9970 80242690 080909B1 */  j         .L802426C4
-/* CD9974 80242694 AE2200B0 */   sw       $v0, 0xb0($s1)
-.L80242698:
-/* CD9978 80242698 8E220000 */  lw        $v0, ($s1)
-/* CD997C 8024269C 3C034000 */  lui       $v1, 0x4000
-/* CD9980 802426A0 00431024 */  and       $v0, $v0, $v1
-/* CD9984 802426A4 10400007 */  beqz      $v0, .L802426C4
-/* CD9988 802426A8 3C03BFFF */   lui      $v1, 0xbfff
-/* CD998C 802426AC 2402000C */  addiu     $v0, $zero, 0xc
-/* CD9990 802426B0 AE620070 */  sw        $v0, 0x70($s3)
-/* CD9994 802426B4 8E220000 */  lw        $v0, ($s1)
-/* CD9998 802426B8 3463FFFF */  ori       $v1, $v1, 0xffff
-/* CD999C 802426BC 00431024 */  and       $v0, $v0, $v1
-/* CD99A0 802426C0 AE220000 */  sw        $v0, ($s1)
-.L802426C4:
-/* CD99A4 802426C4 8E220090 */  lw        $v0, 0x90($s1)
-/* CD99A8 802426C8 1840000C */  blez      $v0, .L802426FC
-/* CD99AC 802426CC 2442FFFF */   addiu    $v0, $v0, -1
-/* CD99B0 802426D0 14400087 */  bnez      $v0, L802428F0_CD9BD0
-/* CD99B4 802426D4 AE220090 */   sw       $v0, 0x90($s1)
-/* CD99B8 802426D8 3C03FFAA */  lui       $v1, 0xffaa
-/* CD99BC 802426DC 8E420028 */  lw        $v0, 0x28($s2)
-/* CD99C0 802426E0 3463FFD2 */  ori       $v1, $v1, 0xffd2
-/* CD99C4 802426E4 00431021 */  addu      $v0, $v0, $v1
-/* CD99C8 802426E8 2C420002 */  sltiu     $v0, $v0, 2
-/* CD99CC 802426EC 10400003 */  beqz      $v0, .L802426FC
-/* CD99D0 802426F0 3C020055 */   lui      $v0, 0x55
-/* CD99D4 802426F4 3442000C */  ori       $v0, $v0, 0xc
-/* CD99D8 802426F8 AE420028 */  sw        $v0, 0x28($s2)
-.L802426FC:
-/* CD99DC 802426FC 8E630070 */  lw        $v1, 0x70($s3)
-/* CD99E0 80242700 2402000C */  addiu     $v0, $zero, 0xc
-/* CD99E4 80242704 10620048 */  beq       $v1, $v0, .L80242828
-/* CD99E8 80242708 2862000D */   slti     $v0, $v1, 0xd
-/* CD99EC 8024270C 1040000F */  beqz      $v0, .L8024274C
-/* CD99F0 80242710 24100001 */   addiu    $s0, $zero, 1
-/* CD99F4 80242714 1070001E */  beq       $v1, $s0, .L80242790
-/* CD99F8 80242718 28620002 */   slti     $v0, $v1, 2
-/* CD99FC 8024271C 10400005 */  beqz      $v0, .L80242734
-/* CD9A00 80242720 24020002 */   addiu    $v0, $zero, 2
-/* CD9A04 80242724 10600015 */  beqz      $v1, .L8024277C
-/* CD9A08 80242728 0260202D */   daddu    $a0, $s3, $zero
-/* CD9A0C 8024272C 08090A21 */  j         .L80242884
-/* CD9A10 80242730 00000000 */   nop
-.L80242734:
-/* CD9A14 80242734 1062001C */  beq       $v1, $v0, .L802427A8
-/* CD9A18 80242738 24020003 */   addiu    $v0, $zero, 3
-/* CD9A1C 8024273C 10620035 */  beq       $v1, $v0, .L80242814
-/* CD9A20 80242740 0260202D */   daddu    $a0, $s3, $zero
-/* CD9A24 80242744 08090A21 */  j         .L80242884
-/* CD9A28 80242748 00000000 */   nop
-.L8024274C:
-/* CD9A2C 8024274C 2402000E */  addiu     $v0, $zero, 0xe
-/* CD9A30 80242750 1062003F */  beq       $v1, $v0, .L80242850
-/* CD9A34 80242754 0062102A */   slt      $v0, $v1, $v0
-/* CD9A38 80242758 14400038 */  bnez      $v0, .L8024283C
-/* CD9A3C 8024275C 0260202D */   daddu    $a0, $s3, $zero
-/* CD9A40 80242760 2402000F */  addiu     $v0, $zero, 0xf
-/* CD9A44 80242764 10620040 */  beq       $v1, $v0, .L80242868
-/* CD9A48 80242768 24020063 */   addiu    $v0, $zero, 0x63
-/* CD9A4C 8024276C 10620043 */  beq       $v1, $v0, .L8024287C
-/* CD9A50 80242770 00000000 */   nop
-/* CD9A54 80242774 08090A21 */  j         .L80242884
-/* CD9A58 80242778 00000000 */   nop
-.L8024277C:
-/* CD9A5C 8024277C 0280282D */  daddu     $a1, $s4, $zero
-/* CD9A60 80242780 0C012568 */  jal       func_800495A0
-/* CD9A64 80242784 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9A68 80242788 96220086 */  lhu       $v0, 0x86($s1)
-/* CD9A6C 8024278C A64200A8 */  sh        $v0, 0xa8($s2)
-.L80242790:
-/* CD9A70 80242790 0260202D */  daddu     $a0, $s3, $zero
-/* CD9A74 80242794 0280282D */  daddu     $a1, $s4, $zero
-/* CD9A78 80242798 0C0125AE */  jal       func_800496B8
-/* CD9A7C 8024279C 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9A80 802427A0 08090A21 */  j         .L80242884
-/* CD9A84 802427A4 00000000 */   nop
-.L802427A8:
-/* CD9A88 802427A8 0260202D */  daddu     $a0, $s3, $zero
-/* CD9A8C 802427AC 0280282D */  daddu     $a1, $s4, $zero
-/* CD9A90 802427B0 0C0126D1 */  jal       base_UnkNpcAIFunc1
-/* CD9A94 802427B4 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9A98 802427B8 8E230088 */  lw        $v1, 0x88($s1)
-/* CD9A9C 802427BC 24020006 */  addiu     $v0, $zero, 6
-/* CD9AA0 802427C0 14620014 */  bne       $v1, $v0, .L80242814
-/* CD9AA4 802427C4 0260202D */   daddu    $a0, $s3, $zero
-/* CD9AA8 802427C8 0C00A67F */  jal       rand_int
-/* CD9AAC 802427CC 24040064 */   addiu    $a0, $zero, 0x64
-/* CD9AB0 802427D0 28420021 */  slti      $v0, $v0, 0x21
-/* CD9AB4 802427D4 5040000F */  beql      $v0, $zero, .L80242814
-/* CD9AB8 802427D8 0260202D */   daddu    $a0, $s3, $zero
-/* CD9ABC 802427DC 8E22008C */  lw        $v0, 0x8c($s1)
-/* CD9AC0 802427E0 10400005 */  beqz      $v0, .L802427F8
-/* CD9AC4 802427E4 3C020055 */   lui      $v0, 0x55
-/* CD9AC8 802427E8 3442002F */  ori       $v0, $v0, 0x2f
-/* CD9ACC 802427EC AE20008C */  sw        $zero, 0x8c($s1)
-/* CD9AD0 802427F0 08090A01 */  j         .L80242804
-/* CD9AD4 802427F4 A22000B5 */   sb       $zero, 0xb5($s1)
-.L802427F8:
-/* CD9AD8 802427F8 3442002E */  ori       $v0, $v0, 0x2e
-/* CD9ADC 802427FC AE30008C */  sw        $s0, 0x8c($s1)
-/* CD9AE0 80242800 A23000B5 */  sb        $s0, 0xb5($s1)
-.L80242804:
-/* CD9AE4 80242804 AE420028 */  sw        $v0, 0x28($s2)
-/* CD9AE8 80242808 24020007 */  addiu     $v0, $zero, 7
-/* CD9AEC 8024280C 08090A3C */  j         L802428F0_CD9BD0
-/* CD9AF0 80242810 AE220090 */   sw       $v0, 0x90($s1)
-.L80242814:
-/* CD9AF4 80242814 0280282D */  daddu     $a1, $s4, $zero
-/* CD9AF8 80242818 0C012701 */  jal       func_80049C04
-/* CD9AFC 8024281C 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9B00 80242820 08090A21 */  j         .L80242884
-/* CD9B04 80242824 00000000 */   nop
-.L80242828:
-/* CD9B08 80242828 0260202D */  daddu     $a0, $s3, $zero
-/* CD9B0C 8024282C 0280282D */  daddu     $a1, $s4, $zero
-/* CD9B10 80242830 0C090851 */  jal       flo_17_set_script_owner_npc_anim
-/* CD9B14 80242834 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9B18 80242838 0260202D */  daddu     $a0, $s3, $zero
-.L8024283C:
-/* CD9B1C 8024283C 0280282D */  daddu     $a1, $s4, $zero
-/* CD9B20 80242840 0C090870 */  jal       func_802421C0_CD94A0
-/* CD9B24 80242844 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9B28 80242848 08090A21 */  j         .L80242884
-/* CD9B2C 8024284C 00000000 */   nop
-.L80242850:
-/* CD9B30 80242850 0260202D */  daddu     $a0, $s3, $zero
-/* CD9B34 80242854 0280282D */  daddu     $a1, $s4, $zero
-/* CD9B38 80242858 0C0908BD */  jal       flo_17_UnkNpcAIFunc12
-/* CD9B3C 8024285C 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9B40 80242860 08090A21 */  j         .L80242884
-/* CD9B44 80242864 00000000 */   nop
-.L80242868:
-/* CD9B48 80242868 0280282D */  daddu     $a1, $s4, $zero
-/* CD9B4C 8024286C 0C090916 */  jal       flo_17_set_script_owner_npc_col_height
-/* CD9B50 80242870 02A0302D */   daddu    $a2, $s5, $zero
-/* CD9B54 80242874 08090A21 */  j         .L80242884
-/* CD9B58 80242878 00000000 */   nop
-.L8024287C:
-/* CD9B5C 8024287C 0C0129CF */  jal       func_8004A73C
-/* CD9B60 80242880 0260202D */   daddu    $a0, $s3, $zero
-.L80242884:
-/* CD9B64 80242884 8E230088 */  lw        $v1, 0x88($s1)
-/* CD9B68 80242888 24020006 */  addiu     $v0, $zero, 6
-/* CD9B6C 8024288C 14620019 */  bne       $v1, $v0, .L802428F4
-/* CD9B70 80242890 0000102D */   daddu    $v0, $zero, $zero
-/* CD9B74 80242894 8E22008C */  lw        $v0, 0x8c($s1)
-/* CD9B78 80242898 10400003 */  beqz      $v0, .L802428A8
-/* CD9B7C 8024289C 24020001 */   addiu    $v0, $zero, 1
-/* CD9B80 802428A0 08090A2B */  j         .L802428AC
-/* CD9B84 802428A4 A22200B5 */   sb       $v0, 0xb5($s1)
-.L802428A8:
-/* CD9B88 802428A8 A22000B5 */  sb        $zero, 0xb5($s1)
-.L802428AC:
-/* CD9B8C 802428AC 8E22008C */  lw        $v0, 0x8c($s1)
-/* CD9B90 802428B0 1040000F */  beqz      $v0, L802428F0_CD9BD0
-/* CD9B94 802428B4 3C03FFAA */   lui      $v1, 0xffaa
-/* CD9B98 802428B8 8E420028 */  lw        $v0, 0x28($s2)
-/* CD9B9C 802428BC 3463FFFC */  ori       $v1, $v1, 0xfffc
-/* CD9BA0 802428C0 00431821 */  addu      $v1, $v0, $v1
-/* CD9BA4 802428C4 2C620015 */  sltiu     $v0, $v1, 0x15
-/* CD9BA8 802428C8 10400009 */  beqz      $v0, L802428F0_CD9BD0
-/* CD9BAC 802428CC 00031080 */   sll      $v0, $v1, 2
-/* CD9BB0 802428D0 3C018024 */  lui       $at, %hi(jtbl_80245360_CDC640)
-/* CD9BB4 802428D4 00220821 */  addu      $at, $at, $v0
-/* CD9BB8 802428D8 8C225360 */  lw        $v0, %lo(jtbl_80245360_CDC640)($at)
-/* CD9BBC 802428DC 00400008 */  jr        $v0
-/* CD9BC0 802428E0 00000000 */   nop
-glabel L802428E4_CD9BC4
-/* CD9BC4 802428E4 8E420028 */  lw        $v0, 0x28($s2)
-/* CD9BC8 802428E8 24420001 */  addiu     $v0, $v0, 1
-/* CD9BCC 802428EC AE420028 */  sw        $v0, 0x28($s2)
-glabel L802428F0_CD9BD0
-/* CD9BD0 802428F0 0000102D */  daddu     $v0, $zero, $zero
-.L802428F4:
-/* CD9BD4 802428F4 8FBF0068 */  lw        $ra, 0x68($sp)
-/* CD9BD8 802428F8 8FB50064 */  lw        $s5, 0x64($sp)
-/* CD9BDC 802428FC 8FB40060 */  lw        $s4, 0x60($sp)
-/* CD9BE0 80242900 8FB3005C */  lw        $s3, 0x5c($sp)
-/* CD9BE4 80242904 8FB20058 */  lw        $s2, 0x58($sp)
-/* CD9BE8 80242908 8FB10054 */  lw        $s1, 0x54($sp)
-/* CD9BEC 8024290C 8FB00050 */  lw        $s0, 0x50($sp)
-/* CD9BF0 80242910 03E00008 */  jr        $ra
-/* CD9BF4 80242914 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s
deleted file mode 100644
index cdeb9c34f2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s
+++ /dev/null
@@ -1,619 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242918_CD9BF8
-/* CD9BF8 80242918 27BDFF68 */  addiu     $sp, $sp, -0x98
-/* CD9BFC 8024291C AFB5007C */  sw        $s5, 0x7c($sp)
-/* CD9C00 80242920 0080A82D */  daddu     $s5, $a0, $zero
-/* CD9C04 80242924 AFBF0080 */  sw        $ra, 0x80($sp)
-/* CD9C08 80242928 AFB40078 */  sw        $s4, 0x78($sp)
-/* CD9C0C 8024292C AFB30074 */  sw        $s3, 0x74($sp)
-/* CD9C10 80242930 AFB20070 */  sw        $s2, 0x70($sp)
-/* CD9C14 80242934 AFB1006C */  sw        $s1, 0x6c($sp)
-/* CD9C18 80242938 AFB00068 */  sw        $s0, 0x68($sp)
-/* CD9C1C 8024293C F7B60090 */  sdc1      $f22, 0x90($sp)
-/* CD9C20 80242940 F7B40088 */  sdc1      $f20, 0x88($sp)
-/* CD9C24 80242944 8EB20148 */  lw        $s2, 0x148($s5)
-/* CD9C28 80242948 86440008 */  lh        $a0, 8($s2)
-/* CD9C2C 8024294C 0C00EABB */  jal       get_npc_unsafe
-/* CD9C30 80242950 00A0802D */   daddu    $s0, $a1, $zero
-/* CD9C34 80242954 8EA3000C */  lw        $v1, 0xc($s5)
-/* CD9C38 80242958 02A0202D */  daddu     $a0, $s5, $zero
-/* CD9C3C 8024295C 8C650000 */  lw        $a1, ($v1)
-/* CD9C40 80242960 0C0B1EAF */  jal       get_variable
-/* CD9C44 80242964 0040882D */   daddu    $s1, $v0, $zero
-/* CD9C48 80242968 AFA00028 */  sw        $zero, 0x28($sp)
-/* CD9C4C 8024296C 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD9C50 80242970 8C630030 */  lw        $v1, 0x30($v1)
-/* CD9C54 80242974 AFA3002C */  sw        $v1, 0x2c($sp)
-/* CD9C58 80242978 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD9C5C 8024297C 8C63001C */  lw        $v1, 0x1c($v1)
-/* CD9C60 80242980 AFA30030 */  sw        $v1, 0x30($sp)
-/* CD9C64 80242984 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD9C68 80242988 8C630024 */  lw        $v1, 0x24($v1)
-/* CD9C6C 8024298C AFA30034 */  sw        $v1, 0x34($sp)
-/* CD9C70 80242990 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD9C74 80242994 8C630028 */  lw        $v1, 0x28($v1)
-/* CD9C78 80242998 27B40028 */  addiu     $s4, $sp, 0x28
-/* CD9C7C 8024299C AFA30038 */  sw        $v1, 0x38($sp)
-/* CD9C80 802429A0 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CD9C84 802429A4 3C014282 */  lui       $at, 0x4282
-/* CD9C88 802429A8 44810000 */  mtc1      $at, $f0
-/* CD9C8C 802429AC 8C63002C */  lw        $v1, 0x2c($v1)
-/* CD9C90 802429B0 0040982D */  daddu     $s3, $v0, $zero
-/* CD9C94 802429B4 E7A00040 */  swc1      $f0, 0x40($sp)
-/* CD9C98 802429B8 A7A00044 */  sh        $zero, 0x44($sp)
-/* CD9C9C 802429BC 12000007 */  beqz      $s0, .L802429DC
-/* CD9CA0 802429C0 AFA3003C */   sw       $v1, 0x3c($sp)
-/* CD9CA4 802429C4 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* CD9CA8 802429C8 862300A8 */  lh        $v1, 0xa8($s1)
-/* CD9CAC 802429CC 34420008 */  ori       $v0, $v0, 8
-/* CD9CB0 802429D0 AE430084 */  sw        $v1, 0x84($s2)
-/* CD9CB4 802429D4 08090A7B */  j         .L802429EC
-/* CD9CB8 802429D8 AE4200B0 */   sw       $v0, 0xb0($s2)
-.L802429DC:
-/* CD9CBC 802429DC 8E430094 */  lw        $v1, 0x94($s2)
-/* CD9CC0 802429E0 24020064 */  addiu     $v0, $zero, 0x64
-/* CD9CC4 802429E4 1462001C */  bne       $v1, $v0, .L80242A58
-/* CD9CC8 802429E8 00000000 */   nop
-.L802429EC:
-/* CD9CCC 802429EC 24020064 */  addiu     $v0, $zero, 0x64
-/* CD9CD0 802429F0 2404F7FF */  addiu     $a0, $zero, -0x801
-/* CD9CD4 802429F4 AEA20070 */  sw        $v0, 0x70($s5)
-/* CD9CD8 802429F8 A620008E */  sh        $zero, 0x8e($s1)
-/* CD9CDC 802429FC 8E4300CC */  lw        $v1, 0xcc($s2)
-/* CD9CE0 80242A00 8E220000 */  lw        $v0, ($s1)
-/* CD9CE4 80242A04 3C01C47A */  lui       $at, 0xc47a
-/* CD9CE8 80242A08 44810000 */  mtc1      $at, $f0
-/* CD9CEC 80242A0C 8C630000 */  lw        $v1, ($v1)
-/* CD9CF0 80242A10 00441024 */  and       $v0, $v0, $a0
-/* CD9CF4 80242A14 AE220000 */  sw        $v0, ($s1)
-/* CD9CF8 80242A18 AE230028 */  sw        $v1, 0x28($s1)
-/* CD9CFC 80242A1C 8E420000 */  lw        $v0, ($s2)
-/* CD9D00 80242A20 3C030020 */  lui       $v1, 0x20
-/* CD9D04 80242A24 00431025 */  or        $v0, $v0, $v1
-/* CD9D08 80242A28 AE420000 */  sw        $v0, ($s2)
-/* CD9D0C 80242A2C 8E220000 */  lw        $v0, ($s1)
-/* CD9D10 80242A30 2403FDFF */  addiu     $v1, $zero, -0x201
-/* CD9D14 80242A34 00431024 */  and       $v0, $v0, $v1
-/* CD9D18 80242A38 34420008 */  ori       $v0, $v0, 8
-/* CD9D1C 80242A3C AE220000 */  sw        $v0, ($s1)
-/* CD9D20 80242A40 2402FFFF */  addiu     $v0, $zero, -1
-/* CD9D24 80242A44 AE400094 */  sw        $zero, 0x94($s2)
-/* CD9D28 80242A48 AE420098 */  sw        $v0, 0x98($s2)
-/* CD9D2C 80242A4C AE200038 */  sw        $zero, 0x38($s1)
-/* CD9D30 80242A50 E620003C */  swc1      $f0, 0x3c($s1)
-/* CD9D34 80242A54 AE200040 */  sw        $zero, 0x40($s1)
-.L80242A58:
-/* CD9D38 80242A58 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* CD9D3C 80242A5C 30420004 */  andi      $v0, $v0, 4
-/* CD9D40 80242A60 10400030 */  beqz      $v0, .L80242B24
-/* CD9D44 80242A64 2403FFFB */   addiu    $v1, $zero, -5
-/* CD9D48 80242A68 A620008E */  sh        $zero, 0x8e($s1)
-/* CD9D4C 80242A6C 96420086 */  lhu       $v0, 0x86($s2)
-/* CD9D50 80242A70 A62200A8 */  sh        $v0, 0xa8($s1)
-/* CD9D54 80242A74 8E4200B0 */  lw        $v0, 0xb0($s2)
-/* CD9D58 80242A78 00431024 */  and       $v0, $v0, $v1
-/* CD9D5C 80242A7C AE4200B0 */  sw        $v0, 0xb0($s2)
-/* CD9D60 80242A80 8E220000 */  lw        $v0, ($s1)
-/* CD9D64 80242A84 30420800 */  andi      $v0, $v0, 0x800
-/* CD9D68 80242A88 1040000A */  beqz      $v0, .L80242AB4
-/* CD9D6C 80242A8C 3C02004A */   lui      $v0, 0x4a
-/* CD9D70 80242A90 3C013F80 */  lui       $at, 0x3f80
-/* CD9D74 80242A94 44810000 */  mtc1      $at, $f0
-/* CD9D78 80242A98 34420018 */  ori       $v0, $v0, 0x18
-/* CD9D7C 80242A9C AE220028 */  sw        $v0, 0x28($s1)
-/* CD9D80 80242AA0 24020066 */  addiu     $v0, $zero, 0x66
-/* CD9D84 80242AA4 AE200018 */  sw        $zero, 0x18($s1)
-/* CD9D88 80242AA8 AE20001C */  sw        $zero, 0x1c($s1)
-/* CD9D8C 80242AAC 08090AC8 */  j         .L80242B20
-/* CD9D90 80242AB0 E6200014 */   swc1     $f0, 0x14($s1)
-.L80242AB4:
-/* CD9D94 80242AB4 24040002 */  addiu     $a0, $zero, 2
-/* CD9D98 80242AB8 0220282D */  daddu     $a1, $s1, $zero
-/* CD9D9C 80242ABC 0000302D */  daddu     $a2, $zero, $zero
-/* CD9DA0 80242AC0 862300A8 */  lh        $v1, 0xa8($s1)
-/* CD9DA4 80242AC4 3C013F80 */  lui       $at, 0x3f80
-/* CD9DA8 80242AC8 44810000 */  mtc1      $at, $f0
-/* CD9DAC 80242ACC 3C014000 */  lui       $at, 0x4000
-/* CD9DB0 80242AD0 44811000 */  mtc1      $at, $f2
-/* CD9DB4 80242AD4 3C01C1A0 */  lui       $at, 0xc1a0
-/* CD9DB8 80242AD8 44812000 */  mtc1      $at, $f4
-/* CD9DBC 80242ADC 24020028 */  addiu     $v0, $zero, 0x28
-/* CD9DC0 80242AE0 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CD9DC4 80242AE4 44834000 */  mtc1      $v1, $f8
-/* CD9DC8 80242AE8 00000000 */  nop
-/* CD9DCC 80242AEC 46804220 */  cvt.s.w   $f8, $f8
-/* CD9DD0 80242AF0 44074000 */  mfc1      $a3, $f8
-/* CD9DD4 80242AF4 27A20048 */  addiu     $v0, $sp, 0x48
-/* CD9DD8 80242AF8 AFA20020 */  sw        $v0, 0x20($sp)
-/* CD9DDC 80242AFC E7A00010 */  swc1      $f0, 0x10($sp)
-/* CD9DE0 80242B00 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CD9DE4 80242B04 0C01BFA4 */  jal       fx_emote
-/* CD9DE8 80242B08 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CD9DEC 80242B0C 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CD9DF0 80242B10 8C420000 */  lw        $v0, ($v0)
-/* CD9DF4 80242B14 AE220028 */  sw        $v0, 0x28($s1)
-/* CD9DF8 80242B18 240200C8 */  addiu     $v0, $zero, 0xc8
-/* CD9DFC 80242B1C AEA00074 */  sw        $zero, 0x74($s5)
-.L80242B20:
-/* CD9E00 80242B20 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242B24:
-/* CD9E04 80242B24 27A2004C */  addiu     $v0, $sp, 0x4c
-/* CD9E08 80242B28 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD9E0C 80242B2C 27A20050 */  addiu     $v0, $sp, 0x50
-/* CD9E10 80242B30 AFA20014 */  sw        $v0, 0x14($sp)
-/* CD9E14 80242B34 27A20054 */  addiu     $v0, $sp, 0x54
-/* CD9E18 80242B38 AFA20018 */  sw        $v0, 0x18($sp)
-/* CD9E1C 80242B3C 8E250038 */  lw        $a1, 0x38($s1)
-/* CD9E20 80242B40 8E26003C */  lw        $a2, 0x3c($s1)
-/* CD9E24 80242B44 8E270040 */  lw        $a3, 0x40($s1)
-/* CD9E28 80242B48 0C00B94E */  jal       get_screen_coords
-/* CD9E2C 80242B4C 0000202D */   daddu    $a0, $zero, $zero
-/* CD9E30 80242B50 8EA20070 */  lw        $v0, 0x70($s5)
-/* CD9E34 80242B54 28420064 */  slti      $v0, $v0, 0x64
-/* CD9E38 80242B58 10400007 */  beqz      $v0, .L80242B78
-/* CD9E3C 80242B5C 00000000 */   nop
-/* CD9E40 80242B60 8FA2004C */  lw        $v0, 0x4c($sp)
-/* CD9E44 80242B64 24420032 */  addiu     $v0, $v0, 0x32
-/* CD9E48 80242B68 2C4201A5 */  sltiu     $v0, $v0, 0x1a5
-/* CD9E4C 80242B6C 14400002 */  bnez      $v0, .L80242B78
-/* CD9E50 80242B70 2402006E */   addiu    $v0, $zero, 0x6e
-/* CD9E54 80242B74 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242B78:
-/* CD9E58 80242B78 8EA30070 */  lw        $v1, 0x70($s5)
-/* CD9E5C 80242B7C 2402000F */  addiu     $v0, $zero, 0xf
-/* CD9E60 80242B80 1062006B */  beq       $v1, $v0, .L80242D30
-/* CD9E64 80242B84 28620010 */   slti     $v0, $v1, 0x10
-/* CD9E68 80242B88 10400016 */  beqz      $v0, .L80242BE4
-/* CD9E6C 80242B8C 24020003 */   addiu    $v0, $zero, 3
-/* CD9E70 80242B90 10620051 */  beq       $v1, $v0, .L80242CD8
-/* CD9E74 80242B94 28620004 */   slti     $v0, $v1, 4
-/* CD9E78 80242B98 10400009 */  beqz      $v0, .L80242BC0
-/* CD9E7C 80242B9C 24020001 */   addiu    $v0, $zero, 1
-/* CD9E80 80242BA0 10620044 */  beq       $v1, $v0, .L80242CB4
-/* CD9E84 80242BA4 28620002 */   slti     $v0, $v1, 2
-/* CD9E88 80242BA8 50400048 */  beql      $v0, $zero, .L80242CCC
-/* CD9E8C 80242BAC 02A0202D */   daddu    $a0, $s5, $zero
-/* CD9E90 80242BB0 50600027 */  beql      $v1, $zero, .L80242C50
-/* CD9E94 80242BB4 02A0202D */   daddu    $a0, $s5, $zero
-/* CD9E98 80242BB8 08090C79 */  j         .L802431E4
-/* CD9E9C 80242BBC 00000000 */   nop
-.L80242BC0:
-/* CD9EA0 80242BC0 2402000D */  addiu     $v0, $zero, 0xd
-/* CD9EA4 80242BC4 1062004D */  beq       $v1, $v0, .L80242CFC
-/* CD9EA8 80242BC8 2862000E */   slti     $v0, $v1, 0xe
-/* CD9EAC 80242BCC 10400052 */  beqz      $v0, .L80242D18
-/* CD9EB0 80242BD0 2402000C */   addiu    $v0, $zero, 0xc
-/* CD9EB4 80242BD4 10620046 */  beq       $v1, $v0, .L80242CF0
-/* CD9EB8 80242BD8 02A0202D */   daddu    $a0, $s5, $zero
-/* CD9EBC 80242BDC 08090C79 */  j         .L802431E4
-/* CD9EC0 80242BE0 00000000 */   nop
-.L80242BE4:
-/* CD9EC4 80242BE4 24020067 */  addiu     $v0, $zero, 0x67
-/* CD9EC8 80242BE8 10620158 */  beq       $v1, $v0, .L8024314C
-/* CD9ECC 80242BEC 28620068 */   slti     $v0, $v1, 0x68
-/* CD9ED0 80242BF0 10400009 */  beqz      $v0, .L80242C18
-/* CD9ED4 80242BF4 24020065 */   addiu    $v0, $zero, 0x65
-/* CD9ED8 80242BF8 1062008F */  beq       $v1, $v0, .L80242E38
-/* CD9EDC 80242BFC 28620066 */   slti     $v0, $v1, 0x66
-/* CD9EE0 80242C00 104000A9 */  beqz      $v0, .L80242EA8
-/* CD9EE4 80242C04 24020064 */   addiu    $v0, $zero, 0x64
-/* CD9EE8 80242C08 1062004F */  beq       $v1, $v0, .L80242D48
-/* CD9EEC 80242C0C 24020002 */   addiu    $v0, $zero, 2
-/* CD9EF0 80242C10 08090C79 */  j         .L802431E4
-/* CD9EF4 80242C14 00000000 */   nop
-.L80242C18:
-/* CD9EF8 80242C18 2404006F */  addiu     $a0, $zero, 0x6f
-/* CD9EFC 80242C1C 10640166 */  beq       $v1, $a0, .L802431B8
-/* CD9F00 80242C20 28620070 */   slti     $v0, $v1, 0x70
-/* CD9F04 80242C24 10400005 */  beqz      $v0, .L80242C3C
-/* CD9F08 80242C28 2402006E */   addiu    $v0, $zero, 0x6e
-/* CD9F0C 80242C2C 10620156 */  beq       $v1, $v0, .L80243188
-/* CD9F10 80242C30 2402001E */   addiu    $v0, $zero, 0x1e
-/* CD9F14 80242C34 08090C79 */  j         .L802431E4
-/* CD9F18 80242C38 00000000 */   nop
-.L80242C3C:
-/* CD9F1C 80242C3C 240200C8 */  addiu     $v0, $zero, 0xc8
-/* CD9F20 80242C40 10620166 */  beq       $v1, $v0, .L802431DC
-/* CD9F24 80242C44 00000000 */   nop
-/* CD9F28 80242C48 08090C79 */  j         .L802431E4
-/* CD9F2C 80242C4C 00000000 */   nop
-.L80242C50:
-/* CD9F30 80242C50 0260282D */  daddu     $a1, $s3, $zero
-/* CD9F34 80242C54 0C012568 */  jal       func_800495A0
-/* CD9F38 80242C58 0280302D */   daddu    $a2, $s4, $zero
-/* CD9F3C 80242C5C 96420086 */  lhu       $v0, 0x86($s2)
-/* CD9F40 80242C60 A62200A8 */  sh        $v0, 0xa8($s1)
-/* CD9F44 80242C64 8E4200A0 */  lw        $v0, 0xa0($s2)
-/* CD9F48 80242C68 10400013 */  beqz      $v0, .L80242CB8
-/* CD9F4C 80242C6C 02A0202D */   daddu    $a0, $s5, $zero
-/* CD9F50 80242C70 C620003C */  lwc1      $f0, 0x3c($s1)
-/* CD9F54 80242C74 44801000 */  mtc1      $zero, $f2
-/* CD9F58 80242C78 44801800 */  mtc1      $zero, $f3
-/* CD9F5C 80242C7C 46000021 */  cvt.d.s   $f0, $f0
-/* CD9F60 80242C80 4622003E */  c.le.d    $f0, $f2
-/* CD9F64 80242C84 00000000 */  nop
-/* CD9F68 80242C88 45000005 */  bc1f      .L80242CA0
-/* CD9F6C 80242C8C 2403FDFF */   addiu    $v1, $zero, -0x201
-/* CD9F70 80242C90 8E220000 */  lw        $v0, ($s1)
-/* CD9F74 80242C94 00431024 */  and       $v0, $v0, $v1
-/* CD9F78 80242C98 08090B2C */  j         .L80242CB0
-/* CD9F7C 80242C9C 34420008 */   ori      $v0, $v0, 8
-.L80242CA0:
-/* CD9F80 80242CA0 8E220000 */  lw        $v0, ($s1)
-/* CD9F84 80242CA4 2403FFF7 */  addiu     $v1, $zero, -9
-/* CD9F88 80242CA8 34420200 */  ori       $v0, $v0, 0x200
-/* CD9F8C 80242CAC 00431024 */  and       $v0, $v0, $v1
-.L80242CB0:
-/* CD9F90 80242CB0 AE220000 */  sw        $v0, ($s1)
-.L80242CB4:
-/* CD9F94 80242CB4 02A0202D */  daddu     $a0, $s5, $zero
-.L80242CB8:
-/* CD9F98 80242CB8 0260282D */  daddu     $a1, $s3, $zero
-/* CD9F9C 80242CBC 0C0125AE */  jal       func_800496B8
-/* CD9FA0 80242CC0 0280302D */   daddu    $a2, $s4, $zero
-/* CD9FA4 80242CC4 08090C79 */  j         .L802431E4
-/* CD9FA8 80242CC8 00000000 */   nop
-.L80242CCC:
-/* CD9FAC 80242CCC 0260282D */  daddu     $a1, $s3, $zero
-/* CD9FB0 80242CD0 0C0126D1 */  jal       base_UnkNpcAIFunc1
-/* CD9FB4 80242CD4 0280302D */   daddu    $a2, $s4, $zero
-.L80242CD8:
-/* CD9FB8 80242CD8 02A0202D */  daddu     $a0, $s5, $zero
-/* CD9FBC 80242CDC 0260282D */  daddu     $a1, $s3, $zero
-/* CD9FC0 80242CE0 0C012701 */  jal       func_80049C04
-/* CD9FC4 80242CE4 0280302D */   daddu    $a2, $s4, $zero
-/* CD9FC8 80242CE8 08090C79 */  j         .L802431E4
-/* CD9FCC 80242CEC 00000000 */   nop
-.L80242CF0:
-/* CD9FD0 80242CF0 0260282D */  daddu     $a1, $s3, $zero
-/* CD9FD4 80242CF4 0C090851 */  jal       flo_17_set_script_owner_npc_anim
-/* CD9FD8 80242CF8 0280302D */   daddu    $a2, $s4, $zero
-.L80242CFC:
-/* CD9FDC 80242CFC 02A0202D */  daddu     $a0, $s5, $zero
-/* CD9FE0 80242D00 0260282D */  daddu     $a1, $s3, $zero
-/* CD9FE4 80242D04 0C090870 */  jal       func_802421C0_CD94A0
-/* CD9FE8 80242D08 0280302D */   daddu    $a2, $s4, $zero
-/* CD9FEC 80242D0C 96420086 */  lhu       $v0, 0x86($s2)
-/* CD9FF0 80242D10 08090C79 */  j         .L802431E4
-/* CD9FF4 80242D14 A62200A8 */   sh       $v0, 0xa8($s1)
-.L80242D18:
-/* CD9FF8 80242D18 02A0202D */  daddu     $a0, $s5, $zero
-/* CD9FFC 80242D1C 0260282D */  daddu     $a1, $s3, $zero
-/* CDA000 80242D20 0C0908BD */  jal       flo_17_UnkNpcAIFunc12
-/* CDA004 80242D24 0280302D */   daddu    $a2, $s4, $zero
-/* CDA008 80242D28 08090C79 */  j         .L802431E4
-/* CDA00C 80242D2C 00000000 */   nop
-.L80242D30:
-/* CDA010 80242D30 02A0202D */  daddu     $a0, $s5, $zero
-/* CDA014 80242D34 0260282D */  daddu     $a1, $s3, $zero
-/* CDA018 80242D38 0C090916 */  jal       flo_17_set_script_owner_npc_col_height
-/* CDA01C 80242D3C 0280302D */   daddu    $a2, $s4, $zero
-/* CDA020 80242D40 08090C79 */  j         .L802431E4
-/* CDA024 80242D44 00000000 */   nop
-.L80242D48:
-/* CDA028 80242D48 8E430094 */  lw        $v1, 0x94($s2)
-/* CDA02C 80242D4C 14620125 */  bne       $v1, $v0, .L802431E4
-/* CDA030 80242D50 00000000 */   nop
-/* CDA034 80242D54 0C00FB3A */  jal       get_enemy
-/* CDA038 80242D58 8E440098 */   lw       $a0, 0x98($s2)
-/* CDA03C 80242D5C 0C00EABB */  jal       get_npc_unsafe
-/* CDA040 80242D60 84440008 */   lh       $a0, 8($v0)
-/* CDA044 80242D64 C440000C */  lwc1      $f0, 0xc($v0)
-/* CDA048 80242D68 3C018024 */  lui       $at, %hi(D_802453B8_CDC698)
-/* CDA04C 80242D6C D42253B8 */  ldc1      $f2, %lo(D_802453B8_CDC698)($at)
-/* CDA050 80242D70 46000021 */  cvt.d.s   $f0, $f0
-/* CDA054 80242D74 4622003C */  c.lt.d    $f0, $f2
-/* CDA058 80242D78 00000000 */  nop
-/* CDA05C 80242D7C 45000008 */  bc1f      .L80242DA0
-/* CDA060 80242D80 00000000 */   nop
-/* CDA064 80242D84 C4400038 */  lwc1      $f0, 0x38($v0)
-/* CDA068 80242D88 3C014028 */  lui       $at, 0x4028
-/* CDA06C 80242D8C 44811800 */  mtc1      $at, $f3
-/* CDA070 80242D90 44801000 */  mtc1      $zero, $f2
-/* CDA074 80242D94 46000021 */  cvt.d.s   $f0, $f0
-/* CDA078 80242D98 08090B6E */  j         .L80242DB8
-/* CDA07C 80242D9C 46220000 */   add.d    $f0, $f0, $f2
-.L80242DA0:
-/* CDA080 80242DA0 C4400038 */  lwc1      $f0, 0x38($v0)
-/* CDA084 80242DA4 3C014028 */  lui       $at, 0x4028
-/* CDA088 80242DA8 44811800 */  mtc1      $at, $f3
-/* CDA08C 80242DAC 44801000 */  mtc1      $zero, $f2
-/* CDA090 80242DB0 46000021 */  cvt.d.s   $f0, $f0
-/* CDA094 80242DB4 46220001 */  sub.d     $f0, $f0, $f2
-.L80242DB8:
-/* CDA098 80242DB8 46200020 */  cvt.s.d   $f0, $f0
-/* CDA09C 80242DBC E6200038 */  swc1      $f0, 0x38($s1)
-/* CDA0A0 80242DC0 3C04004A */  lui       $a0, 0x4a
-/* CDA0A4 80242DC4 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CDA0A8 80242DC8 3C014039 */  lui       $at, 0x4039
-/* CDA0AC 80242DCC 44811800 */  mtc1      $at, $f3
-/* CDA0B0 80242DD0 44801000 */  mtc1      $zero, $f2
-/* CDA0B4 80242DD4 46000021 */  cvt.d.s   $f0, $f0
-/* CDA0B8 80242DD8 46220000 */  add.d     $f0, $f0, $f2
-/* CDA0BC 80242DDC 34840018 */  ori       $a0, $a0, 0x18
-/* CDA0C0 80242DE0 3C013FF0 */  lui       $at, 0x3ff0
-/* CDA0C4 80242DE4 44811800 */  mtc1      $at, $f3
-/* CDA0C8 80242DE8 44801000 */  mtc1      $zero, $f2
-/* CDA0CC 80242DEC 46200020 */  cvt.s.d   $f0, $f0
-/* CDA0D0 80242DF0 E620003C */  swc1      $f0, 0x3c($s1)
-/* CDA0D4 80242DF4 C4400040 */  lwc1      $f0, 0x40($v0)
-/* CDA0D8 80242DF8 8E220000 */  lw        $v0, ($s1)
-/* CDA0DC 80242DFC 2403FFFD */  addiu     $v1, $zero, -3
-/* CDA0E0 80242E00 AE200048 */  sw        $zero, 0x48($s1)
-/* CDA0E4 80242E04 AE200034 */  sw        $zero, 0x34($s1)
-/* CDA0E8 80242E08 AE240028 */  sw        $a0, 0x28($s1)
-/* CDA0EC 80242E0C 34420008 */  ori       $v0, $v0, 8
-/* CDA0F0 80242E10 00431024 */  and       $v0, $v0, $v1
-/* CDA0F4 80242E14 2403FDFF */  addiu     $v1, $zero, -0x201
-/* CDA0F8 80242E18 00431024 */  and       $v0, $v0, $v1
-/* CDA0FC 80242E1C 46000021 */  cvt.d.s   $f0, $f0
-/* CDA100 80242E20 46220000 */  add.d     $f0, $f0, $f2
-/* CDA104 80242E24 AE220000 */  sw        $v0, ($s1)
-/* CDA108 80242E28 24020065 */  addiu     $v0, $zero, 0x65
-/* CDA10C 80242E2C 46200020 */  cvt.s.d   $f0, $f0
-/* CDA110 80242E30 E6200040 */  swc1      $f0, 0x40($s1)
-/* CDA114 80242E34 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242E38:
-/* CDA118 80242E38 8E430094 */  lw        $v1, 0x94($s2)
-/* CDA11C 80242E3C 24020003 */  addiu     $v0, $zero, 3
-/* CDA120 80242E40 146200E8 */  bne       $v1, $v0, .L802431E4
-/* CDA124 80242E44 24020004 */   addiu    $v0, $zero, 4
-/* CDA128 80242E48 AE420094 */  sw        $v0, 0x94($s2)
-/* CDA12C 80242E4C C62C0038 */  lwc1      $f12, 0x38($s1)
-/* CDA130 80242E50 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CDA134 80242E54 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CDA138 80242E58 C62E0040 */  lwc1      $f14, 0x40($s1)
-/* CDA13C 80242E5C 8C460028 */  lw        $a2, 0x28($v0)
-/* CDA140 80242E60 0C00A720 */  jal       atan2
-/* CDA144 80242E64 8C470030 */   lw       $a3, 0x30($v0)
-/* CDA148 80242E68 3C014020 */  lui       $at, 0x4020
-/* CDA14C 80242E6C 44811000 */  mtc1      $at, $f2
-/* CDA150 80242E70 3C014100 */  lui       $at, 0x4100
-/* CDA154 80242E74 44812000 */  mtc1      $at, $f4
-/* CDA158 80242E78 3C013F4C */  lui       $at, 0x3f4c
-/* CDA15C 80242E7C 3421CCCD */  ori       $at, $at, 0xcccd
-/* CDA160 80242E80 44813000 */  mtc1      $at, $f6
-/* CDA164 80242E84 8E220000 */  lw        $v0, ($s1)
-/* CDA168 80242E88 E620000C */  swc1      $f0, 0xc($s1)
-/* CDA16C 80242E8C 34420800 */  ori       $v0, $v0, 0x800
-/* CDA170 80242E90 AE220000 */  sw        $v0, ($s1)
-/* CDA174 80242E94 24020066 */  addiu     $v0, $zero, 0x66
-/* CDA178 80242E98 E6220018 */  swc1      $f2, 0x18($s1)
-/* CDA17C 80242E9C E624001C */  swc1      $f4, 0x1c($s1)
-/* CDA180 80242EA0 E6260014 */  swc1      $f6, 0x14($s1)
-/* CDA184 80242EA4 AEA20070 */  sw        $v0, 0x70($s5)
-.L80242EA8:
-/* CDA188 80242EA8 C6200018 */  lwc1      $f0, 0x18($s1)
-/* CDA18C 80242EAC 44801000 */  mtc1      $zero, $f2
-/* CDA190 80242EB0 44801800 */  mtc1      $zero, $f3
-/* CDA194 80242EB4 46000021 */  cvt.d.s   $f0, $f0
-/* CDA198 80242EB8 4620103C */  c.lt.d    $f2, $f0
-/* CDA19C 80242EBC 00000000 */  nop
-/* CDA1A0 80242EC0 4500001F */  bc1f      .L80242F40
-/* CDA1A4 80242EC4 27A50058 */   addiu    $a1, $sp, 0x58
-/* CDA1A8 80242EC8 C6200038 */  lwc1      $f0, 0x38($s1)
-/* CDA1AC 80242ECC C622003C */  lwc1      $f2, 0x3c($s1)
-/* CDA1B0 80242ED0 C6240040 */  lwc1      $f4, 0x40($s1)
-/* CDA1B4 80242ED4 C6260018 */  lwc1      $f6, 0x18($s1)
-/* CDA1B8 80242ED8 E7A00058 */  swc1      $f0, 0x58($sp)
-/* CDA1BC 80242EDC E7A2005C */  swc1      $f2, 0x5c($sp)
-/* CDA1C0 80242EE0 E7A40060 */  swc1      $f4, 0x60($sp)
-/* CDA1C4 80242EE4 E7A60010 */  swc1      $f6, 0x10($sp)
-/* CDA1C8 80242EE8 C620000C */  lwc1      $f0, 0xc($s1)
-/* CDA1CC 80242EEC E7A00014 */  swc1      $f0, 0x14($sp)
-/* CDA1D0 80242EF0 862200A8 */  lh        $v0, 0xa8($s1)
-/* CDA1D4 80242EF4 44820000 */  mtc1      $v0, $f0
-/* CDA1D8 80242EF8 00000000 */  nop
-/* CDA1DC 80242EFC 46800020 */  cvt.s.w   $f0, $f0
-/* CDA1E0 80242F00 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CDA1E4 80242F04 862200A6 */  lh        $v0, 0xa6($s1)
-/* CDA1E8 80242F08 27A6005C */  addiu     $a2, $sp, 0x5c
-/* CDA1EC 80242F0C 44820000 */  mtc1      $v0, $f0
-/* CDA1F0 80242F10 00000000 */  nop
-/* CDA1F4 80242F14 46800020 */  cvt.s.w   $f0, $f0
-/* CDA1F8 80242F18 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* CDA1FC 80242F1C 8E240080 */  lw        $a0, 0x80($s1)
-/* CDA200 80242F20 0C037711 */  jal       func_800DDC44
-/* CDA204 80242F24 27A70060 */   addiu    $a3, $sp, 0x60
-/* CDA208 80242F28 54400005 */  bnel      $v0, $zero, .L80242F40
-/* CDA20C 80242F2C AE200018 */   sw       $zero, 0x18($s1)
-/* CDA210 80242F30 8E250018 */  lw        $a1, 0x18($s1)
-/* CDA214 80242F34 8E26000C */  lw        $a2, 0xc($s1)
-/* CDA218 80242F38 0C00EA95 */  jal       npc_move_heading
-/* CDA21C 80242F3C 0220202D */   daddu    $a0, $s1, $zero
-.L80242F40:
-/* CDA220 80242F40 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CDA224 80242F44 4480B000 */  mtc1      $zero, $f22
-/* CDA228 80242F48 4480B800 */  mtc1      $zero, $f23
-/* CDA22C 80242F4C 46000021 */  cvt.d.s   $f0, $f0
-/* CDA230 80242F50 4636003C */  c.lt.d    $f0, $f22
-/* CDA234 80242F54 00000000 */  nop
-/* CDA238 80242F58 45000074 */  bc1f      .L8024312C
-/* CDA23C 80242F5C 27A50058 */   addiu    $a1, $sp, 0x58
-/* CDA240 80242F60 27A6005C */  addiu     $a2, $sp, 0x5c
-/* CDA244 80242F64 27A20064 */  addiu     $v0, $sp, 0x64
-/* CDA248 80242F68 C622003C */  lwc1      $f2, 0x3c($s1)
-/* CDA24C 80242F6C C6260038 */  lwc1      $f6, 0x38($s1)
-/* CDA250 80242F70 3C01402A */  lui       $at, 0x402a
-/* CDA254 80242F74 4481A800 */  mtc1      $at, $f21
-/* CDA258 80242F78 4480A000 */  mtc1      $zero, $f20
-/* CDA25C 80242F7C 460010A1 */  cvt.d.s   $f2, $f2
-/* CDA260 80242F80 46341080 */  add.d     $f2, $f2, $f20
-/* CDA264 80242F84 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CDA268 80242F88 C6240040 */  lwc1      $f4, 0x40($s1)
-/* CDA26C 80242F8C 46000005 */  abs.s     $f0, $f0
-/* CDA270 80242F90 E7A40060 */  swc1      $f4, 0x60($sp)
-/* CDA274 80242F94 3C014030 */  lui       $at, 0x4030
-/* CDA278 80242F98 44812800 */  mtc1      $at, $f5
-/* CDA27C 80242F9C 44802000 */  mtc1      $zero, $f4
-/* CDA280 80242FA0 46000021 */  cvt.d.s   $f0, $f0
-/* CDA284 80242FA4 E7A60058 */  swc1      $f6, 0x58($sp)
-/* CDA288 80242FA8 46240000 */  add.d     $f0, $f0, $f4
-/* CDA28C 80242FAC 462010A0 */  cvt.s.d   $f2, $f2
-/* CDA290 80242FB0 E7A2005C */  swc1      $f2, 0x5c($sp)
-/* CDA294 80242FB4 46200020 */  cvt.s.d   $f0, $f0
-/* CDA298 80242FB8 E7A00064 */  swc1      $f0, 0x64($sp)
-/* CDA29C 80242FBC AFA20010 */  sw        $v0, 0x10($sp)
-/* CDA2A0 80242FC0 8E240080 */  lw        $a0, 0x80($s1)
-/* CDA2A4 80242FC4 0C0372DF */  jal       func_800DCB7C
-/* CDA2A8 80242FC8 27A70060 */   addiu    $a3, $sp, 0x60
-/* CDA2AC 80242FCC 10400057 */  beqz      $v0, .L8024312C
-/* CDA2B0 80242FD0 00000000 */   nop
-/* CDA2B4 80242FD4 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CDA2B8 80242FD8 C7A20064 */  lwc1      $f2, 0x64($sp)
-/* CDA2BC 80242FDC 46000005 */  abs.s     $f0, $f0
-/* CDA2C0 80242FE0 46000021 */  cvt.d.s   $f0, $f0
-/* CDA2C4 80242FE4 46340000 */  add.d     $f0, $f0, $f20
-/* CDA2C8 80242FE8 460010A1 */  cvt.d.s   $f2, $f2
-/* CDA2CC 80242FEC 4620103E */  c.le.d    $f2, $f0
-/* CDA2D0 80242FF0 00000000 */  nop
-/* CDA2D4 80242FF4 4500004D */  bc1f      .L8024312C
-/* CDA2D8 80242FF8 00000000 */   nop
-/* CDA2DC 80242FFC C7A0005C */  lwc1      $f0, 0x5c($sp)
-/* CDA2E0 80243000 E620003C */  swc1      $f0, 0x3c($s1)
-/* CDA2E4 80243004 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CDA2E8 80243008 C6200038 */  lwc1      $f0, 0x38($s1)
-/* CDA2EC 8024300C 4600020D */  trunc.w.s $f8, $f0
-/* CDA2F0 80243010 E4480000 */  swc1      $f8, ($v0)
-/* CDA2F4 80243014 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CDA2F8 80243018 C620003C */  lwc1      $f0, 0x3c($s1)
-/* CDA2FC 8024301C 4600020D */  trunc.w.s $f8, $f0
-/* CDA300 80243020 E4480004 */  swc1      $f8, 4($v0)
-/* CDA304 80243024 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CDA308 80243028 C6200040 */  lwc1      $f0, 0x40($s1)
-/* CDA30C 8024302C 4600020D */  trunc.w.s $f8, $f0
-/* CDA310 80243030 E4480008 */  swc1      $f8, 8($v0)
-/* CDA314 80243034 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CDA318 80243038 C6200038 */  lwc1      $f0, 0x38($s1)
-/* CDA31C 8024303C 4600020D */  trunc.w.s $f8, $f0
-/* CDA320 80243040 E448001C */  swc1      $f8, 0x1c($v0)
-/* CDA324 80243044 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CDA328 80243048 C620003C */  lwc1      $f0, 0x3c($s1)
-/* CDA32C 8024304C 4600020D */  trunc.w.s $f8, $f0
-/* CDA330 80243050 E4480020 */  swc1      $f8, 0x20($v0)
-/* CDA334 80243054 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CDA338 80243058 C6200040 */  lwc1      $f0, 0x40($s1)
-/* CDA33C 8024305C 4600020D */  trunc.w.s $f8, $f0
-/* CDA340 80243060 E4480024 */  swc1      $f8, 0x24($v0)
-/* CDA344 80243064 8E4300A0 */  lw        $v1, 0xa0($s2)
-/* CDA348 80243068 24020005 */  addiu     $v0, $zero, 5
-/* CDA34C 8024306C 1060000B */  beqz      $v1, .L8024309C
-/* CDA350 80243070 AE420094 */   sw       $v0, 0x94($s2)
-/* CDA354 80243074 C620003C */  lwc1      $f0, 0x3c($s1)
-/* CDA358 80243078 46000021 */  cvt.d.s   $f0, $f0
-/* CDA35C 8024307C 4636003E */  c.le.d    $f0, $f22
-/* CDA360 80243080 00000000 */  nop
-/* CDA364 80243084 4501000D */  bc1t      .L802430BC
-/* CDA368 80243088 2403FFF7 */   addiu    $v1, $zero, -9
-/* CDA36C 8024308C 8E220000 */  lw        $v0, ($s1)
-/* CDA370 80243090 34420200 */  ori       $v0, $v0, 0x200
-/* CDA374 80243094 08090C33 */  j         .L802430CC
-/* CDA378 80243098 00431024 */   and      $v0, $v0, $v1
-.L8024309C:
-/* CDA37C 8024309C 8E4200D0 */  lw        $v0, 0xd0($s2)
-/* CDA380 802430A0 8C420034 */  lw        $v0, 0x34($v0)
-/* CDA384 802430A4 14400005 */  bnez      $v0, .L802430BC
-/* CDA388 802430A8 2403FFF7 */   addiu    $v1, $zero, -9
-/* CDA38C 802430AC 8E220000 */  lw        $v0, ($s1)
-/* CDA390 802430B0 34420200 */  ori       $v0, $v0, 0x200
-/* CDA394 802430B4 08090C33 */  j         .L802430CC
-/* CDA398 802430B8 00431024 */   and      $v0, $v0, $v1
-.L802430BC:
-/* CDA39C 802430BC 8E220000 */  lw        $v0, ($s1)
-/* CDA3A0 802430C0 2403FDFF */  addiu     $v1, $zero, -0x201
-/* CDA3A4 802430C4 00431024 */  and       $v0, $v0, $v1
-/* CDA3A8 802430C8 34420008 */  ori       $v0, $v0, 8
-.L802430CC:
-/* CDA3AC 802430CC AE220000 */  sw        $v0, ($s1)
-/* CDA3B0 802430D0 C62C0038 */  lwc1      $f12, 0x38($s1)
-/* CDA3B4 802430D4 C62E0040 */  lwc1      $f14, 0x40($s1)
-/* CDA3B8 802430D8 8E220000 */  lw        $v0, ($s1)
-/* CDA3BC 802430DC 3C04800F */  lui       $a0, %hi(gPlayerStatusPtr)
-/* CDA3C0 802430E0 8C847B30 */  lw        $a0, %lo(gPlayerStatusPtr)($a0)
-/* CDA3C4 802430E4 3C030004 */  lui       $v1, 4
-/* CDA3C8 802430E8 AE20001C */  sw        $zero, 0x1c($s1)
-/* CDA3CC 802430EC 00431025 */  or        $v0, $v0, $v1
-/* CDA3D0 802430F0 2403F7FF */  addiu     $v1, $zero, -0x801
-/* CDA3D4 802430F4 00431024 */  and       $v0, $v0, $v1
-/* CDA3D8 802430F8 AE220000 */  sw        $v0, ($s1)
-/* CDA3DC 802430FC 8C860028 */  lw        $a2, 0x28($a0)
-/* CDA3E0 80243100 0C00A720 */  jal       atan2
-/* CDA3E4 80243104 8C870030 */   lw       $a3, 0x30($a0)
-/* CDA3E8 80243108 3C02004A */  lui       $v0, 0x4a
-/* CDA3EC 8024310C 3442001A */  ori       $v0, $v0, 0x1a
-/* CDA3F0 80243110 AE220028 */  sw        $v0, 0x28($s1)
-/* CDA3F4 80243114 24020003 */  addiu     $v0, $zero, 3
-/* CDA3F8 80243118 A622008E */  sh        $v0, 0x8e($s1)
-/* CDA3FC 8024311C 24020067 */  addiu     $v0, $zero, 0x67
-/* CDA400 80243120 E620000C */  swc1      $f0, 0xc($s1)
-/* CDA404 80243124 08090C79 */  j         .L802431E4
-/* CDA408 80243128 AEA20070 */   sw       $v0, 0x70($s5)
-.L8024312C:
-/* CDA40C 8024312C C624003C */  lwc1      $f4, 0x3c($s1)
-/* CDA410 80243130 C620001C */  lwc1      $f0, 0x1c($s1)
-/* CDA414 80243134 46002100 */  add.s     $f4, $f4, $f0
-/* CDA418 80243138 C6220014 */  lwc1      $f2, 0x14($s1)
-/* CDA41C 8024313C 46020001 */  sub.s     $f0, $f0, $f2
-/* CDA420 80243140 E624003C */  swc1      $f4, 0x3c($s1)
-/* CDA424 80243144 08090C79 */  j         .L802431E4
-/* CDA428 80243148 E620001C */   swc1     $f0, 0x1c($s1)
-.L8024314C:
-/* CDA42C 8024314C 9622008E */  lhu       $v0, 0x8e($s1)
-/* CDA430 80243150 2442FFFF */  addiu     $v0, $v0, -1
-/* CDA434 80243154 A622008E */  sh        $v0, 0x8e($s1)
-/* CDA438 80243158 00021400 */  sll       $v0, $v0, 0x10
-/* CDA43C 8024315C 1C400021 */  bgtz      $v0, .L802431E4
-/* CDA440 80243160 3C03004A */   lui      $v1, 0x4a
-/* CDA444 80243164 3C04FFFB */  lui       $a0, 0xfffb
-/* CDA448 80243168 3484FFFF */  ori       $a0, $a0, 0xffff
-/* CDA44C 8024316C 8E220000 */  lw        $v0, ($s1)
-/* CDA450 80243170 34630001 */  ori       $v1, $v1, 1
-/* CDA454 80243174 AE230028 */  sw        $v1, 0x28($s1)
-/* CDA458 80243178 00441024 */  and       $v0, $v0, $a0
-/* CDA45C 8024317C AE220000 */  sw        $v0, ($s1)
-/* CDA460 80243180 08090C79 */  j         .L802431E4
-/* CDA464 80243184 AEA00070 */   sw       $zero, 0x70($s5)
-.L80243188:
-/* CDA468 80243188 3C01C47A */  lui       $at, 0xc47a
-/* CDA46C 8024318C 44810000 */  mtc1      $at, $f0
-/* CDA470 80243190 8E230000 */  lw        $v1, ($s1)
-/* CDA474 80243194 A622008E */  sh        $v0, 0x8e($s1)
-/* CDA478 80243198 2402FDFF */  addiu     $v0, $zero, -0x201
-/* CDA47C 8024319C AE200038 */  sw        $zero, 0x38($s1)
-/* CDA480 802431A0 AE200040 */  sw        $zero, 0x40($s1)
-/* CDA484 802431A4 3463000A */  ori       $v1, $v1, 0xa
-/* CDA488 802431A8 00621824 */  and       $v1, $v1, $v0
-/* CDA48C 802431AC E620003C */  swc1      $f0, 0x3c($s1)
-/* CDA490 802431B0 AE230000 */  sw        $v1, ($s1)
-/* CDA494 802431B4 AEA40070 */  sw        $a0, 0x70($s5)
-.L802431B8:
-/* CDA498 802431B8 9622008E */  lhu       $v0, 0x8e($s1)
-/* CDA49C 802431BC 2442FFFF */  addiu     $v0, $v0, -1
-/* CDA4A0 802431C0 A622008E */  sh        $v0, 0x8e($s1)
-/* CDA4A4 802431C4 00021400 */  sll       $v0, $v0, 0x10
-/* CDA4A8 802431C8 1C400006 */  bgtz      $v0, .L802431E4
-/* CDA4AC 802431CC 24020064 */   addiu    $v0, $zero, 0x64
-/* CDA4B0 802431D0 AE400094 */  sw        $zero, 0x94($s2)
-/* CDA4B4 802431D4 08090C79 */  j         .L802431E4
-/* CDA4B8 802431D8 AEA20070 */   sw       $v0, 0x70($s5)
-.L802431DC:
-/* CDA4BC 802431DC 0C0129CF */  jal       func_8004A73C
-/* CDA4C0 802431E0 02A0202D */   daddu    $a0, $s5, $zero
-.L802431E4:
-/* CDA4C4 802431E4 8FBF0080 */  lw        $ra, 0x80($sp)
-/* CDA4C8 802431E8 8FB5007C */  lw        $s5, 0x7c($sp)
-/* CDA4CC 802431EC 8FB40078 */  lw        $s4, 0x78($sp)
-/* CDA4D0 802431F0 8FB30074 */  lw        $s3, 0x74($sp)
-/* CDA4D4 802431F4 8FB20070 */  lw        $s2, 0x70($sp)
-/* CDA4D8 802431F8 8FB1006C */  lw        $s1, 0x6c($sp)
-/* CDA4DC 802431FC 8FB00068 */  lw        $s0, 0x68($sp)
-/* CDA4E0 80243200 D7B60090 */  ldc1      $f22, 0x90($sp)
-/* CDA4E4 80243204 D7B40088 */  ldc1      $f20, 0x88($sp)
-/* CDA4E8 80243208 0000102D */  daddu     $v0, $zero, $zero
-/* CDA4EC 8024320C 03E00008 */  jr        $ra
-/* CDA4F0 80243210 27BD0098 */   addiu    $sp, $sp, 0x98
-/* CDA4F4 80243214 00000000 */  nop
-/* CDA4F8 80243218 00000000 */  nop
-/* CDA4FC 8024321C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_8024030C_CDC9AC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_8024030C_CDC9AC.s
deleted file mode 100644
index d571290684..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_8024030C_CDC9AC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_CDC9AC
-/* CDC9AC 8024030C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CDC9B0 80240310 24040001 */  addiu     $a0, $zero, 1
-/* CDC9B4 80240314 0000282D */  daddu     $a1, $zero, $zero
-/* CDC9B8 80240318 00A0302D */  daddu     $a2, $a1, $zero
-/* CDC9BC 8024031C 00A0382D */  daddu     $a3, $a1, $zero
-/* CDC9C0 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CDC9C4 80240324 AFA00010 */  sw        $zero, 0x10($sp)
-/* CDC9C8 80240328 0C01CA54 */  jal       func_80072950
-/* CDC9CC 8024032C AFA00014 */   sw       $zero, 0x14($sp)
-/* CDC9D0 80240330 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CDC9D4 80240334 24020002 */  addiu     $v0, $zero, 2
-/* CDC9D8 80240338 03E00008 */  jr        $ra
-/* CDC9DC 8024033C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240340_CDC9E0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240340_CDC9E0.s
deleted file mode 100644
index c5e8e745fa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDC6A0/func_80240340_CDC9E0.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_CDC9E0
-/* CDC9E0 80240340 8C8400C0 */  lw        $a0, 0xc0($a0)
-/* CDC9E4 80240344 8C83000C */  lw        $v1, 0xc($a0)
-/* CDC9E8 80240348 24020045 */  addiu     $v0, $zero, 0x45
-/* CDC9EC 8024034C AC620030 */  sw        $v0, 0x30($v1)
-/* CDC9F0 80240350 8C83000C */  lw        $v1, 0xc($a0)
-/* CDC9F4 80240354 240200FF */  addiu     $v0, $zero, 0xff
-/* CDC9F8 80240358 AC620034 */  sw        $v0, 0x34($v1)
-/* CDC9FC 8024035C 8C83000C */  lw        $v1, 0xc($a0)
-/* CDCA00 80240360 240200D9 */  addiu     $v0, $zero, 0xd9
-/* CDCA04 80240364 AC620038 */  sw        $v0, 0x38($v1)
-/* CDCA08 80240368 8C83000C */  lw        $v1, 0xc($a0)
-/* CDCA0C 8024036C 240200B0 */  addiu     $v0, $zero, 0xb0
-/* CDCA10 80240370 AC620040 */  sw        $v0, 0x40($v1)
-/* CDCA14 80240374 8C83000C */  lw        $v1, 0xc($a0)
-/* CDCA18 80240378 240200FE */  addiu     $v0, $zero, 0xfe
-/* CDCA1C 8024037C AC620044 */  sw        $v0, 0x44($v1)
-/* CDCA20 80240380 8C83000C */  lw        $v1, 0xc($a0)
-/* CDCA24 80240384 2402007C */  addiu     $v0, $zero, 0x7c
-/* CDCA28 80240388 AC620048 */  sw        $v0, 0x48($v1)
-/* CDCA2C 8024038C 03E00008 */  jr        $ra
-/* CDCA30 80240390 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDCBD0/func_80240530_CDCBD0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDCBD0/func_80240530_CDCBD0.s
deleted file mode 100644
index fa52900bf2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_18/CDCBD0/func_80240530_CDCBD0.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240530_CDCBD0
-/* CDCBD0 80240530 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CDCBD4 80240534 AFB00010 */  sw        $s0, 0x10($sp)
-/* CDCBD8 80240538 0080802D */  daddu     $s0, $a0, $zero
-/* CDCBDC 8024053C AFBF0014 */  sw        $ra, 0x14($sp)
-/* CDCBE0 80240540 C60C0084 */  lwc1      $f12, 0x84($s0)
-/* CDCBE4 80240544 46806320 */  cvt.s.w   $f12, $f12
-/* CDCBE8 80240548 C6020090 */  lwc1      $f2, 0x90($s0)
-/* CDCBEC 8024054C 468010A0 */  cvt.s.w   $f2, $f2
-/* CDCBF0 80240550 44061000 */  mfc1      $a2, $f2
-/* CDCBF4 80240554 C6020098 */  lwc1      $f2, 0x98($s0)
-/* CDCBF8 80240558 468010A0 */  cvt.s.w   $f2, $f2
-/* CDCBFC 8024055C 44071000 */  mfc1      $a3, $f2
-/* CDCC00 80240560 C60E008C */  lwc1      $f14, 0x8c($s0)
-/* CDCC04 80240564 0C00A720 */  jal       atan2
-/* CDCC08 80240568 468073A0 */   cvt.s.w  $f14, $f14
-/* CDCC0C 8024056C 4600008D */  trunc.w.s $f2, $f0
-/* CDCC10 80240570 E60200AC */  swc1      $f2, 0xac($s0)
-/* CDCC14 80240574 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CDCC18 80240578 8FB00010 */  lw        $s0, 0x10($sp)
-/* CDCC1C 8024057C 24020002 */  addiu     $v0, $zero, 2
-/* CDCC20 80240580 03E00008 */  jr        $ra
-/* CDCC24 80240584 27BD0018 */   addiu    $sp, $sp, 0x18
-/* CDCC28 80240588 00000000 */  nop
-/* CDCC2C 8024058C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_8024030C_CE39FC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_8024030C_CE39FC.s
deleted file mode 100644
index fa5ba33944..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_8024030C_CE39FC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_CE39FC
-/* CE39FC 8024030C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CE3A00 80240310 24040001 */  addiu     $a0, $zero, 1
-/* CE3A04 80240314 0000282D */  daddu     $a1, $zero, $zero
-/* CE3A08 80240318 00A0302D */  daddu     $a2, $a1, $zero
-/* CE3A0C 8024031C 00A0382D */  daddu     $a3, $a1, $zero
-/* CE3A10 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CE3A14 80240324 AFA00010 */  sw        $zero, 0x10($sp)
-/* CE3A18 80240328 0C01CA54 */  jal       func_80072950
-/* CE3A1C 8024032C AFA00014 */   sw       $zero, 0x14($sp)
-/* CE3A20 80240330 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CE3A24 80240334 24020002 */  addiu     $v0, $zero, 2
-/* CE3A28 80240338 03E00008 */  jr        $ra
-/* CE3A2C 8024033C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_802404D0_CE3BC0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_802404D0_CE3BC0.s
deleted file mode 100644
index f650d32b33..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_802404D0_CE3BC0.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404D0_CE3BC0
-/* CE3BC0 802404D0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CE3BC4 802404D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* CE3BC8 802404D8 0080802D */  daddu     $s0, $a0, $zero
-/* CE3BCC 802404DC AFB20018 */  sw        $s2, 0x18($sp)
-/* CE3BD0 802404E0 3C128011 */  lui       $s2, %hi(gPlayerStatus)
-/* CE3BD4 802404E4 2652EFC8 */  addiu     $s2, $s2, %lo(gPlayerStatus)
-/* CE3BD8 802404E8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* CE3BDC 802404EC AFB10014 */  sw        $s1, 0x14($sp)
-/* CE3BE0 802404F0 C64000A8 */  lwc1      $f0, 0xa8($s2)
-/* CE3BE4 802404F4 8E02000C */  lw        $v0, 0xc($s0)
-/* CE3BE8 802404F8 4600008D */  trunc.w.s $f2, $f0
-/* CE3BEC 802404FC 44061000 */  mfc1      $a2, $f2
-/* CE3BF0 80240500 8C450000 */  lw        $a1, ($v0)
-/* CE3BF4 80240504 0C0B2026 */  jal       set_variable
-/* CE3BF8 80240508 8C510004 */   lw       $s1, 4($v0)
-/* CE3BFC 8024050C 0200202D */  daddu     $a0, $s0, $zero
-/* CE3C00 80240510 C6400080 */  lwc1      $f0, 0x80($s2)
-/* CE3C04 80240514 4600008D */  trunc.w.s $f2, $f0
-/* CE3C08 80240518 44061000 */  mfc1      $a2, $f2
-/* CE3C0C 8024051C 0C0B2026 */  jal       set_variable
-/* CE3C10 80240520 0220282D */   daddu    $a1, $s1, $zero
-/* CE3C14 80240524 8FBF001C */  lw        $ra, 0x1c($sp)
-/* CE3C18 80240528 8FB20018 */  lw        $s2, 0x18($sp)
-/* CE3C1C 8024052C 8FB10014 */  lw        $s1, 0x14($sp)
-/* CE3C20 80240530 8FB00010 */  lw        $s0, 0x10($sp)
-/* CE3C24 80240534 24020002 */  addiu     $v0, $zero, 2
-/* CE3C28 80240538 03E00008 */  jr        $ra
-/* CE3C2C 8024053C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240540_CE3C30.s b/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240540_CE3C30.s
deleted file mode 100644
index 47f801f103..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240540_CE3C30.s
+++ /dev/null
@@ -1,76 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240540_CE3C30
-/* CE3C30 80240540 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CE3C34 80240544 AFB00010 */  sw        $s0, 0x10($sp)
-/* CE3C38 80240548 0080802D */  daddu     $s0, $a0, $zero
-/* CE3C3C 8024054C AFBF0018 */  sw        $ra, 0x18($sp)
-/* CE3C40 80240550 AFB10014 */  sw        $s1, 0x14($sp)
-/* CE3C44 80240554 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* CE3C48 80240558 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* CE3C4C 8024055C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* CE3C50 80240560 8E05008C */  lw        $a1, 0x8c($s0)
-/* CE3C54 80240564 4480B000 */  mtc1      $zero, $f22
-/* CE3C58 80240568 0C0B1EAF */  jal       get_variable
-/* CE3C5C 8024056C 0000202D */   daddu    $a0, $zero, $zero
-/* CE3C60 80240570 4600B306 */  mov.s     $f12, $f22
-/* CE3C64 80240574 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* CE3C68 80240578 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3C6C 8024057C 44061000 */  mfc1      $a2, $f2
-/* CE3C70 80240580 C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* CE3C74 80240584 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3C78 80240588 44071000 */  mfc1      $a3, $f2
-/* CE3C7C 8024058C 4482A000 */  mtc1      $v0, $f20
-/* CE3C80 80240590 00000000 */  nop
-/* CE3C84 80240594 4680A520 */  cvt.s.w   $f20, $f20
-/* CE3C88 80240598 0C00A7B5 */  jal       dist2D
-/* CE3C8C 8024059C 4600B386 */   mov.s    $f14, $f22
-/* CE3C90 802405A0 4600B306 */  mov.s     $f12, $f22
-/* CE3C94 802405A4 4600B386 */  mov.s     $f14, $f22
-/* CE3C98 802405A8 C60200A8 */  lwc1      $f2, 0xa8($s0)
-/* CE3C9C 802405AC 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3CA0 802405B0 44061000 */  mfc1      $a2, $f2
-/* CE3CA4 802405B4 C60200B0 */  lwc1      $f2, 0xb0($s0)
-/* CE3CA8 802405B8 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3CAC 802405BC 44071000 */  mfc1      $a3, $f2
-/* CE3CB0 802405C0 0C00A720 */  jal       atan2
-/* CE3CB4 802405C4 46000606 */   mov.s    $f24, $f0
-/* CE3CB8 802405C8 0C00A6C9 */  jal       clamp_angle
-/* CE3CBC 802405CC 46140301 */   sub.s    $f12, $f0, $f20
-/* CE3CC0 802405D0 46000506 */  mov.s     $f20, $f0
-/* CE3CC4 802405D4 0C00A8BB */  jal       sin_deg
-/* CE3CC8 802405D8 4600A306 */   mov.s    $f12, $f20
-/* CE3CCC 802405DC 4600C002 */  mul.s     $f0, $f24, $f0
-/* CE3CD0 802405E0 00000000 */  nop
-/* CE3CD4 802405E4 46160000 */  add.s     $f0, $f0, $f22
-/* CE3CD8 802405E8 3C118011 */  lui       $s1, %hi(gPlayerStatus)
-/* CE3CDC 802405EC 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
-/* CE3CE0 802405F0 E6200028 */  swc1      $f0, 0x28($s1)
-/* CE3CE4 802405F4 8E0500AC */  lw        $a1, 0xac($s0)
-/* CE3CE8 802405F8 0C0B1EAF */  jal       get_variable
-/* CE3CEC 802405FC 0000202D */   daddu    $a0, $zero, $zero
-/* CE3CF0 80240600 0000202D */  daddu     $a0, $zero, $zero
-/* CE3CF4 80240604 8E050090 */  lw        $a1, 0x90($s0)
-/* CE3CF8 80240608 0C0B1EAF */  jal       get_variable
-/* CE3CFC 8024060C 0040802D */   daddu    $s0, $v0, $zero
-/* CE3D00 80240610 4600A306 */  mov.s     $f12, $f20
-/* CE3D04 80240614 02028021 */  addu      $s0, $s0, $v0
-/* CE3D08 80240618 44900000 */  mtc1      $s0, $f0
-/* CE3D0C 8024061C 00000000 */  nop
-/* CE3D10 80240620 46800020 */  cvt.s.w   $f0, $f0
-/* CE3D14 80240624 0C00A8D4 */  jal       cos_deg
-/* CE3D18 80240628 E620002C */   swc1     $f0, 0x2c($s1)
-/* CE3D1C 8024062C 4600C602 */  mul.s     $f24, $f24, $f0
-/* CE3D20 80240630 00000000 */  nop
-/* CE3D24 80240634 4618B581 */  sub.s     $f22, $f22, $f24
-/* CE3D28 80240638 E6360030 */  swc1      $f22, 0x30($s1)
-/* CE3D2C 8024063C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CE3D30 80240640 8FB10014 */  lw        $s1, 0x14($sp)
-/* CE3D34 80240644 8FB00010 */  lw        $s0, 0x10($sp)
-/* CE3D38 80240648 D7B80030 */  ldc1      $f24, 0x30($sp)
-/* CE3D3C 8024064C D7B60028 */  ldc1      $f22, 0x28($sp)
-/* CE3D40 80240650 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* CE3D44 80240654 24020002 */  addiu     $v0, $zero, 2
-/* CE3D48 80240658 03E00008 */  jr        $ra
-/* CE3D4C 8024065C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240660_CE3D50.s b/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240660_CE3D50.s
deleted file mode 100644
index 172af61515..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240660_CE3D50.s
+++ /dev/null
@@ -1,77 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240660_CE3D50
-/* CE3D50 80240660 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CE3D54 80240664 AFB00010 */  sw        $s0, 0x10($sp)
-/* CE3D58 80240668 0080802D */  daddu     $s0, $a0, $zero
-/* CE3D5C 8024066C AFBF0018 */  sw        $ra, 0x18($sp)
-/* CE3D60 80240670 AFB10014 */  sw        $s1, 0x14($sp)
-/* CE3D64 80240674 F7B80030 */  sdc1      $f24, 0x30($sp)
-/* CE3D68 80240678 F7B60028 */  sdc1      $f22, 0x28($sp)
-/* CE3D6C 8024067C F7B40020 */  sdc1      $f20, 0x20($sp)
-/* CE3D70 80240680 0C00E2B7 */  jal       get_npc_by_index
-/* CE3D74 80240684 0000202D */   daddu    $a0, $zero, $zero
-/* CE3D78 80240688 0000202D */  daddu     $a0, $zero, $zero
-/* CE3D7C 8024068C 8E05008C */  lw        $a1, 0x8c($s0)
-/* CE3D80 80240690 4480B000 */  mtc1      $zero, $f22
-/* CE3D84 80240694 0C0B1EAF */  jal       get_variable
-/* CE3D88 80240698 0040882D */   daddu    $s1, $v0, $zero
-/* CE3D8C 8024069C 4600B306 */  mov.s     $f12, $f22
-/* CE3D90 802406A0 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* CE3D94 802406A4 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3D98 802406A8 44061000 */  mfc1      $a2, $f2
-/* CE3D9C 802406AC C60200BC */  lwc1      $f2, 0xbc($s0)
-/* CE3DA0 802406B0 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3DA4 802406B4 44071000 */  mfc1      $a3, $f2
-/* CE3DA8 802406B8 4482A000 */  mtc1      $v0, $f20
-/* CE3DAC 802406BC 00000000 */  nop
-/* CE3DB0 802406C0 4680A520 */  cvt.s.w   $f20, $f20
-/* CE3DB4 802406C4 0C00A7B5 */  jal       dist2D
-/* CE3DB8 802406C8 4600B386 */   mov.s    $f14, $f22
-/* CE3DBC 802406CC 4600B306 */  mov.s     $f12, $f22
-/* CE3DC0 802406D0 4600B386 */  mov.s     $f14, $f22
-/* CE3DC4 802406D4 C60200B4 */  lwc1      $f2, 0xb4($s0)
-/* CE3DC8 802406D8 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3DCC 802406DC 44061000 */  mfc1      $a2, $f2
-/* CE3DD0 802406E0 C60200BC */  lwc1      $f2, 0xbc($s0)
-/* CE3DD4 802406E4 468010A0 */  cvt.s.w   $f2, $f2
-/* CE3DD8 802406E8 44071000 */  mfc1      $a3, $f2
-/* CE3DDC 802406EC 0C00A720 */  jal       atan2
-/* CE3DE0 802406F0 46000606 */   mov.s    $f24, $f0
-/* CE3DE4 802406F4 0C00A6C9 */  jal       clamp_angle
-/* CE3DE8 802406F8 46140301 */   sub.s    $f12, $f0, $f20
-/* CE3DEC 802406FC 46000506 */  mov.s     $f20, $f0
-/* CE3DF0 80240700 0C00A8BB */  jal       sin_deg
-/* CE3DF4 80240704 4600A306 */   mov.s    $f12, $f20
-/* CE3DF8 80240708 4600C002 */  mul.s     $f0, $f24, $f0
-/* CE3DFC 8024070C 00000000 */  nop
-/* CE3E00 80240710 46160000 */  add.s     $f0, $f0, $f22
-/* CE3E04 80240714 E6200038 */  swc1      $f0, 0x38($s1)
-/* CE3E08 80240718 8E0500B8 */  lw        $a1, 0xb8($s0)
-/* CE3E0C 8024071C 0C0B1EAF */  jal       get_variable
-/* CE3E10 80240720 0000202D */   daddu    $a0, $zero, $zero
-/* CE3E14 80240724 0000202D */  daddu     $a0, $zero, $zero
-/* CE3E18 80240728 8E050090 */  lw        $a1, 0x90($s0)
-/* CE3E1C 8024072C 0C0B1EAF */  jal       get_variable
-/* CE3E20 80240730 0040802D */   daddu    $s0, $v0, $zero
-/* CE3E24 80240734 4600A306 */  mov.s     $f12, $f20
-/* CE3E28 80240738 02028021 */  addu      $s0, $s0, $v0
-/* CE3E2C 8024073C 44900000 */  mtc1      $s0, $f0
-/* CE3E30 80240740 00000000 */  nop
-/* CE3E34 80240744 46800020 */  cvt.s.w   $f0, $f0
-/* CE3E38 80240748 0C00A8D4 */  jal       cos_deg
-/* CE3E3C 8024074C E620003C */   swc1     $f0, 0x3c($s1)
-/* CE3E40 80240750 4600C602 */  mul.s     $f24, $f24, $f0
-/* CE3E44 80240754 00000000 */  nop
-/* CE3E48 80240758 4618B581 */  sub.s     $f22, $f22, $f24
-/* CE3E4C 8024075C E6360040 */  swc1      $f22, 0x40($s1)
-/* CE3E50 80240760 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CE3E54 80240764 8FB10014 */  lw        $s1, 0x14($sp)
-/* CE3E58 80240768 8FB00010 */  lw        $s0, 0x10($sp)
-/* CE3E5C 8024076C D7B80030 */  ldc1      $f24, 0x30($sp)
-/* CE3E60 80240770 D7B60028 */  ldc1      $f22, 0x28($sp)
-/* CE3E64 80240774 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* CE3E68 80240778 24020002 */  addiu     $v0, $zero, 2
-/* CE3E6C 8024077C 03E00008 */  jr        $ra
-/* CE3E70 80240780 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240784_CE3E74.s b/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240784_CE3E74.s
deleted file mode 100644
index ea139bf616..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_19/CE36F0/func_80240784_CE3E74.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240784_CE3E74
-/* CE3E74 80240784 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CE3E78 80240788 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CE3E7C 8024078C C4800084 */  lwc1      $f0, 0x84($a0)
-/* CE3E80 80240790 46800020 */  cvt.s.w   $f0, $f0
-/* CE3E84 80240794 44050000 */  mfc1      $a1, $f0
-/* CE3E88 80240798 0C04DF69 */  jal       set_transition_stencil_zoom_1
-/* CE3E8C 8024079C 24040001 */   addiu    $a0, $zero, 1
-/* CE3E90 802407A0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CE3E94 802407A4 24020002 */  addiu     $v0, $zero, 2
-/* CE3E98 802407A8 03E00008 */  jr        $ra
-/* CE3E9C 802407AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240000_CE6700.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240000_CE6700.s
deleted file mode 100644
index 514f69580c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240000_CE6700.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CE6700
-/* CE6700 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CE6704 80240004 AFBF001C */  sw        $ra, 0x1c($sp)
-/* CE6708 80240008 AFB00018 */  sw        $s0, 0x18($sp)
-/* CE670C 8024000C 8C900084 */  lw        $s0, 0x84($a0)
-/* CE6710 80240010 C6000008 */  lwc1      $f0, 8($s0)
-/* CE6714 80240014 240400A2 */  addiu     $a0, $zero, 0xa2
-/* CE6718 80240018 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CE671C 8024001C 8E060000 */  lw        $a2, ($s0)
-/* CE6720 80240020 8E070004 */  lw        $a3, 4($s0)
-/* CE6724 80240024 0C05267B */  jal       sfx_adjust_env_sound_pos
-/* CE6728 80240028 0000282D */   daddu    $a1, $zero, $zero
-/* CE672C 8024002C 86020044 */  lh        $v0, 0x44($s0)
-/* CE6730 80240030 8FBF001C */  lw        $ra, 0x1c($sp)
-/* CE6734 80240034 8FB00018 */  lw        $s0, 0x18($sp)
-/* CE6738 80240038 28420002 */  slti      $v0, $v0, 2
-/* CE673C 8024003C 38420001 */  xori      $v0, $v0, 1
-/* CE6740 80240040 00021040 */  sll       $v0, $v0, 1
-/* CE6744 80240044 03E00008 */  jr        $ra
-/* CE6748 80240048 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_8024004C_CE674C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_8024004C_CE674C.s
deleted file mode 100644
index 89339d7475..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_8024004C_CE674C.s
+++ /dev/null
@@ -1,93 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024004C_CE674C
-/* CE674C 8024004C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CE6750 80240050 AFB20020 */  sw        $s2, 0x20($sp)
-/* CE6754 80240054 0080902D */  daddu     $s2, $a0, $zero
-/* CE6758 80240058 AFBF0024 */  sw        $ra, 0x24($sp)
-/* CE675C 8024005C AFB1001C */  sw        $s1, 0x1c($sp)
-/* CE6760 80240060 AFB00018 */  sw        $s0, 0x18($sp)
-/* CE6764 80240064 10A0004A */  beqz      $a1, .L80240190
-/* CE6768 80240068 8E51000C */   lw       $s1, 0xc($s2)
-/* CE676C 8024006C 0C00AB39 */  jal       heap_malloc
-/* CE6770 80240070 24040058 */   addiu    $a0, $zero, 0x58
-/* CE6774 80240074 0000202D */  daddu     $a0, $zero, $zero
-/* CE6778 80240078 3C05FD05 */  lui       $a1, 0xfd05
-/* CE677C 8024007C 34A50F81 */  ori       $a1, $a1, 0xf81
-/* CE6780 80240080 0040802D */  daddu     $s0, $v0, $zero
-/* CE6784 80240084 0200302D */  daddu     $a2, $s0, $zero
-/* CE6788 80240088 0C0B2026 */  jal       set_variable
-/* CE678C 8024008C AE500084 */   sw       $s0, 0x84($s2)
-/* CE6790 80240090 8E250000 */  lw        $a1, ($s1)
-/* CE6794 80240094 26310004 */  addiu     $s1, $s1, 4
-/* CE6798 80240098 0C0B1EAF */  jal       get_variable
-/* CE679C 8024009C 0240202D */   daddu    $a0, $s2, $zero
-/* CE67A0 802400A0 AE020038 */  sw        $v0, 0x38($s0)
-/* CE67A4 802400A4 8E250000 */  lw        $a1, ($s1)
-/* CE67A8 802400A8 26310004 */  addiu     $s1, $s1, 4
-/* CE67AC 802400AC 0C0B1EAF */  jal       get_variable
-/* CE67B0 802400B0 0240202D */   daddu    $a0, $s2, $zero
-/* CE67B4 802400B4 AE02003C */  sw        $v0, 0x3c($s0)
-/* CE67B8 802400B8 8E250000 */  lw        $a1, ($s1)
-/* CE67BC 802400BC 26310004 */  addiu     $s1, $s1, 4
-/* CE67C0 802400C0 0C0B210B */  jal       get_float_variable
-/* CE67C4 802400C4 0240202D */   daddu    $a0, $s2, $zero
-/* CE67C8 802400C8 E600000C */  swc1      $f0, 0xc($s0)
-/* CE67CC 802400CC 8E250000 */  lw        $a1, ($s1)
-/* CE67D0 802400D0 26310004 */  addiu     $s1, $s1, 4
-/* CE67D4 802400D4 0C0B210B */  jal       get_float_variable
-/* CE67D8 802400D8 0240202D */   daddu    $a0, $s2, $zero
-/* CE67DC 802400DC E6000010 */  swc1      $f0, 0x10($s0)
-/* CE67E0 802400E0 8E250000 */  lw        $a1, ($s1)
-/* CE67E4 802400E4 26310004 */  addiu     $s1, $s1, 4
-/* CE67E8 802400E8 0C0B210B */  jal       get_float_variable
-/* CE67EC 802400EC 0240202D */   daddu    $a0, $s2, $zero
-/* CE67F0 802400F0 E6000014 */  swc1      $f0, 0x14($s0)
-/* CE67F4 802400F4 8E250000 */  lw        $a1, ($s1)
-/* CE67F8 802400F8 26310004 */  addiu     $s1, $s1, 4
-/* CE67FC 802400FC 0C0B210B */  jal       get_float_variable
-/* CE6800 80240100 0240202D */   daddu    $a0, $s2, $zero
-/* CE6804 80240104 E6000018 */  swc1      $f0, 0x18($s0)
-/* CE6808 80240108 8E250000 */  lw        $a1, ($s1)
-/* CE680C 8024010C 26310004 */  addiu     $s1, $s1, 4
-/* CE6810 80240110 0C0B210B */  jal       get_float_variable
-/* CE6814 80240114 0240202D */   daddu    $a0, $s2, $zero
-/* CE6818 80240118 E600001C */  swc1      $f0, 0x1c($s0)
-/* CE681C 8024011C 8E250000 */  lw        $a1, ($s1)
-/* CE6820 80240120 26310004 */  addiu     $s1, $s1, 4
-/* CE6824 80240124 0C0B210B */  jal       get_float_variable
-/* CE6828 80240128 0240202D */   daddu    $a0, $s2, $zero
-/* CE682C 8024012C E6000020 */  swc1      $f0, 0x20($s0)
-/* CE6830 80240130 8E250000 */  lw        $a1, ($s1)
-/* CE6834 80240134 26310004 */  addiu     $s1, $s1, 4
-/* CE6838 80240138 0C0B210B */  jal       get_float_variable
-/* CE683C 8024013C 0240202D */   daddu    $a0, $s2, $zero
-/* CE6840 80240140 E6000024 */  swc1      $f0, 0x24($s0)
-/* CE6844 80240144 8E250000 */  lw        $a1, ($s1)
-/* CE6848 80240148 0C0B210B */  jal       get_float_variable
-/* CE684C 8024014C 0240202D */   daddu    $a0, $s2, $zero
-/* CE6850 80240150 3C013F80 */  lui       $at, 0x3f80
-/* CE6854 80240154 44811000 */  mtc1      $at, $f2
-/* CE6858 80240158 E6000028 */  swc1      $f0, 0x28($s0)
-/* CE685C 8024015C AFA00014 */  sw        $zero, 0x14($sp)
-/* CE6860 80240160 E7A20010 */  swc1      $f2, 0x10($sp)
-/* CE6864 80240164 8E05000C */  lw        $a1, 0xc($s0)
-/* CE6868 80240168 8E060010 */  lw        $a2, 0x10($s0)
-/* CE686C 8024016C 8E070014 */  lw        $a3, 0x14($s0)
-/* CE6870 80240170 0C01CA6C */  jal       func_800729B0
-/* CE6874 80240174 24040002 */   addiu    $a0, $zero, 2
-/* CE6878 80240178 AE020050 */  sw        $v0, 0x50($s0)
-/* CE687C 8024017C A600004E */  sh        $zero, 0x4e($s0)
-/* CE6880 80240180 A6000048 */  sh        $zero, 0x48($s0)
-/* CE6884 80240184 A600004A */  sh        $zero, 0x4a($s0)
-/* CE6888 80240188 A6000044 */  sh        $zero, 0x44($s0)
-/* CE688C 8024018C A6000046 */  sh        $zero, 0x46($s0)
-.L80240190:
-/* CE6890 80240190 8FBF0024 */  lw        $ra, 0x24($sp)
-/* CE6894 80240194 8FB20020 */  lw        $s2, 0x20($sp)
-/* CE6898 80240198 8FB1001C */  lw        $s1, 0x1c($sp)
-/* CE689C 8024019C 8FB00018 */  lw        $s0, 0x18($sp)
-/* CE68A0 802401A0 24020002 */  addiu     $v0, $zero, 2
-/* CE68A4 802401A4 03E00008 */  jr        $ra
-/* CE68A8 802401A8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s
deleted file mode 100644
index 375e5094ce..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s
+++ /dev/null
@@ -1,276 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401AC_CE68AC
-/* CE68AC 802401AC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CE68B0 802401B0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* CE68B4 802401B4 AFB1001C */  sw        $s1, 0x1c($sp)
-/* CE68B8 802401B8 AFB00018 */  sw        $s0, 0x18($sp)
-/* CE68BC 802401BC 8C910084 */  lw        $s1, 0x84($a0)
-/* CE68C0 802401C0 86230044 */  lh        $v1, 0x44($s1)
-/* CE68C4 802401C4 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* CE68C8 802401C8 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* CE68CC 802401CC 2C620005 */  sltiu     $v0, $v1, 5
-/* CE68D0 802401D0 1040008A */  beqz      $v0, L802403FC_CE6AFC
-/* CE68D4 802401D4 00031080 */   sll      $v0, $v1, 2
-/* CE68D8 802401D8 3C018024 */  lui       $at, %hi(jtbl_80245B10_CEC210)
-/* CE68DC 802401DC 00220821 */  addu      $at, $at, $v0
-/* CE68E0 802401E0 8C225B10 */  lw        $v0, %lo(jtbl_80245B10_CEC210)($at)
-/* CE68E4 802401E4 00400008 */  jr        $v0
-/* CE68E8 802401E8 00000000 */   nop
-glabel L802401EC_CE68EC
-/* CE68EC 802401EC 8E22003C */  lw        $v0, 0x3c($s1)
-/* CE68F0 802401F0 86270046 */  lh        $a3, 0x46($s1)
-/* CE68F4 802401F4 AFA20010 */  sw        $v0, 0x10($sp)
-/* CE68F8 802401F8 8E250010 */  lw        $a1, 0x10($s1)
-/* CE68FC 802401FC 8E26001C */  lw        $a2, 0x1c($s1)
-/* CE6900 80240200 0C00A8ED */  jal       update_lerp
-/* CE6904 80240204 24040005 */   addiu    $a0, $zero, 5
-/* CE6908 80240208 86270046 */  lh        $a3, 0x46($s1)
-/* CE690C 8024020C 8E22003C */  lw        $v0, 0x3c($s1)
-/* CE6910 80240210 E6200004 */  swc1      $f0, 4($s1)
-/* CE6914 80240214 AFA20010 */  sw        $v0, 0x10($sp)
-/* CE6918 80240218 8E25000C */  lw        $a1, 0xc($s1)
-/* CE691C 8024021C 8E260018 */  lw        $a2, 0x18($s1)
-/* CE6920 80240220 0C00A8ED */  jal       update_lerp
-/* CE6924 80240224 0000202D */   daddu    $a0, $zero, $zero
-/* CE6928 80240228 86270046 */  lh        $a3, 0x46($s1)
-/* CE692C 8024022C 8E22003C */  lw        $v0, 0x3c($s1)
-/* CE6930 80240230 E6200000 */  swc1      $f0, ($s1)
-/* CE6934 80240234 AFA20010 */  sw        $v0, 0x10($sp)
-/* CE6938 80240238 8E250014 */  lw        $a1, 0x14($s1)
-/* CE693C 8024023C 8E260020 */  lw        $a2, 0x20($s1)
-/* CE6940 80240240 0C00A8ED */  jal       update_lerp
-/* CE6944 80240244 0000202D */   daddu    $a0, $zero, $zero
-/* CE6948 80240248 8E220050 */  lw        $v0, 0x50($s1)
-/* CE694C 8024024C E6200008 */  swc1      $f0, 8($s1)
-/* CE6950 80240250 C6200000 */  lwc1      $f0, ($s1)
-/* CE6954 80240254 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6958 80240258 E4400008 */  swc1      $f0, 8($v0)
-/* CE695C 8024025C 8E220050 */  lw        $v0, 0x50($s1)
-/* CE6960 80240260 C6200004 */  lwc1      $f0, 4($s1)
-/* CE6964 80240264 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6968 80240268 E440000C */  swc1      $f0, 0xc($v0)
-/* CE696C 8024026C 8E220050 */  lw        $v0, 0x50($s1)
-/* CE6970 80240270 C6200008 */  lwc1      $f0, 8($s1)
-/* CE6974 80240274 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6978 80240278 E4400010 */  swc1      $f0, 0x10($v0)
-/* CE697C 8024027C 96220046 */  lhu       $v0, 0x46($s1)
-/* CE6980 80240280 8E23003C */  lw        $v1, 0x3c($s1)
-/* CE6984 80240284 24420001 */  addiu     $v0, $v0, 1
-/* CE6988 80240288 A6220046 */  sh        $v0, 0x46($s1)
-/* CE698C 8024028C 00021400 */  sll       $v0, $v0, 0x10
-/* CE6990 80240290 00021403 */  sra       $v0, $v0, 0x10
-/* CE6994 80240294 0043102A */  slt       $v0, $v0, $v1
-/* CE6998 80240298 14400058 */  bnez      $v0, L802403FC_CE6AFC
-/* CE699C 8024029C 24020001 */   addiu    $v0, $zero, 1
-/* CE69A0 802402A0 A6220044 */  sh        $v0, 0x44($s1)
-/* CE69A4 802402A4 080900FF */  j         L802403FC_CE6AFC
-/* CE69A8 802402A8 A6200046 */   sh       $zero, 0x46($s1)
-glabel L802402AC_CE69AC
-/* CE69AC 802402AC 96220046 */  lhu       $v0, 0x46($s1)
-/* CE69B0 802402B0 24420001 */  addiu     $v0, $v0, 1
-/* CE69B4 802402B4 A6220046 */  sh        $v0, 0x46($s1)
-/* CE69B8 802402B8 00021400 */  sll       $v0, $v0, 0x10
-/* CE69BC 802402BC 00021403 */  sra       $v0, $v0, 0x10
-/* CE69C0 802402C0 2842003C */  slti      $v0, $v0, 0x3c
-/* CE69C4 802402C4 1440004D */  bnez      $v0, L802403FC_CE6AFC
-/* CE69C8 802402C8 24020002 */   addiu    $v0, $zero, 2
-/* CE69CC 802402CC 8E230050 */  lw        $v1, 0x50($s1)
-/* CE69D0 802402D0 A6220044 */  sh        $v0, 0x44($s1)
-/* CE69D4 802402D4 A6200046 */  sh        $zero, 0x46($s1)
-/* CE69D8 802402D8 8C63000C */  lw        $v1, 0xc($v1)
-/* CE69DC 802402DC 24020001 */  addiu     $v0, $zero, 1
-/* CE69E0 802402E0 AC620070 */  sw        $v0, 0x70($v1)
-/* CE69E4 802402E4 8E220050 */  lw        $v0, 0x50($s1)
-/* CE69E8 802402E8 8C42000C */  lw        $v0, 0xc($v0)
-/* CE69EC 802402EC 080900FF */  j         L802403FC_CE6AFC
-/* CE69F0 802402F0 AC400074 */   sw       $zero, 0x74($v0)
-glabel L802402F4_CE69F4
-/* CE69F4 802402F4 96220046 */  lhu       $v0, 0x46($s1)
-/* CE69F8 802402F8 24420001 */  addiu     $v0, $v0, 1
-/* CE69FC 802402FC A6220046 */  sh        $v0, 0x46($s1)
-/* CE6A00 80240300 00021400 */  sll       $v0, $v0, 0x10
-/* CE6A04 80240304 00021403 */  sra       $v0, $v0, 0x10
-/* CE6A08 80240308 2842003C */  slti      $v0, $v0, 0x3c
-/* CE6A0C 8024030C 1440003B */  bnez      $v0, L802403FC_CE6AFC
-/* CE6A10 80240310 00000000 */   nop
-/* CE6A14 80240314 3C013F80 */  lui       $at, 0x3f80
-/* CE6A18 80240318 44810000 */  mtc1      $at, $f0
-/* CE6A1C 8024031C AFA00014 */  sw        $zero, 0x14($sp)
-/* CE6A20 80240320 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CE6A24 80240324 8E250018 */  lw        $a1, 0x18($s1)
-/* CE6A28 80240328 8E26001C */  lw        $a2, 0x1c($s1)
-/* CE6A2C 8024032C 8E270020 */  lw        $a3, 0x20($s1)
-/* CE6A30 80240330 0C01C9AC */  jal       func_800726B0
-/* CE6A34 80240334 24040001 */   addiu    $a0, $zero, 1
-/* CE6A38 80240338 AE220054 */  sw        $v0, 0x54($s1)
-/* CE6A3C 8024033C 8C43000C */  lw        $v1, 0xc($v0)
-/* CE6A40 80240340 9222003B */  lbu       $v0, 0x3b($s1)
-/* CE6A44 80240344 A0620034 */  sb        $v0, 0x34($v1)
-/* CE6A48 80240348 8E220054 */  lw        $v0, 0x54($s1)
-/* CE6A4C 8024034C 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6A50 80240350 AC400020 */  sw        $zero, 0x20($v0)
-/* CE6A54 80240354 8E250018 */  lw        $a1, 0x18($s1)
-/* CE6A58 80240358 8E260028 */  lw        $a2, 0x28($s1)
-/* CE6A5C 8024035C 8E270020 */  lw        $a3, 0x20($s1)
-/* CE6A60 80240360 0C044898 */  jal       create_shadow_type
-/* CE6A64 80240364 0000202D */   daddu    $a0, $zero, $zero
-/* CE6A68 80240368 3C014210 */  lui       $at, 0x4210
-/* CE6A6C 8024036C 44810000 */  mtc1      $at, $f0
-/* CE6A70 80240370 AE220040 */  sw        $v0, 0x40($s1)
-/* CE6A74 80240374 24020003 */  addiu     $v0, $zero, 3
-/* CE6A78 80240378 A6220044 */  sh        $v0, 0x44($s1)
-/* CE6A7C 8024037C 24020001 */  addiu     $v0, $zero, 1
-/* CE6A80 80240380 A6200046 */  sh        $zero, 0x46($s1)
-/* CE6A84 80240384 AE20002C */  sw        $zero, 0x2c($s1)
-/* CE6A88 80240388 A6220048 */  sh        $v0, 0x48($s1)
-/* CE6A8C 8024038C 080900FF */  j         L802403FC_CE6AFC
-/* CE6A90 80240390 E6200030 */   swc1     $f0, 0x30($s1)
-glabel L80240394_CE6A94
-/* CE6A94 80240394 0000202D */  daddu     $a0, $zero, $zero
-/* CE6A98 80240398 3C054210 */  lui       $a1, 0x4210
-/* CE6A9C 8024039C 3C064198 */  lui       $a2, 0x4198
-/* CE6AA0 802403A0 86270046 */  lh        $a3, 0x46($s1)
-/* CE6AA4 802403A4 24020078 */  addiu     $v0, $zero, 0x78
-/* CE6AA8 802403A8 0C00A8ED */  jal       update_lerp
-/* CE6AAC 802403AC AFA20010 */   sw       $v0, 0x10($sp)
-/* CE6AB0 802403B0 96220046 */  lhu       $v0, 0x46($s1)
-/* CE6AB4 802403B4 E6200030 */  swc1      $f0, 0x30($s1)
-/* CE6AB8 802403B8 24420001 */  addiu     $v0, $v0, 1
-/* CE6ABC 802403BC A6220046 */  sh        $v0, 0x46($s1)
-/* CE6AC0 802403C0 00021400 */  sll       $v0, $v0, 0x10
-/* CE6AC4 802403C4 00021403 */  sra       $v0, $v0, 0x10
-/* CE6AC8 802403C8 28420078 */  slti      $v0, $v0, 0x78
-/* CE6ACC 802403CC 1440000B */  bnez      $v0, L802403FC_CE6AFC
-/* CE6AD0 802403D0 24030001 */   addiu    $v1, $zero, 1
-/* CE6AD4 802403D4 C620002C */  lwc1      $f0, 0x2c($s1)
-/* CE6AD8 802403D8 24020002 */  addiu     $v0, $zero, 2
-/* CE6ADC 802403DC A6220048 */  sh        $v0, 0x48($s1)
-/* CE6AE0 802403E0 24020004 */  addiu     $v0, $zero, 4
-/* CE6AE4 802403E4 A620004C */  sh        $zero, 0x4c($s1)
-/* CE6AE8 802403E8 A623004A */  sh        $v1, 0x4a($s1)
-/* CE6AEC 802403EC A623004E */  sh        $v1, 0x4e($s1)
-/* CE6AF0 802403F0 A6220044 */  sh        $v0, 0x44($s1)
-/* CE6AF4 802403F4 A6200046 */  sh        $zero, 0x46($s1)
-/* CE6AF8 802403F8 E6200034 */  swc1      $f0, 0x34($s1)
-glabel L802403FC_CE6AFC
-/* CE6AFC 802403FC 8623004A */  lh        $v1, 0x4a($s1)
-/* CE6B00 80240400 24020001 */  addiu     $v0, $zero, 1
-/* CE6B04 80240404 10620005 */  beq       $v1, $v0, .L8024041C
-/* CE6B08 80240408 24020002 */   addiu    $v0, $zero, 2
-/* CE6B0C 8024040C 1062001E */  beq       $v1, $v0, .L80240488
-/* CE6B10 80240410 00000000 */   nop
-/* CE6B14 80240414 0809014C */  j         .L80240530
-/* CE6B18 80240418 00000000 */   nop
-.L8024041C:
-/* CE6B1C 8024041C 8627004C */  lh        $a3, 0x4c($s1)
-/* CE6B20 80240420 24100078 */  addiu     $s0, $zero, 0x78
-/* CE6B24 80240424 AFB00010 */  sw        $s0, 0x10($sp)
-/* CE6B28 80240428 8E250034 */  lw        $a1, 0x34($s1)
-/* CE6B2C 8024042C 3C0644B4 */  lui       $a2, 0x44b4
-/* CE6B30 80240430 0C00A8ED */  jal       update_lerp
-/* CE6B34 80240434 24040004 */   addiu    $a0, $zero, 4
-/* CE6B38 80240438 8627004C */  lh        $a3, 0x4c($s1)
-/* CE6B3C 8024043C E620002C */  swc1      $f0, 0x2c($s1)
-/* CE6B40 80240440 AFB00010 */  sw        $s0, 0x10($sp)
-/* CE6B44 80240444 8E25001C */  lw        $a1, 0x1c($s1)
-/* CE6B48 80240448 8E260024 */  lw        $a2, 0x24($s1)
-/* CE6B4C 8024044C 0C00A8ED */  jal       update_lerp
-/* CE6B50 80240450 2404000A */   addiu    $a0, $zero, 0xa
-/* CE6B54 80240454 9622004C */  lhu       $v0, 0x4c($s1)
-/* CE6B58 80240458 E6200004 */  swc1      $f0, 4($s1)
-/* CE6B5C 8024045C 24420001 */  addiu     $v0, $v0, 1
-/* CE6B60 80240460 A622004C */  sh        $v0, 0x4c($s1)
-/* CE6B64 80240464 00021400 */  sll       $v0, $v0, 0x10
-/* CE6B68 80240468 00021403 */  sra       $v0, $v0, 0x10
-/* CE6B6C 8024046C 0050102A */  slt       $v0, $v0, $s0
-/* CE6B70 80240470 1440002F */  bnez      $v0, .L80240530
-/* CE6B74 80240474 2402010E */   addiu    $v0, $zero, 0x10e
-/* CE6B78 80240478 A622004C */  sh        $v0, 0x4c($s1)
-/* CE6B7C 8024047C 24020002 */  addiu     $v0, $zero, 2
-/* CE6B80 80240480 0809014B */  j         .L8024052C
-/* CE6B84 80240484 A622004A */   sh       $v0, 0x4a($s1)
-.L80240488:
-/* CE6B88 80240488 8622004C */  lh        $v0, 0x4c($s1)
-/* CE6B8C 8024048C 44826000 */  mtc1      $v0, $f12
-/* CE6B90 80240490 00000000 */  nop
-/* CE6B94 80240494 0C00A8BB */  jal       sin_deg
-/* CE6B98 80240498 46806320 */   cvt.s.w  $f12, $f12
-/* CE6B9C 8024049C 3C013F80 */  lui       $at, 0x3f80
-/* CE6BA0 802404A0 44811000 */  mtc1      $at, $f2
-/* CE6BA4 802404A4 00000000 */  nop
-/* CE6BA8 802404A8 46020000 */  add.s     $f0, $f0, $f2
-/* CE6BAC 802404AC 46000000 */  add.s     $f0, $f0, $f0
-/* CE6BB0 802404B0 C6220024 */  lwc1      $f2, 0x24($s1)
-/* CE6BB4 802404B4 8622004C */  lh        $v0, 0x4c($s1)
-/* CE6BB8 802404B8 46001080 */  add.s     $f2, $f2, $f0
-/* CE6BBC 802404BC 24420008 */  addiu     $v0, $v0, 8
-/* CE6BC0 802404C0 44826000 */  mtc1      $v0, $f12
-/* CE6BC4 802404C4 00000000 */  nop
-/* CE6BC8 802404C8 46806320 */  cvt.s.w   $f12, $f12
-/* CE6BCC 802404CC 0C00A6C9 */  jal       clamp_angle
-/* CE6BD0 802404D0 E6220004 */   swc1     $f2, 4($s1)
-/* CE6BD4 802404D4 4600010D */  trunc.w.s $f4, $f0
-/* CE6BD8 802404D8 44022000 */  mfc1      $v0, $f4
-/* CE6BDC 802404DC C6200004 */  lwc1      $f0, 4($s1)
-/* CE6BE0 802404E0 A622004C */  sh        $v0, 0x4c($s1)
-/* CE6BE4 802404E4 C60C0028 */  lwc1      $f12, 0x28($s0)
-/* CE6BE8 802404E8 8E060030 */  lw        $a2, 0x30($s0)
-/* CE6BEC 802404EC 3C0141A0 */  lui       $at, 0x41a0
-/* CE6BF0 802404F0 44817000 */  mtc1      $at, $f14
-/* CE6BF4 802404F4 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CE6BF8 802404F8 C602002C */  lwc1      $f2, 0x2c($s0)
-/* CE6BFC 802404FC C6200008 */  lwc1      $f0, 8($s1)
-/* CE6C00 80240500 E7A00014 */  swc1      $f0, 0x14($sp)
-/* CE6C04 80240504 8E270000 */  lw        $a3, ($s1)
-/* CE6C08 80240508 0C00A7CB */  jal       dist3D
-/* CE6C0C 8024050C 460E1380 */   add.s    $f14, $f2, $f14
-/* CE6C10 80240510 3C0141F0 */  lui       $at, 0x41f0
-/* CE6C14 80240514 44811000 */  mtc1      $at, $f2
-/* CE6C18 80240518 00000000 */  nop
-/* CE6C1C 8024051C 4600103C */  c.lt.s    $f2, $f0
-/* CE6C20 80240520 00000000 */  nop
-/* CE6C24 80240524 45010002 */  bc1t      .L80240530
-/* CE6C28 80240528 24020003 */   addiu    $v0, $zero, 3
-.L8024052C:
-/* CE6C2C 8024052C A622004E */  sh        $v0, 0x4e($s1)
-.L80240530:
-/* CE6C30 80240530 86230048 */  lh        $v1, 0x48($s1)
-/* CE6C34 80240534 24020001 */  addiu     $v0, $zero, 1
-/* CE6C38 80240538 10620005 */  beq       $v1, $v0, .L80240550
-/* CE6C3C 8024053C 24020002 */   addiu    $v0, $zero, 2
-/* CE6C40 80240540 10620008 */  beq       $v1, $v0, .L80240564
-/* CE6C44 80240544 00000000 */   nop
-/* CE6C48 80240548 08090169 */  j         .L802405A4
-/* CE6C4C 8024054C 00000000 */   nop
-.L80240550:
-/* CE6C50 80240550 C620002C */  lwc1      $f0, 0x2c($s1)
-/* CE6C54 80240554 C62C0030 */  lwc1      $f12, 0x30($s1)
-/* CE6C58 80240558 0C00A6C9 */  jal       clamp_angle
-/* CE6C5C 8024055C 460C0300 */   add.s    $f12, $f0, $f12
-/* CE6C60 80240560 E620002C */  swc1      $f0, 0x2c($s1)
-.L80240564:
-/* CE6C64 80240564 8E220054 */  lw        $v0, 0x54($s1)
-/* CE6C68 80240568 C620002C */  lwc1      $f0, 0x2c($s1)
-/* CE6C6C 8024056C 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6C70 80240570 E4400024 */  swc1      $f0, 0x24($v0)
-/* CE6C74 80240574 8E220054 */  lw        $v0, 0x54($s1)
-/* CE6C78 80240578 C6200018 */  lwc1      $f0, 0x18($s1)
-/* CE6C7C 8024057C 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6C80 80240580 E4400004 */  swc1      $f0, 4($v0)
-/* CE6C84 80240584 8E220054 */  lw        $v0, 0x54($s1)
-/* CE6C88 80240588 C6200004 */  lwc1      $f0, 4($s1)
-/* CE6C8C 8024058C 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6C90 80240590 E4400008 */  swc1      $f0, 8($v0)
-/* CE6C94 80240594 8E220054 */  lw        $v0, 0x54($s1)
-/* CE6C98 80240598 C6200020 */  lwc1      $f0, 0x20($s1)
-/* CE6C9C 8024059C 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6CA0 802405A0 E440000C */  swc1      $f0, 0xc($v0)
-.L802405A4:
-/* CE6CA4 802405A4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CE6CA8 802405A8 8FB1001C */  lw        $s1, 0x1c($sp)
-/* CE6CAC 802405AC 8FB00018 */  lw        $s0, 0x18($sp)
-/* CE6CB0 802405B0 0000102D */  daddu     $v0, $zero, $zero
-/* CE6CB4 802405B4 03E00008 */  jr        $ra
-/* CE6CB8 802405B8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802405BC_CE6CBC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802405BC_CE6CBC.s
deleted file mode 100644
index f29b69a2bb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802405BC_CE6CBC.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405BC_CE6CBC
-/* CE6CBC 802405BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CE6CC0 802405C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* CE6CC4 802405C4 0080802D */  daddu     $s0, $a0, $zero
-/* CE6CC8 802405C8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CE6CCC 802405CC 8E02000C */  lw        $v0, 0xc($s0)
-/* CE6CD0 802405D0 0C0B1EAF */  jal       get_variable
-/* CE6CD4 802405D4 8C450000 */   lw       $a1, ($v0)
-/* CE6CD8 802405D8 8E030084 */  lw        $v1, 0x84($s0)
-/* CE6CDC 802405DC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CE6CE0 802405E0 8463004E */  lh        $v1, 0x4e($v1)
-/* CE6CE4 802405E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CE6CE8 802405E8 00621826 */  xor       $v1, $v1, $v0
-/* CE6CEC 802405EC 2C630001 */  sltiu     $v1, $v1, 1
-/* CE6CF0 802405F0 00031040 */  sll       $v0, $v1, 1
-/* CE6CF4 802405F4 03E00008 */  jr        $ra
-/* CE6CF8 802405F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802405FC_CE6CFC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802405FC_CE6CFC.s
deleted file mode 100644
index 67e6c2a950..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802405FC_CE6CFC.s
+++ /dev/null
@@ -1,72 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405FC_CE6CFC
-/* CE6CFC 802405FC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CE6D00 80240600 AFB20020 */  sw        $s2, 0x20($sp)
-/* CE6D04 80240604 0080902D */  daddu     $s2, $a0, $zero
-/* CE6D08 80240608 AFBF0024 */  sw        $ra, 0x24($sp)
-/* CE6D0C 8024060C AFB1001C */  sw        $s1, 0x1c($sp)
-/* CE6D10 80240610 AFB00018 */  sw        $s0, 0x18($sp)
-/* CE6D14 80240614 10A00035 */  beqz      $a1, .L802406EC
-/* CE6D18 80240618 8E51000C */   lw       $s1, 0xc($s2)
-/* CE6D1C 8024061C 0C00AB39 */  jal       heap_malloc
-/* CE6D20 80240620 24040058 */   addiu    $a0, $zero, 0x58
-/* CE6D24 80240624 0040802D */  daddu     $s0, $v0, $zero
-/* CE6D28 80240628 AE500084 */  sw        $s0, 0x84($s2)
-/* CE6D2C 8024062C 8E250000 */  lw        $a1, ($s1)
-/* CE6D30 80240630 26310004 */  addiu     $s1, $s1, 4
-/* CE6D34 80240634 0C0B1EAF */  jal       get_variable
-/* CE6D38 80240638 0240202D */   daddu    $a0, $s2, $zero
-/* CE6D3C 8024063C AE020038 */  sw        $v0, 0x38($s0)
-/* CE6D40 80240640 8E250000 */  lw        $a1, ($s1)
-/* CE6D44 80240644 26310004 */  addiu     $s1, $s1, 4
-/* CE6D48 80240648 0C0B210B */  jal       get_float_variable
-/* CE6D4C 8024064C 0240202D */   daddu    $a0, $s2, $zero
-/* CE6D50 80240650 E6000018 */  swc1      $f0, 0x18($s0)
-/* CE6D54 80240654 8E250000 */  lw        $a1, ($s1)
-/* CE6D58 80240658 26310004 */  addiu     $s1, $s1, 4
-/* CE6D5C 8024065C 0C0B210B */  jal       get_float_variable
-/* CE6D60 80240660 0240202D */   daddu    $a0, $s2, $zero
-/* CE6D64 80240664 E6000024 */  swc1      $f0, 0x24($s0)
-/* CE6D68 80240668 8E250000 */  lw        $a1, ($s1)
-/* CE6D6C 8024066C 26310004 */  addiu     $s1, $s1, 4
-/* CE6D70 80240670 0C0B210B */  jal       get_float_variable
-/* CE6D74 80240674 0240202D */   daddu    $a0, $s2, $zero
-/* CE6D78 80240678 E6000020 */  swc1      $f0, 0x20($s0)
-/* CE6D7C 8024067C 8E250000 */  lw        $a1, ($s1)
-/* CE6D80 80240680 0C0B210B */  jal       get_float_variable
-/* CE6D84 80240684 0240202D */   daddu    $a0, $s2, $zero
-/* CE6D88 80240688 3C013F80 */  lui       $at, 0x3f80
-/* CE6D8C 8024068C 44811000 */  mtc1      $at, $f2
-/* CE6D90 80240690 E6000028 */  swc1      $f0, 0x28($s0)
-/* CE6D94 80240694 AFA00014 */  sw        $zero, 0x14($sp)
-/* CE6D98 80240698 E7A20010 */  swc1      $f2, 0x10($sp)
-/* CE6D9C 8024069C 8E050018 */  lw        $a1, 0x18($s0)
-/* CE6DA0 802406A0 8E060024 */  lw        $a2, 0x24($s0)
-/* CE6DA4 802406A4 8E070020 */  lw        $a3, 0x20($s0)
-/* CE6DA8 802406A8 0C01C9AC */  jal       func_800726B0
-/* CE6DAC 802406AC 24040001 */   addiu    $a0, $zero, 1
-/* CE6DB0 802406B0 AE020054 */  sw        $v0, 0x54($s0)
-/* CE6DB4 802406B4 8C43000C */  lw        $v1, 0xc($v0)
-/* CE6DB8 802406B8 9202003B */  lbu       $v0, 0x3b($s0)
-/* CE6DBC 802406BC A0620034 */  sb        $v0, 0x34($v1)
-/* CE6DC0 802406C0 8E020054 */  lw        $v0, 0x54($s0)
-/* CE6DC4 802406C4 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6DC8 802406C8 AC400020 */  sw        $zero, 0x20($v0)
-/* CE6DCC 802406CC 8E050018 */  lw        $a1, 0x18($s0)
-/* CE6DD0 802406D0 8E060028 */  lw        $a2, 0x28($s0)
-/* CE6DD4 802406D4 8E070020 */  lw        $a3, 0x20($s0)
-/* CE6DD8 802406D8 0C044898 */  jal       create_shadow_type
-/* CE6DDC 802406DC 0000202D */   daddu    $a0, $zero, $zero
-/* CE6DE0 802406E0 AE020040 */  sw        $v0, 0x40($s0)
-/* CE6DE4 802406E4 2402010E */  addiu     $v0, $zero, 0x10e
-/* CE6DE8 802406E8 A602004C */  sh        $v0, 0x4c($s0)
-.L802406EC:
-/* CE6DEC 802406EC 8FBF0024 */  lw        $ra, 0x24($sp)
-/* CE6DF0 802406F0 8FB20020 */  lw        $s2, 0x20($sp)
-/* CE6DF4 802406F4 8FB1001C */  lw        $s1, 0x1c($sp)
-/* CE6DF8 802406F8 8FB00018 */  lw        $s0, 0x18($sp)
-/* CE6DFC 802406FC 24020002 */  addiu     $v0, $zero, 2
-/* CE6E00 80240700 03E00008 */  jr        $ra
-/* CE6E04 80240704 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240708_CE6E08.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240708_CE6E08.s
deleted file mode 100644
index b593e49823..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240708_CE6E08.s
+++ /dev/null
@@ -1,64 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240708_CE6E08
-/* CE6E08 80240708 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CE6E0C 8024070C AFBF0014 */  sw        $ra, 0x14($sp)
-/* CE6E10 80240710 AFB00010 */  sw        $s0, 0x10($sp)
-/* CE6E14 80240714 8C900084 */  lw        $s0, 0x84($a0)
-/* CE6E18 80240718 8602004C */  lh        $v0, 0x4c($s0)
-/* CE6E1C 8024071C 44826000 */  mtc1      $v0, $f12
-/* CE6E20 80240720 00000000 */  nop
-/* CE6E24 80240724 0C00A8BB */  jal       sin_deg
-/* CE6E28 80240728 46806320 */   cvt.s.w  $f12, $f12
-/* CE6E2C 8024072C 3C013F80 */  lui       $at, 0x3f80
-/* CE6E30 80240730 44811000 */  mtc1      $at, $f2
-/* CE6E34 80240734 00000000 */  nop
-/* CE6E38 80240738 46020000 */  add.s     $f0, $f0, $f2
-/* CE6E3C 8024073C 46000000 */  add.s     $f0, $f0, $f0
-/* CE6E40 80240740 C6020024 */  lwc1      $f2, 0x24($s0)
-/* CE6E44 80240744 8602004C */  lh        $v0, 0x4c($s0)
-/* CE6E48 80240748 46001080 */  add.s     $f2, $f2, $f0
-/* CE6E4C 8024074C 24420008 */  addiu     $v0, $v0, 8
-/* CE6E50 80240750 44826000 */  mtc1      $v0, $f12
-/* CE6E54 80240754 00000000 */  nop
-/* CE6E58 80240758 46806320 */  cvt.s.w   $f12, $f12
-/* CE6E5C 8024075C 0C00A6C9 */  jal       clamp_angle
-/* CE6E60 80240760 E6020004 */   swc1     $f2, 4($s0)
-/* CE6E64 80240764 4600010D */  trunc.w.s $f4, $f0
-/* CE6E68 80240768 44022000 */  mfc1      $v0, $f4
-/* CE6E6C 8024076C 00000000 */  nop
-/* CE6E70 80240770 A602004C */  sh        $v0, 0x4c($s0)
-/* CE6E74 80240774 3C028011 */  lui       $v0, %hi(gPlayerStatus)
-/* CE6E78 80240778 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* CE6E7C 8024077C C44C0028 */  lwc1      $f12, 0x28($v0)
-/* CE6E80 80240780 C44E0030 */  lwc1      $f14, 0x30($v0)
-/* CE6E84 80240784 8E060018 */  lw        $a2, 0x18($s0)
-/* CE6E88 80240788 0C00A7B5 */  jal       dist2D
-/* CE6E8C 8024078C 8E070020 */   lw       $a3, 0x20($s0)
-/* CE6E90 80240790 3C0141F0 */  lui       $at, 0x41f0
-/* CE6E94 80240794 44811000 */  mtc1      $at, $f2
-/* CE6E98 80240798 00000000 */  nop
-/* CE6E9C 8024079C 4602003E */  c.le.s    $f0, $f2
-/* CE6EA0 802407A0 00000000 */  nop
-/* CE6EA4 802407A4 45000002 */  bc1f      .L802407B0
-/* CE6EA8 802407A8 24020003 */   addiu    $v0, $zero, 3
-/* CE6EAC 802407AC A602004E */  sh        $v0, 0x4e($s0)
-.L802407B0:
-/* CE6EB0 802407B0 8E020054 */  lw        $v0, 0x54($s0)
-/* CE6EB4 802407B4 C6000018 */  lwc1      $f0, 0x18($s0)
-/* CE6EB8 802407B8 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6EBC 802407BC E4400004 */  swc1      $f0, 4($v0)
-/* CE6EC0 802407C0 8E020054 */  lw        $v0, 0x54($s0)
-/* CE6EC4 802407C4 C6000004 */  lwc1      $f0, 4($s0)
-/* CE6EC8 802407C8 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6ECC 802407CC E4400008 */  swc1      $f0, 8($v0)
-/* CE6ED0 802407D0 8E020054 */  lw        $v0, 0x54($s0)
-/* CE6ED4 802407D4 C6000020 */  lwc1      $f0, 0x20($s0)
-/* CE6ED8 802407D8 8C42000C */  lw        $v0, 0xc($v0)
-/* CE6EDC 802407DC E440000C */  swc1      $f0, 0xc($v0)
-/* CE6EE0 802407E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CE6EE4 802407E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CE6EE8 802407E8 0000102D */  daddu     $v0, $zero, $zero
-/* CE6EEC 802407EC 03E00008 */  jr        $ra
-/* CE6EF0 802407F0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240B00_CE7200.s b/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240B00_CE7200.s
deleted file mode 100644
index 698f1b945d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240B00_CE7200.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B00_CE7200
-/* CE7200 80240B00 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CE7204 80240B04 24040001 */  addiu     $a0, $zero, 1
-/* CE7208 80240B08 0000282D */  daddu     $a1, $zero, $zero
-/* CE720C 80240B0C 00A0302D */  daddu     $a2, $a1, $zero
-/* CE7210 80240B10 00A0382D */  daddu     $a3, $a1, $zero
-/* CE7214 80240B14 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CE7218 80240B18 AFA00010 */  sw        $zero, 0x10($sp)
-/* CE721C 80240B1C 0C01CA54 */  jal       func_80072950
-/* CE7220 80240B20 AFA00014 */   sw       $zero, 0x14($sp)
-/* CE7224 80240B24 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CE7228 80240B28 24020002 */  addiu     $v0, $zero, 2
-/* CE722C 80240B2C 03E00008 */  jr        $ra
-/* CE7230 80240B30 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CE7234 80240B34 00000000 */  nop
-/* CE7238 80240B38 00000000 */  nop
-/* CE723C 80240B3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_22/CEC240/func_80240000_CEC240.s b/ver/us/asm/nonmatchings/world/area_flo/flo_22/CEC240/func_80240000_CEC240.s
deleted file mode 100644
index cf1c64e7a4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_22/CEC240/func_80240000_CEC240.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CEC240
-/* CEC240 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CEC244 80240004 24040001 */  addiu     $a0, $zero, 1
-/* CEC248 80240008 0000282D */  daddu     $a1, $zero, $zero
-/* CEC24C 8024000C 00A0302D */  daddu     $a2, $a1, $zero
-/* CEC250 80240010 00A0382D */  daddu     $a3, $a1, $zero
-/* CEC254 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CEC258 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CEC25C 8024001C 0C01CA54 */  jal       func_80072950
-/* CEC260 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CEC264 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CEC268 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CEC26C 8024002C 03E00008 */  jr        $ra
-/* CEC270 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CEC274 80240034 00000000 */  nop
-/* CEC278 80240038 00000000 */  nop
-/* CEC27C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_22/CEC280/func_80240040_CEC280.s b/ver/us/asm/nonmatchings/world/area_flo/flo_22/CEC280/func_80240040_CEC280.s
deleted file mode 100644
index 129511daa2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_22/CEC280/func_80240040_CEC280.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CEC280
-/* CEC280 80240040 03E00008 */  jr        $ra
-/* CEC284 80240044 24020002 */   addiu    $v0, $zero, 2
-/* CEC288 80240048 00000000 */  nop
-/* CEC28C 8024004C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE260/func_80240000_CEE260.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE260/func_80240000_CEE260.s
deleted file mode 100644
index 0ab655caa2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE260/func_80240000_CEE260.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CEE260
-/* CEE260 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CEE264 80240004 0000202D */  daddu     $a0, $zero, $zero
-/* CEE268 80240008 0080282D */  daddu     $a1, $a0, $zero
-/* CEE26C 8024000C 0080302D */  daddu     $a2, $a0, $zero
-/* CEE270 80240010 0080382D */  daddu     $a3, $a0, $zero
-/* CEE274 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CEE278 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CEE27C 8024001C 0C01CA54 */  jal       func_80072950
-/* CEE280 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CEE284 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CEE288 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CEE28C 8024002C 03E00008 */  jr        $ra
-/* CEE290 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CEE294 80240034 00000000 */  nop
-/* CEE298 80240038 00000000 */  nop
-/* CEE29C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s
deleted file mode 100644
index 892db2be78..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024026C_CEE4CC
-/* CEE4CC 8024026C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CEE4D0 80240270 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CEE4D4 80240274 10A00003 */  beqz      $a1, .L80240284
-/* CEE4D8 80240278 8C86000C */   lw       $a2, 0xc($a0)
-/* CEE4DC 8024027C 3C018024 */  lui       $at, %hi(D_8024130C_CEF56C)
-/* CEE4E0 80240280 AC20130C */  sw        $zero, %lo(D_8024130C_CEF56C)($at)
-.L80240284:
-/* CEE4E4 80240284 3C038024 */  lui       $v1, %hi(D_8024130C_CEF56C)
-/* CEE4E8 80240288 2463130C */  addiu     $v1, $v1, %lo(D_8024130C_CEF56C)
-/* CEE4EC 8024028C 8C620000 */  lw        $v0, ($v1)
-/* CEE4F0 80240290 54400003 */  bnel      $v0, $zero, .L802402A0
-/* CEE4F4 80240294 AC600000 */   sw       $zero, ($v1)
-/* CEE4F8 80240298 080900AD */  j         .L802402B4
-/* CEE4FC 8024029C 0000102D */   daddu    $v0, $zero, $zero
-.L802402A0:
-/* CEE500 802402A0 8CC50000 */  lw        $a1, ($a2)
-/* CEE504 802402A4 3C068024 */  lui       $a2, %hi(D_80241310_CEF570)
-/* CEE508 802402A8 0C0B2026 */  jal       set_variable
-/* CEE50C 802402AC 8CC61310 */   lw       $a2, %lo(D_80241310_CEF570)($a2)
-/* CEE510 802402B0 24020002 */  addiu     $v0, $zero, 2
-.L802402B4:
-/* CEE514 802402B4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CEE518 802402B8 03E00008 */  jr        $ra
-/* CEE51C 802402BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s
deleted file mode 100644
index bcae17dde4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402C0_CEE520
-/* CEE520 802402C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CEE524 802402C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CEE528 802402C8 8C82000C */  lw        $v0, 0xc($a0)
-/* CEE52C 802402CC 0C0B1EAF */  jal       get_variable
-/* CEE530 802402D0 8C450000 */   lw       $a1, ($v0)
-/* CEE534 802402D4 3C018024 */  lui       $at, %hi(D_80241310_CEF570)
-/* CEE538 802402D8 AC221310 */  sw        $v0, %lo(D_80241310_CEF570)($at)
-/* CEE53C 802402DC 24020002 */  addiu     $v0, $zero, 2
-/* CEE540 802402E0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CEE544 802402E4 24030001 */  addiu     $v1, $zero, 1
-/* CEE548 802402E8 3C018024 */  lui       $at, %hi(D_8024130C_CEF56C)
-/* CEE54C 802402EC AC23130C */  sw        $v1, %lo(D_8024130C_CEF56C)($at)
-/* CEE550 802402F0 03E00008 */  jr        $ra
-/* CEE554 802402F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s
deleted file mode 100644
index 3237bf2aea..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402F8_CEE558
-/* CEE558 802402F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CEE55C 802402FC AFBF0010 */  sw        $ra, 0x10($sp)
-/* CEE560 80240300 8C82000C */  lw        $v0, 0xc($a0)
-/* CEE564 80240304 0C0B1EAF */  jal       get_variable
-/* CEE568 80240308 8C450000 */   lw       $a1, ($v0)
-/* CEE56C 8024030C 0040182D */  daddu     $v1, $v0, $zero
-/* CEE570 80240310 10600012 */  beqz      $v1, .L8024035C
-/* CEE574 80240314 0000202D */   daddu    $a0, $zero, $zero
-/* CEE578 80240318 8C620000 */  lw        $v0, ($v1)
-/* CEE57C 8024031C 5040000A */  beql      $v0, $zero, .L80240348
-/* CEE580 80240320 00041080 */   sll      $v0, $a0, 2
-/* CEE584 80240324 3C058024 */  lui       $a1, %hi(jan_02_foliage_setup_shear_mtx)
-/* CEE588 80240328 24A526E0 */  addiu     $a1, $a1, %lo(jan_02_foliage_setup_shear_mtx)
-.L8024032C:
-/* CEE58C 8024032C 24630004 */  addiu     $v1, $v1, 4
-/* CEE590 80240330 24840001 */  addiu     $a0, $a0, 1
-/* CEE594 80240334 ACA20000 */  sw        $v0, ($a1)
-/* CEE598 80240338 8C620000 */  lw        $v0, ($v1)
-/* CEE59C 8024033C 1440FFFB */  bnez      $v0, .L8024032C
-/* CEE5A0 80240340 24A50004 */   addiu    $a1, $a1, 4
-/* CEE5A4 80240344 00041080 */  sll       $v0, $a0, 2
-.L80240348:
-/* CEE5A8 80240348 3C018024 */  lui       $at, %hi(jan_02_foliage_setup_shear_mtx)
-/* CEE5AC 8024034C 00220821 */  addu      $at, $at, $v0
-/* CEE5B0 80240350 AC2026E0 */  sw        $zero, %lo(jan_02_foliage_setup_shear_mtx)($at)
-/* CEE5B4 80240354 080900E1 */  j         .L80240384
-/* CEE5B8 80240358 00000000 */   nop
-.L8024035C:
-/* CEE5BC 8024035C 3C038024 */  lui       $v1, %hi(jan_02_foliage_setup_shear_mtx)
-/* CEE5C0 80240360 246326E0 */  addiu     $v1, $v1, %lo(jan_02_foliage_setup_shear_mtx)
-/* CEE5C4 80240364 0060282D */  daddu     $a1, $v1, $zero
-.L80240368:
-/* CEE5C8 80240368 24820080 */  addiu     $v0, $a0, 0x80
-/* CEE5CC 8024036C AC620000 */  sw        $v0, ($v1)
-/* CEE5D0 80240370 24630004 */  addiu     $v1, $v1, 4
-/* CEE5D4 80240374 24840001 */  addiu     $a0, $a0, 1
-/* CEE5D8 80240378 2882005B */  slti      $v0, $a0, 0x5b
-/* CEE5DC 8024037C 1440FFFA */  bnez      $v0, .L80240368
-/* CEE5E0 80240380 ACA0016C */   sw       $zero, 0x16c($a1)
-.L80240384:
-/* CEE5E4 80240384 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CEE5E8 80240388 24020002 */  addiu     $v0, $zero, 2
-/* CEE5EC 8024038C 03E00008 */  jr        $ra
-/* CEE5F0 80240390 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s
deleted file mode 100644
index 216ac18e18..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s
+++ /dev/null
@@ -1,86 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240410_CEE670
-/* CEE670 80240410 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CEE674 80240414 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CEE678 80240418 0080982D */  daddu     $s3, $a0, $zero
-/* CEE67C 8024041C AFBF0020 */  sw        $ra, 0x20($sp)
-/* CEE680 80240420 AFB20018 */  sw        $s2, 0x18($sp)
-/* CEE684 80240424 AFB10014 */  sw        $s1, 0x14($sp)
-/* CEE688 80240428 AFB00010 */  sw        $s0, 0x10($sp)
-/* CEE68C 8024042C 8E710148 */  lw        $s1, 0x148($s3)
-/* CEE690 80240430 86240008 */  lh        $a0, 8($s1)
-/* CEE694 80240434 0C00EABB */  jal       get_npc_unsafe
-/* CEE698 80240438 00A0902D */   daddu    $s2, $a1, $zero
-/* CEE69C 8024043C 0040802D */  daddu     $s0, $v0, $zero
-/* CEE6A0 80240440 8602008E */  lh        $v0, 0x8e($s0)
-/* CEE6A4 80240444 9603008E */  lhu       $v1, 0x8e($s0)
-/* CEE6A8 80240448 18400005 */  blez      $v0, .L80240460
-/* CEE6AC 8024044C 2462FFFF */   addiu    $v0, $v1, -1
-/* CEE6B0 80240450 A602008E */  sh        $v0, 0x8e($s0)
-/* CEE6B4 80240454 00021400 */  sll       $v0, $v0, 0x10
-/* CEE6B8 80240458 1C400033 */  bgtz      $v0, .L80240528
-/* CEE6BC 8024045C 00000000 */   nop
-.L80240460:
-/* CEE6C0 80240460 8602008C */  lh        $v0, 0x8c($s0)
-/* CEE6C4 80240464 14400030 */  bnez      $v0, .L80240528
-/* CEE6C8 80240468 00000000 */   nop
-/* CEE6CC 8024046C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CEE6D0 80240470 8C420024 */  lw        $v0, 0x24($v0)
-/* CEE6D4 80240474 AE020028 */  sw        $v0, 0x28($s0)
-/* CEE6D8 80240478 C6400018 */  lwc1      $f0, 0x18($s2)
-/* CEE6DC 8024047C E6000018 */  swc1      $f0, 0x18($s0)
-/* CEE6E0 80240480 8E230088 */  lw        $v1, 0x88($s1)
-/* CEE6E4 80240484 24020005 */  addiu     $v0, $zero, 5
-/* CEE6E8 80240488 10620005 */  beq       $v1, $v0, .L802404A0
-/* CEE6EC 8024048C 00000000 */   nop
-/* CEE6F0 80240490 10600003 */  beqz      $v1, .L802404A0
-/* CEE6F4 80240494 24020001 */   addiu    $v0, $zero, 1
-/* CEE6F8 80240498 14620006 */  bne       $v1, $v0, .L802404B4
-/* CEE6FC 8024049C 00000000 */   nop
-.L802404A0:
-/* CEE700 802404A0 8E220084 */  lw        $v0, 0x84($s1)
-/* CEE704 802404A4 00021FC2 */  srl       $v1, $v0, 0x1f
-/* CEE708 802404A8 00431021 */  addu      $v0, $v0, $v1
-/* CEE70C 802404AC 00021043 */  sra       $v0, $v0, 1
-/* CEE710 802404B0 A60200A8 */  sh        $v0, 0xa8($s0)
-.L802404B4:
-/* CEE714 802404B4 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CEE718 802404B8 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CEE71C 802404BC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CEE720 802404C0 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CEE724 802404C4 8C460028 */  lw        $a2, 0x28($v0)
-/* CEE728 802404C8 0C00A7B5 */  jal       dist2D
-/* CEE72C 802404CC 8C470030 */   lw       $a3, 0x30($v0)
-/* CEE730 802404D0 C6020018 */  lwc1      $f2, 0x18($s0)
-/* CEE734 802404D4 46020003 */  div.s     $f0, $f0, $f2
-/* CEE738 802404D8 3C018024 */  lui       $at, %hi(D_80242680_CF08E0)
-/* CEE73C 802404DC D4222680 */  ldc1      $f2, %lo(D_80242680_CF08E0)($at)
-/* CEE740 802404E0 46000021 */  cvt.d.s   $f0, $f0
-/* CEE744 802404E4 46220000 */  add.d     $f0, $f0, $f2
-/* CEE748 802404E8 4620010D */  trunc.w.d $f4, $f0
-/* CEE74C 802404EC 44022000 */  mfc1      $v0, $f4
-/* CEE750 802404F0 00000000 */  nop
-/* CEE754 802404F4 A602008E */  sh        $v0, 0x8e($s0)
-/* CEE758 802404F8 00021400 */  sll       $v0, $v0, 0x10
-/* CEE75C 802404FC 8E230078 */  lw        $v1, 0x78($s1)
-/* CEE760 80240500 00021403 */  sra       $v0, $v0, 0x10
-/* CEE764 80240504 0043102A */  slt       $v0, $v0, $v1
-/* CEE768 80240508 10400003 */  beqz      $v0, .L80240518
-/* CEE76C 8024050C 00000000 */   nop
-/* CEE770 80240510 9622007A */  lhu       $v0, 0x7a($s1)
-/* CEE774 80240514 A602008E */  sh        $v0, 0x8e($s0)
-.L80240518:
-/* CEE778 80240518 8602008E */  lh        $v0, 0x8e($s0)
-/* CEE77C 8024051C AE22007C */  sw        $v0, 0x7c($s1)
-/* CEE780 80240520 2402000E */  addiu     $v0, $zero, 0xe
-/* CEE784 80240524 AE620070 */  sw        $v0, 0x70($s3)
-.L80240528:
-/* CEE788 80240528 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CEE78C 8024052C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CEE790 80240530 8FB20018 */  lw        $s2, 0x18($sp)
-/* CEE794 80240534 8FB10014 */  lw        $s1, 0x14($sp)
-/* CEE798 80240538 8FB00010 */  lw        $s0, 0x10($sp)
-/* CEE79C 8024053C 03E00008 */  jr        $ra
-/* CEE7A0 80240540 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s
deleted file mode 100644
index deff11a31a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s
+++ /dev/null
@@ -1,302 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240728_CEE988
-/* CEE988 80240728 27BDFF90 */  addiu     $sp, $sp, -0x70
-/* CEE98C 8024072C AFB3005C */  sw        $s3, 0x5c($sp)
-/* CEE990 80240730 0080982D */  daddu     $s3, $a0, $zero
-/* CEE994 80240734 AFBF0068 */  sw        $ra, 0x68($sp)
-/* CEE998 80240738 AFB50064 */  sw        $s5, 0x64($sp)
-/* CEE99C 8024073C AFB40060 */  sw        $s4, 0x60($sp)
-/* CEE9A0 80240740 AFB20058 */  sw        $s2, 0x58($sp)
-/* CEE9A4 80240744 AFB10054 */  sw        $s1, 0x54($sp)
-/* CEE9A8 80240748 AFB00050 */  sw        $s0, 0x50($sp)
-/* CEE9AC 8024074C 8E710148 */  lw        $s1, 0x148($s3)
-/* CEE9B0 80240750 86240008 */  lh        $a0, 8($s1)
-/* CEE9B4 80240754 0C00EABB */  jal       get_npc_unsafe
-/* CEE9B8 80240758 00A0802D */   daddu    $s0, $a1, $zero
-/* CEE9BC 8024075C 8E63000C */  lw        $v1, 0xc($s3)
-/* CEE9C0 80240760 0260202D */  daddu     $a0, $s3, $zero
-/* CEE9C4 80240764 8C650000 */  lw        $a1, ($v1)
-/* CEE9C8 80240768 0C0B1EAF */  jal       get_variable
-/* CEE9CC 8024076C 0040902D */   daddu    $s2, $v0, $zero
-/* CEE9D0 80240770 AFA00028 */  sw        $zero, 0x28($sp)
-/* CEE9D4 80240774 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CEE9D8 80240778 8C630030 */  lw        $v1, 0x30($v1)
-/* CEE9DC 8024077C AFA3002C */  sw        $v1, 0x2c($sp)
-/* CEE9E0 80240780 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CEE9E4 80240784 8C63001C */  lw        $v1, 0x1c($v1)
-/* CEE9E8 80240788 AFA30030 */  sw        $v1, 0x30($sp)
-/* CEE9EC 8024078C 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CEE9F0 80240790 8C630024 */  lw        $v1, 0x24($v1)
-/* CEE9F4 80240794 AFA30034 */  sw        $v1, 0x34($sp)
-/* CEE9F8 80240798 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CEE9FC 8024079C 8C630028 */  lw        $v1, 0x28($v1)
-/* CEEA00 802407A0 27B50028 */  addiu     $s5, $sp, 0x28
-/* CEEA04 802407A4 AFA30038 */  sw        $v1, 0x38($sp)
-/* CEEA08 802407A8 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CEEA0C 802407AC 3C0142C8 */  lui       $at, 0x42c8
-/* CEEA10 802407B0 44810000 */  mtc1      $at, $f0
-/* CEEA14 802407B4 8C63002C */  lw        $v1, 0x2c($v1)
-/* CEEA18 802407B8 0040A02D */  daddu     $s4, $v0, $zero
-/* CEEA1C 802407BC E7A00040 */  swc1      $f0, 0x40($sp)
-/* CEEA20 802407C0 A7A00044 */  sh        $zero, 0x44($sp)
-/* CEEA24 802407C4 12000009 */  beqz      $s0, .L802407EC
-/* CEEA28 802407C8 AFA3003C */   sw       $v1, 0x3c($sp)
-/* CEEA2C 802407CC 864300A8 */  lh        $v1, 0xa8($s2)
-/* CEEA30 802407D0 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CEEA34 802407D4 AE20008C */  sw        $zero, 0x8c($s1)
-/* CEEA38 802407D8 A22000B5 */  sb        $zero, 0xb5($s1)
-/* CEEA3C 802407DC 34420008 */  ori       $v0, $v0, 8
-/* CEEA40 802407E0 AE230084 */  sw        $v1, 0x84($s1)
-/* CEEA44 802407E4 080901FF */  j         .L802407FC
-/* CEEA48 802407E8 AE2200B0 */   sw       $v0, 0xb0($s1)
-.L802407EC:
-/* CEEA4C 802407EC 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CEEA50 802407F0 30420004 */  andi      $v0, $v0, 4
-/* CEEA54 802407F4 10400047 */  beqz      $v0, .L80240914
-/* CEEA58 802407F8 00000000 */   nop
-.L802407FC:
-/* CEEA5C 802407FC AE600070 */  sw        $zero, 0x70($s3)
-/* CEEA60 80240800 A640008E */  sh        $zero, 0x8e($s2)
-/* CEEA64 80240804 8E2300CC */  lw        $v1, 0xcc($s1)
-/* CEEA68 80240808 2404F7FF */  addiu     $a0, $zero, -0x801
-/* CEEA6C 8024080C A2200007 */  sb        $zero, 7($s1)
-/* CEEA70 80240810 8E420000 */  lw        $v0, ($s2)
-/* CEEA74 80240814 8C630000 */  lw        $v1, ($v1)
-/* CEEA78 80240818 00441024 */  and       $v0, $v0, $a0
-/* CEEA7C 8024081C AE420000 */  sw        $v0, ($s2)
-/* CEEA80 80240820 AE430028 */  sw        $v1, 0x28($s2)
-/* CEEA84 80240824 96220086 */  lhu       $v0, 0x86($s1)
-/* CEEA88 80240828 A64200A8 */  sh        $v0, 0xa8($s2)
-/* CEEA8C 8024082C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CEEA90 80240830 AE200090 */  sw        $zero, 0x90($s1)
-/* CEEA94 80240834 8C420034 */  lw        $v0, 0x34($v0)
-/* CEEA98 80240838 14400006 */  bnez      $v0, .L80240854
-/* CEEA9C 8024083C 2403FDFF */   addiu    $v1, $zero, -0x201
-/* CEEAA0 80240840 8E420000 */  lw        $v0, ($s2)
-/* CEEAA4 80240844 2403FFF7 */  addiu     $v1, $zero, -9
-/* CEEAA8 80240848 34420200 */  ori       $v0, $v0, 0x200
-/* CEEAAC 8024084C 08090218 */  j         .L80240860
-/* CEEAB0 80240850 00431024 */   and      $v0, $v0, $v1
-.L80240854:
-/* CEEAB4 80240854 8E420000 */  lw        $v0, ($s2)
-/* CEEAB8 80240858 00431024 */  and       $v0, $v0, $v1
-/* CEEABC 8024085C 34420008 */  ori       $v0, $v0, 8
-.L80240860:
-/* CEEAC0 80240860 AE420000 */  sw        $v0, ($s2)
-/* CEEAC4 80240864 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CEEAC8 80240868 30420004 */  andi      $v0, $v0, 4
-/* CEEACC 8024086C 1040001E */  beqz      $v0, .L802408E8
-/* CEEAD0 80240870 24040002 */   addiu    $a0, $zero, 2
-/* CEEAD4 80240874 0240282D */  daddu     $a1, $s2, $zero
-/* CEEAD8 80240878 0000302D */  daddu     $a2, $zero, $zero
-/* CEEADC 8024087C 24020063 */  addiu     $v0, $zero, 0x63
-/* CEEAE0 80240880 AE620070 */  sw        $v0, 0x70($s3)
-/* CEEAE4 80240884 AE600074 */  sw        $zero, 0x74($s3)
-/* CEEAE8 80240888 864300A8 */  lh        $v1, 0xa8($s2)
-/* CEEAEC 8024088C 3C013F80 */  lui       $at, 0x3f80
-/* CEEAF0 80240890 44810000 */  mtc1      $at, $f0
-/* CEEAF4 80240894 3C014000 */  lui       $at, 0x4000
-/* CEEAF8 80240898 44811000 */  mtc1      $at, $f2
-/* CEEAFC 8024089C 3C01C1A0 */  lui       $at, 0xc1a0
-/* CEEB00 802408A0 44812000 */  mtc1      $at, $f4
-/* CEEB04 802408A4 24020028 */  addiu     $v0, $zero, 0x28
-/* CEEB08 802408A8 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CEEB0C 802408AC 44833000 */  mtc1      $v1, $f6
-/* CEEB10 802408B0 00000000 */  nop
-/* CEEB14 802408B4 468031A0 */  cvt.s.w   $f6, $f6
-/* CEEB18 802408B8 44073000 */  mfc1      $a3, $f6
-/* CEEB1C 802408BC 27A20048 */  addiu     $v0, $sp, 0x48
-/* CEEB20 802408C0 AFA20020 */  sw        $v0, 0x20($sp)
-/* CEEB24 802408C4 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CEEB28 802408C8 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CEEB2C 802408CC 0C01BFA4 */  jal       fx_emote
-/* CEEB30 802408D0 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CEEB34 802408D4 8E2200B0 */  lw        $v0, 0xb0($s1)
-/* CEEB38 802408D8 2403FFFB */  addiu     $v1, $zero, -5
-/* CEEB3C 802408DC 00431024 */  and       $v0, $v0, $v1
-/* CEEB40 802408E0 08090245 */  j         .L80240914
-/* CEEB44 802408E4 AE2200B0 */   sw       $v0, 0xb0($s1)
-.L802408E8:
-/* CEEB48 802408E8 8E220000 */  lw        $v0, ($s1)
-/* CEEB4C 802408EC 3C034000 */  lui       $v1, 0x4000
-/* CEEB50 802408F0 00431024 */  and       $v0, $v0, $v1
-/* CEEB54 802408F4 10400007 */  beqz      $v0, .L80240914
-/* CEEB58 802408F8 3C03BFFF */   lui      $v1, 0xbfff
-/* CEEB5C 802408FC 2402000C */  addiu     $v0, $zero, 0xc
-/* CEEB60 80240900 AE620070 */  sw        $v0, 0x70($s3)
-/* CEEB64 80240904 8E220000 */  lw        $v0, ($s1)
-/* CEEB68 80240908 3463FFFF */  ori       $v1, $v1, 0xffff
-/* CEEB6C 8024090C 00431024 */  and       $v0, $v0, $v1
-/* CEEB70 80240910 AE220000 */  sw        $v0, ($s1)
-.L80240914:
-/* CEEB74 80240914 8E220090 */  lw        $v0, 0x90($s1)
-/* CEEB78 80240918 1840000C */  blez      $v0, .L8024094C
-/* CEEB7C 8024091C 2442FFFF */   addiu    $v0, $v0, -1
-/* CEEB80 80240920 14400087 */  bnez      $v0, L80240B40_CEEDA0
-/* CEEB84 80240924 AE220090 */   sw       $v0, 0x90($s1)
-/* CEEB88 80240928 3C03FFAA */  lui       $v1, 0xffaa
-/* CEEB8C 8024092C 8E420028 */  lw        $v0, 0x28($s2)
-/* CEEB90 80240930 3463FFD2 */  ori       $v1, $v1, 0xffd2
-/* CEEB94 80240934 00431021 */  addu      $v0, $v0, $v1
-/* CEEB98 80240938 2C420002 */  sltiu     $v0, $v0, 2
-/* CEEB9C 8024093C 10400003 */  beqz      $v0, .L8024094C
-/* CEEBA0 80240940 3C020055 */   lui      $v0, 0x55
-/* CEEBA4 80240944 3442000C */  ori       $v0, $v0, 0xc
-/* CEEBA8 80240948 AE420028 */  sw        $v0, 0x28($s2)
-.L8024094C:
-/* CEEBAC 8024094C 8E630070 */  lw        $v1, 0x70($s3)
-/* CEEBB0 80240950 2402000C */  addiu     $v0, $zero, 0xc
-/* CEEBB4 80240954 10620048 */  beq       $v1, $v0, .L80240A78
-/* CEEBB8 80240958 2862000D */   slti     $v0, $v1, 0xd
-/* CEEBBC 8024095C 1040000F */  beqz      $v0, .L8024099C
-/* CEEBC0 80240960 24100001 */   addiu    $s0, $zero, 1
-/* CEEBC4 80240964 1070001E */  beq       $v1, $s0, .L802409E0
-/* CEEBC8 80240968 28620002 */   slti     $v0, $v1, 2
-/* CEEBCC 8024096C 10400005 */  beqz      $v0, .L80240984
-/* CEEBD0 80240970 24020002 */   addiu    $v0, $zero, 2
-/* CEEBD4 80240974 10600015 */  beqz      $v1, .L802409CC
-/* CEEBD8 80240978 0260202D */   daddu    $a0, $s3, $zero
-/* CEEBDC 8024097C 080902B5 */  j         .L80240AD4
-/* CEEBE0 80240980 00000000 */   nop
-.L80240984:
-/* CEEBE4 80240984 1062001C */  beq       $v1, $v0, .L802409F8
-/* CEEBE8 80240988 24020003 */   addiu    $v0, $zero, 3
-/* CEEBEC 8024098C 10620035 */  beq       $v1, $v0, .L80240A64
-/* CEEBF0 80240990 0260202D */   daddu    $a0, $s3, $zero
-/* CEEBF4 80240994 080902B5 */  j         .L80240AD4
-/* CEEBF8 80240998 00000000 */   nop
-.L8024099C:
-/* CEEBFC 8024099C 2402000E */  addiu     $v0, $zero, 0xe
-/* CEEC00 802409A0 1062003F */  beq       $v1, $v0, .L80240AA0
-/* CEEC04 802409A4 0062102A */   slt      $v0, $v1, $v0
-/* CEEC08 802409A8 14400038 */  bnez      $v0, .L80240A8C
-/* CEEC0C 802409AC 0260202D */   daddu    $a0, $s3, $zero
-/* CEEC10 802409B0 2402000F */  addiu     $v0, $zero, 0xf
-/* CEEC14 802409B4 10620040 */  beq       $v1, $v0, .L80240AB8
-/* CEEC18 802409B8 24020063 */   addiu    $v0, $zero, 0x63
-/* CEEC1C 802409BC 10620043 */  beq       $v1, $v0, .L80240ACC
-/* CEEC20 802409C0 00000000 */   nop
-/* CEEC24 802409C4 080902B5 */  j         .L80240AD4
-/* CEEC28 802409C8 00000000 */   nop
-.L802409CC:
-/* CEEC2C 802409CC 0280282D */  daddu     $a1, $s4, $zero
-/* CEEC30 802409D0 0C012568 */  jal       func_800495A0
-/* CEEC34 802409D4 02A0302D */   daddu    $a2, $s5, $zero
-/* CEEC38 802409D8 96220086 */  lhu       $v0, 0x86($s1)
-/* CEEC3C 802409DC A64200A8 */  sh        $v0, 0xa8($s2)
-.L802409E0:
-/* CEEC40 802409E0 0260202D */  daddu     $a0, $s3, $zero
-/* CEEC44 802409E4 0280282D */  daddu     $a1, $s4, $zero
-/* CEEC48 802409E8 0C0125AE */  jal       func_800496B8
-/* CEEC4C 802409EC 02A0302D */   daddu    $a2, $s5, $zero
-/* CEEC50 802409F0 080902B5 */  j         .L80240AD4
-/* CEEC54 802409F4 00000000 */   nop
-.L802409F8:
-/* CEEC58 802409F8 0260202D */  daddu     $a0, $s3, $zero
-/* CEEC5C 802409FC 0280282D */  daddu     $a1, $s4, $zero
-/* CEEC60 80240A00 0C0126D1 */  jal       base_UnkNpcAIFunc1
-/* CEEC64 80240A04 02A0302D */   daddu    $a2, $s5, $zero
-/* CEEC68 80240A08 8E230088 */  lw        $v1, 0x88($s1)
-/* CEEC6C 80240A0C 24020006 */  addiu     $v0, $zero, 6
-/* CEEC70 80240A10 14620014 */  bne       $v1, $v0, .L80240A64
-/* CEEC74 80240A14 0260202D */   daddu    $a0, $s3, $zero
-/* CEEC78 80240A18 0C00A67F */  jal       rand_int
-/* CEEC7C 80240A1C 24040064 */   addiu    $a0, $zero, 0x64
-/* CEEC80 80240A20 28420021 */  slti      $v0, $v0, 0x21
-/* CEEC84 80240A24 5040000F */  beql      $v0, $zero, .L80240A64
-/* CEEC88 80240A28 0260202D */   daddu    $a0, $s3, $zero
-/* CEEC8C 80240A2C 8E22008C */  lw        $v0, 0x8c($s1)
-/* CEEC90 80240A30 10400005 */  beqz      $v0, .L80240A48
-/* CEEC94 80240A34 3C020055 */   lui      $v0, 0x55
-/* CEEC98 80240A38 3442002F */  ori       $v0, $v0, 0x2f
-/* CEEC9C 80240A3C AE20008C */  sw        $zero, 0x8c($s1)
-/* CEECA0 80240A40 08090295 */  j         .L80240A54
-/* CEECA4 80240A44 A22000B5 */   sb       $zero, 0xb5($s1)
-.L80240A48:
-/* CEECA8 80240A48 3442002E */  ori       $v0, $v0, 0x2e
-/* CEECAC 80240A4C AE30008C */  sw        $s0, 0x8c($s1)
-/* CEECB0 80240A50 A23000B5 */  sb        $s0, 0xb5($s1)
-.L80240A54:
-/* CEECB4 80240A54 AE420028 */  sw        $v0, 0x28($s2)
-/* CEECB8 80240A58 24020007 */  addiu     $v0, $zero, 7
-/* CEECBC 80240A5C 080902D0 */  j         L80240B40_CEEDA0
-/* CEECC0 80240A60 AE220090 */   sw       $v0, 0x90($s1)
-.L80240A64:
-/* CEECC4 80240A64 0280282D */  daddu     $a1, $s4, $zero
-/* CEECC8 80240A68 0C012701 */  jal       func_80049C04
-/* CEECCC 80240A6C 02A0302D */   daddu    $a2, $s5, $zero
-/* CEECD0 80240A70 080902B5 */  j         .L80240AD4
-/* CEECD4 80240A74 00000000 */   nop
-.L80240A78:
-/* CEECD8 80240A78 0260202D */  daddu     $a0, $s3, $zero
-/* CEECDC 80240A7C 0280282D */  daddu     $a1, $s4, $zero
-/* CEECE0 80240A80 0C0900E5 */  jal       flo_23_set_script_owner_npc_anim
-/* CEECE4 80240A84 02A0302D */   daddu    $a2, $s5, $zero
-/* CEECE8 80240A88 0260202D */  daddu     $a0, $s3, $zero
-.L80240A8C:
-/* CEECEC 80240A8C 0280282D */  daddu     $a1, $s4, $zero
-/* CEECF0 80240A90 0C090104 */  jal       func_80240410_CEE670
-/* CEECF4 80240A94 02A0302D */   daddu    $a2, $s5, $zero
-/* CEECF8 80240A98 080902B5 */  j         .L80240AD4
-/* CEECFC 80240A9C 00000000 */   nop
-.L80240AA0:
-/* CEED00 80240AA0 0260202D */  daddu     $a0, $s3, $zero
-/* CEED04 80240AA4 0280282D */  daddu     $a1, $s4, $zero
-/* CEED08 80240AA8 0C090151 */  jal       flo_23_UnkNpcAIFunc12
-/* CEED0C 80240AAC 02A0302D */   daddu    $a2, $s5, $zero
-/* CEED10 80240AB0 080902B5 */  j         .L80240AD4
-/* CEED14 80240AB4 00000000 */   nop
-.L80240AB8:
-/* CEED18 80240AB8 0280282D */  daddu     $a1, $s4, $zero
-/* CEED1C 80240ABC 0C0901AA */  jal       flo_23_set_script_owner_npc_col_height
-/* CEED20 80240AC0 02A0302D */   daddu    $a2, $s5, $zero
-/* CEED24 80240AC4 080902B5 */  j         .L80240AD4
-/* CEED28 80240AC8 00000000 */   nop
-.L80240ACC:
-/* CEED2C 80240ACC 0C0129CF */  jal       func_8004A73C
-/* CEED30 80240AD0 0260202D */   daddu    $a0, $s3, $zero
-.L80240AD4:
-/* CEED34 80240AD4 8E230088 */  lw        $v1, 0x88($s1)
-/* CEED38 80240AD8 24020006 */  addiu     $v0, $zero, 6
-/* CEED3C 80240ADC 14620019 */  bne       $v1, $v0, .L80240B44
-/* CEED40 80240AE0 0000102D */   daddu    $v0, $zero, $zero
-/* CEED44 80240AE4 8E22008C */  lw        $v0, 0x8c($s1)
-/* CEED48 80240AE8 10400003 */  beqz      $v0, .L80240AF8
-/* CEED4C 80240AEC 24020001 */   addiu    $v0, $zero, 1
-/* CEED50 80240AF0 080902BF */  j         .L80240AFC
-/* CEED54 80240AF4 A22200B5 */   sb       $v0, 0xb5($s1)
-.L80240AF8:
-/* CEED58 80240AF8 A22000B5 */  sb        $zero, 0xb5($s1)
-.L80240AFC:
-/* CEED5C 80240AFC 8E22008C */  lw        $v0, 0x8c($s1)
-/* CEED60 80240B00 1040000F */  beqz      $v0, L80240B40_CEEDA0
-/* CEED64 80240B04 3C03FFAA */   lui      $v1, 0xffaa
-/* CEED68 80240B08 8E420028 */  lw        $v0, 0x28($s2)
-/* CEED6C 80240B0C 3463FFFC */  ori       $v1, $v1, 0xfffc
-/* CEED70 80240B10 00431821 */  addu      $v1, $v0, $v1
-/* CEED74 80240B14 2C620015 */  sltiu     $v0, $v1, 0x15
-/* CEED78 80240B18 10400009 */  beqz      $v0, L80240B40_CEEDA0
-/* CEED7C 80240B1C 00031080 */   sll      $v0, $v1, 2
-/* CEED80 80240B20 3C018024 */  lui       $at, %hi(jtbl_80242688_CF08E8)
-/* CEED84 80240B24 00220821 */  addu      $at, $at, $v0
-/* CEED88 80240B28 8C222688 */  lw        $v0, %lo(jtbl_80242688_CF08E8)($at)
-/* CEED8C 80240B2C 00400008 */  jr        $v0
-/* CEED90 80240B30 00000000 */   nop
-glabel L80240B34_CEED94
-/* CEED94 80240B34 8E420028 */  lw        $v0, 0x28($s2)
-/* CEED98 80240B38 24420001 */  addiu     $v0, $v0, 1
-/* CEED9C 80240B3C AE420028 */  sw        $v0, 0x28($s2)
-glabel L80240B40_CEEDA0
-/* CEEDA0 80240B40 0000102D */  daddu     $v0, $zero, $zero
-.L80240B44:
-/* CEEDA4 80240B44 8FBF0068 */  lw        $ra, 0x68($sp)
-/* CEEDA8 80240B48 8FB50064 */  lw        $s5, 0x64($sp)
-/* CEEDAC 80240B4C 8FB40060 */  lw        $s4, 0x60($sp)
-/* CEEDB0 80240B50 8FB3005C */  lw        $s3, 0x5c($sp)
-/* CEEDB4 80240B54 8FB20058 */  lw        $s2, 0x58($sp)
-/* CEEDB8 80240B58 8FB10054 */  lw        $s1, 0x54($sp)
-/* CEEDBC 80240B5C 8FB00050 */  lw        $s0, 0x50($sp)
-/* CEEDC0 80240B60 03E00008 */  jr        $ra
-/* CEEDC4 80240B64 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240B68_CEEDC8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240B68_CEEDC8.s
deleted file mode 100644
index 0b26cd2b6b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240B68_CEEDC8.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B68_CEEDC8
-/* CEEDC8 80240B68 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CEEDCC 80240B6C AFB10014 */  sw        $s1, 0x14($sp)
-/* CEEDD0 80240B70 0080882D */  daddu     $s1, $a0, $zero
-/* CEEDD4 80240B74 AFBF0020 */  sw        $ra, 0x20($sp)
-/* CEEDD8 80240B78 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CEEDDC 80240B7C AFB20018 */  sw        $s2, 0x18($sp)
-/* CEEDE0 80240B80 AFB00010 */  sw        $s0, 0x10($sp)
-/* CEEDE4 80240B84 8E30000C */  lw        $s0, 0xc($s1)
-/* CEEDE8 80240B88 8E050000 */  lw        $a1, ($s0)
-/* CEEDEC 80240B8C 0C0B1EAF */  jal       get_variable
-/* CEEDF0 80240B90 26100004 */   addiu    $s0, $s0, 4
-/* CEEDF4 80240B94 8E050000 */  lw        $a1, ($s0)
-/* CEEDF8 80240B98 26100004 */  addiu     $s0, $s0, 4
-/* CEEDFC 80240B9C 0220202D */  daddu     $a0, $s1, $zero
-/* CEEE00 80240BA0 0C0B1EAF */  jal       get_variable
-/* CEEE04 80240BA4 0040982D */   daddu    $s3, $v0, $zero
-/* CEEE08 80240BA8 8E050000 */  lw        $a1, ($s0)
-/* CEEE0C 80240BAC 26100004 */  addiu     $s0, $s0, 4
-/* CEEE10 80240BB0 0220202D */  daddu     $a0, $s1, $zero
-/* CEEE14 80240BB4 0C0B1EAF */  jal       get_variable
-/* CEEE18 80240BB8 0040902D */   daddu    $s2, $v0, $zero
-/* CEEE1C 80240BBC 0220202D */  daddu     $a0, $s1, $zero
-/* CEEE20 80240BC0 8E050000 */  lw        $a1, ($s0)
-/* CEEE24 80240BC4 0C0B1EAF */  jal       get_variable
-/* CEEE28 80240BC8 0040882D */   daddu    $s1, $v0, $zero
-/* CEEE2C 80240BCC 0260202D */  daddu     $a0, $s3, $zero
-/* CEEE30 80240BD0 0C04C3D6 */  jal       get_item_entity
-/* CEEE34 80240BD4 0040802D */   daddu    $s0, $v0, $zero
-/* CEEE38 80240BD8 0040182D */  daddu     $v1, $v0, $zero
-/* CEEE3C 80240BDC 44920000 */  mtc1      $s2, $f0
-/* CEEE40 80240BE0 00000000 */  nop
-/* CEEE44 80240BE4 46800020 */  cvt.s.w   $f0, $f0
-/* CEEE48 80240BE8 E4600008 */  swc1      $f0, 8($v1)
-/* CEEE4C 80240BEC 44910000 */  mtc1      $s1, $f0
-/* CEEE50 80240BF0 00000000 */  nop
-/* CEEE54 80240BF4 46800020 */  cvt.s.w   $f0, $f0
-/* CEEE58 80240BF8 E460000C */  swc1      $f0, 0xc($v1)
-/* CEEE5C 80240BFC 44900000 */  mtc1      $s0, $f0
-/* CEEE60 80240C00 00000000 */  nop
-/* CEEE64 80240C04 46800020 */  cvt.s.w   $f0, $f0
-/* CEEE68 80240C08 E4600010 */  swc1      $f0, 0x10($v1)
-/* CEEE6C 80240C0C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CEEE70 80240C10 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CEEE74 80240C14 8FB20018 */  lw        $s2, 0x18($sp)
-/* CEEE78 80240C18 8FB10014 */  lw        $s1, 0x14($sp)
-/* CEEE7C 80240C1C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CEEE80 80240C20 24020002 */  addiu     $v0, $zero, 2
-/* CEEE84 80240C24 03E00008 */  jr        $ra
-/* CEEE88 80240C28 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C2C_CEEE8C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C2C_CEEE8C.s
deleted file mode 100644
index ebe2bf60f2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C2C_CEEE8C.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C2C_CEEE8C
-/* CEEE8C 80240C2C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CEEE90 80240C30 AFB00010 */  sw        $s0, 0x10($sp)
-/* CEEE94 80240C34 0080802D */  daddu     $s0, $a0, $zero
-/* CEEE98 80240C38 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CEEE9C 80240C3C 8E02000C */  lw        $v0, 0xc($s0)
-/* CEEEA0 80240C40 0C0B1EAF */  jal       get_variable
-/* CEEEA4 80240C44 8C450000 */   lw       $a1, ($v0)
-/* CEEEA8 80240C48 3C048008 */  lui       $a0, %hi(gItemTable)
-/* CEEEAC 80240C4C 248478E0 */  addiu     $a0, $a0, %lo(gItemTable)
-/* CEEEB0 80240C50 00021940 */  sll       $v1, $v0, 5
-/* CEEEB4 80240C54 00642021 */  addu      $a0, $v1, $a0
-/* CEEEB8 80240C58 240300BB */  addiu     $v1, $zero, 0xbb
-/* CEEEBC 80240C5C 14430003 */  bne       $v0, $v1, .L80240C6C
-/* CEEEC0 80240C60 24020002 */   addiu    $v0, $zero, 2
-/* CEEEC4 80240C64 08090322 */  j         .L80240C88
-/* CEEEC8 80240C68 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80240C6C:
-/* CEEECC 80240C6C 94820018 */  lhu       $v0, 0x18($a0)
-/* CEEED0 80240C70 30420080 */  andi      $v0, $v0, 0x80
-/* CEEED4 80240C74 10400003 */  beqz      $v0, .L80240C84
-/* CEEED8 80240C78 24020001 */   addiu    $v0, $zero, 1
-/* CEEEDC 80240C7C 08090322 */  j         .L80240C88
-/* CEEEE0 80240C80 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80240C84:
-/* CEEEE4 80240C84 AE0000A8 */  sw        $zero, 0xa8($s0)
-.L80240C88:
-/* CEEEE8 80240C88 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CEEEEC 80240C8C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CEEEF0 80240C90 24020002 */  addiu     $v0, $zero, 2
-/* CEEEF4 80240C94 03E00008 */  jr        $ra
-/* CEEEF8 80240C98 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s
deleted file mode 100644
index 9083a2d60d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C9C_CEEEFC
-/* CEEEFC 80240C9C 2404005A */  addiu     $a0, $zero, 0x5a
-/* CEEF00 80240CA0 3C038024 */  lui       $v1, %hi(jan_03_UnkRotatePlayer)
-/* CEEF04 80240CA4 246329B8 */  addiu     $v1, $v1, %lo(jan_03_UnkRotatePlayer)
-/* CEEF08 80240CA8 240200DA */  addiu     $v0, $zero, 0xda
-.L80240CAC:
-/* CEEF0C 80240CAC AC620000 */  sw        $v0, ($v1)
-/* CEEF10 80240CB0 2463FFFC */  addiu     $v1, $v1, -4
-/* CEEF14 80240CB4 2484FFFF */  addiu     $a0, $a0, -1
-/* CEEF18 80240CB8 0481FFFC */  bgez      $a0, .L80240CAC
-/* CEEF1C 80240CBC 2442FFFF */   addiu    $v0, $v0, -1
-/* CEEF20 80240CC0 3C018024 */  lui       $at, %hi(D_802429BC)
-/* CEEF24 80240CC4 AC2029BC */  sw        $zero, %lo(D_802429BC)($at)
-/* CEEF28 80240CC8 03E00008 */  jr        $ra
-/* CEEF2C 80240CCC 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_24/CF0940/func_80240000_CF0940.s b/ver/us/asm/nonmatchings/world/area_flo/flo_24/CF0940/func_80240000_CF0940.s
deleted file mode 100644
index aac5fc8ec6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_24/CF0940/func_80240000_CF0940.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CF0940
-/* CF0940 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CF0944 80240004 24040001 */  addiu     $a0, $zero, 1
-/* CF0948 80240008 0000282D */  daddu     $a1, $zero, $zero
-/* CF094C 8024000C 00A0302D */  daddu     $a2, $a1, $zero
-/* CF0950 80240010 00A0382D */  daddu     $a3, $a1, $zero
-/* CF0954 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CF0958 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CF095C 8024001C 0C01CA54 */  jal       func_80072950
-/* CF0960 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CF0964 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CF0968 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CF096C 8024002C 03E00008 */  jr        $ra
-/* CF0970 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CF0974 80240034 00000000 */  nop
-/* CF0978 80240038 00000000 */  nop
-/* CF097C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2BD0/func_80240000_CF2BD0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2BD0/func_80240000_CF2BD0.s
deleted file mode 100644
index f53e4905fe..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2BD0/func_80240000_CF2BD0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_CF2BD0
-/* CF2BD0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CF2BD4 80240004 0000202D */  daddu     $a0, $zero, $zero
-/* CF2BD8 80240008 0080282D */  daddu     $a1, $a0, $zero
-/* CF2BDC 8024000C 0080302D */  daddu     $a2, $a0, $zero
-/* CF2BE0 80240010 0080382D */  daddu     $a3, $a0, $zero
-/* CF2BE4 80240014 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CF2BE8 80240018 AFA00010 */  sw        $zero, 0x10($sp)
-/* CF2BEC 8024001C 0C01CA54 */  jal       func_80072950
-/* CF2BF0 80240020 AFA00014 */   sw       $zero, 0x14($sp)
-/* CF2BF4 80240024 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CF2BF8 80240028 24020002 */  addiu     $v0, $zero, 2
-/* CF2BFC 8024002C 03E00008 */  jr        $ra
-/* CF2C00 80240030 27BD0020 */   addiu    $sp, $sp, 0x20
-/* CF2C04 80240034 00000000 */  nop
-/* CF2C08 80240038 00000000 */  nop
-/* CF2C0C 8024003C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/flo_25_func_802401F0_CF2DC0.s
similarity index 99%
rename from ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s
rename to ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/flo_25_func_802401F0_CF2DC0.s
index 1c86aeca70..2b51e2dcda 100644
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s
+++ b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/flo_25_func_802401F0_CF2DC0.s
@@ -1,7 +1,17 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel func_802401F0_CF2DC0
+.section .rodata
+
+glabel D_80244EE8_CF7AB8
+.double 0.09
+
+glabel D_80244EF0_CF7AC0
+.double 0.09
+
+.section .text
+
+glabel flo_25_func_802401F0_CF2DC0
 /* CF2DC0 802401F0 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* CF2DC4 802401F4 AFB3004C */  sw        $s3, 0x4c($sp)
 /* CF2DC8 802401F8 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s
deleted file mode 100644
index 8bd2d9e9ad..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_CF2C10
-/* CF2C10 80240040 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* CF2C14 80240044 AFB3002C */  sw        $s3, 0x2c($sp)
-/* CF2C18 80240048 0080982D */  daddu     $s3, $a0, $zero
-/* CF2C1C 8024004C AFBF0030 */  sw        $ra, 0x30($sp)
-/* CF2C20 80240050 AFB20028 */  sw        $s2, 0x28($sp)
-/* CF2C24 80240054 AFB10024 */  sw        $s1, 0x24($sp)
-/* CF2C28 80240058 AFB00020 */  sw        $s0, 0x20($sp)
-/* CF2C2C 8024005C 8E710148 */  lw        $s1, 0x148($s3)
-/* CF2C30 80240060 86240008 */  lh        $a0, 8($s1)
-/* CF2C34 80240064 0C00EABB */  jal       get_npc_unsafe
-/* CF2C38 80240068 00A0902D */   daddu    $s2, $a1, $zero
-/* CF2C3C 8024006C 8E440004 */  lw        $a0, 4($s2)
-/* CF2C40 80240070 0040802D */  daddu     $s0, $v0, $zero
-/* CF2C44 80240074 00041FC2 */  srl       $v1, $a0, 0x1f
-/* CF2C48 80240078 00832021 */  addu      $a0, $a0, $v1
-/* CF2C4C 8024007C 00042043 */  sra       $a0, $a0, 1
-/* CF2C50 80240080 0C00A67F */  jal       rand_int
-/* CF2C54 80240084 24840001 */   addiu    $a0, $a0, 1
-/* CF2C58 80240088 8E430004 */  lw        $v1, 4($s2)
-/* CF2C5C 8024008C 000327C2 */  srl       $a0, $v1, 0x1f
-/* CF2C60 80240090 00641821 */  addu      $v1, $v1, $a0
-/* CF2C64 80240094 00031843 */  sra       $v1, $v1, 1
-/* CF2C68 80240098 00621821 */  addu      $v1, $v1, $v0
-/* CF2C6C 8024009C A603008E */  sh        $v1, 0x8e($s0)
-/* CF2C70 802400A0 8E2300D0 */  lw        $v1, 0xd0($s1)
-/* CF2C74 802400A4 C6000040 */  lwc1      $f0, 0x40($s0)
-/* CF2C78 802400A8 C4640000 */  lwc1      $f4, ($v1)
-/* CF2C7C 802400AC 46802120 */  cvt.s.w   $f4, $f4
-/* CF2C80 802400B0 C4620008 */  lwc1      $f2, 8($v1)
-/* CF2C84 802400B4 468010A0 */  cvt.s.w   $f2, $f2
-/* CF2C88 802400B8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CF2C8C 802400BC 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CF2C90 802400C0 44061000 */  mfc1      $a2, $f2
-/* CF2C94 802400C4 C440000C */  lwc1      $f0, 0xc($v0)
-/* CF2C98 802400C8 46800020 */  cvt.s.w   $f0, $f0
-/* CF2C9C 802400CC E7A00014 */  swc1      $f0, 0x14($sp)
-/* CF2CA0 802400D0 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CF2CA4 802400D4 44052000 */  mfc1      $a1, $f4
-/* CF2CA8 802400D8 C4400010 */  lwc1      $f0, 0x10($v0)
-/* CF2CAC 802400DC 46800020 */  cvt.s.w   $f0, $f0
-/* CF2CB0 802400E0 E7A00018 */  swc1      $f0, 0x18($sp)
-/* CF2CB4 802400E4 8C640018 */  lw        $a0, 0x18($v1)
-/* CF2CB8 802400E8 0C0123F5 */  jal       is_point_within_region
-/* CF2CBC 802400EC 8E070038 */   lw       $a3, 0x38($s0)
-/* CF2CC0 802400F0 1040000E */  beqz      $v0, .L8024012C
-/* CF2CC4 802400F4 00000000 */   nop
-/* CF2CC8 802400F8 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CF2CCC 802400FC C60C0038 */  lwc1      $f12, 0x38($s0)
-/* CF2CD0 80240100 C60E0040 */  lwc1      $f14, 0x40($s0)
-/* CF2CD4 80240104 C4460000 */  lwc1      $f6, ($v0)
-/* CF2CD8 80240108 468031A0 */  cvt.s.w   $f6, $f6
-/* CF2CDC 8024010C 44063000 */  mfc1      $a2, $f6
-/* CF2CE0 80240110 C4460008 */  lwc1      $f6, 8($v0)
-/* CF2CE4 80240114 468031A0 */  cvt.s.w   $f6, $f6
-/* CF2CE8 80240118 44073000 */  mfc1      $a3, $f6
-/* CF2CEC 8024011C 0C00A720 */  jal       atan2
-/* CF2CF0 80240120 00000000 */   nop
-/* CF2CF4 80240124 08090057 */  j         .L8024015C
-/* CF2CF8 80240128 E600000C */   swc1     $f0, 0xc($s0)
-.L8024012C:
-/* CF2CFC 8024012C 0C00A67F */  jal       rand_int
-/* CF2D00 80240130 2404003C */   addiu    $a0, $zero, 0x3c
-/* CF2D04 80240134 C60C000C */  lwc1      $f12, 0xc($s0)
-/* CF2D08 80240138 44820000 */  mtc1      $v0, $f0
-/* CF2D0C 8024013C 00000000 */  nop
-/* CF2D10 80240140 46800020 */  cvt.s.w   $f0, $f0
-/* CF2D14 80240144 46006300 */  add.s     $f12, $f12, $f0
-/* CF2D18 80240148 3C0141F0 */  lui       $at, 0x41f0
-/* CF2D1C 8024014C 44810000 */  mtc1      $at, $f0
-/* CF2D20 80240150 0C00A6C9 */  jal       clamp_angle
-/* CF2D24 80240154 46006301 */   sub.s    $f12, $f12, $f0
-/* CF2D28 80240158 E600000C */  swc1      $f0, 0xc($s0)
-.L8024015C:
-/* CF2D2C 8024015C 8E2200CC */  lw        $v0, 0xcc($s1)
-/* CF2D30 80240160 8C420004 */  lw        $v0, 4($v0)
-/* CF2D34 80240164 AE020028 */  sw        $v0, 0x28($s0)
-/* CF2D38 80240168 AE600074 */  sw        $zero, 0x74($s3)
-/* CF2D3C 8024016C 8E2200D0 */  lw        $v0, 0xd0($s1)
-/* CF2D40 80240170 8C420014 */  lw        $v0, 0x14($v0)
-/* CF2D44 80240174 04410004 */  bgez      $v0, .L80240188
-/* CF2D48 80240178 00000000 */   nop
-/* CF2D4C 8024017C C6400000 */  lwc1      $f0, ($s2)
-/* CF2D50 80240180 0809006A */  j         .L802401A8
-/* CF2D54 80240184 E6000018 */   swc1     $f0, 0x18($s0)
-.L80240188:
-/* CF2D58 80240188 3C018024 */  lui       $at, %hi(D_80244EE0_CF7AB0)
-/* CF2D5C 8024018C D4224EE0 */  ldc1      $f2, %lo(D_80244EE0_CF7AB0)($at)
-/* CF2D60 80240190 44820000 */  mtc1      $v0, $f0
-/* CF2D64 80240194 00000000 */  nop
-/* CF2D68 80240198 46800021 */  cvt.d.w   $f0, $f0
-/* CF2D6C 8024019C 46220003 */  div.d     $f0, $f0, $f2
-/* CF2D70 802401A0 46200020 */  cvt.s.d   $f0, $f0
-/* CF2D74 802401A4 E6000018 */  swc1      $f0, 0x18($s0)
-.L802401A8:
-/* CF2D78 802401A8 C600003C */  lwc1      $f0, 0x3c($s0)
-/* CF2D7C 802401AC 3C014059 */  lui       $at, 0x4059
-/* CF2D80 802401B0 44811800 */  mtc1      $at, $f3
-/* CF2D84 802401B4 44801000 */  mtc1      $zero, $f2
-/* CF2D88 802401B8 46000021 */  cvt.d.s   $f0, $f0
-/* CF2D8C 802401BC 46220002 */  mul.d     $f0, $f0, $f2
-/* CF2D90 802401C0 00000000 */  nop
-/* CF2D94 802401C4 24020001 */  addiu     $v0, $zero, 1
-/* CF2D98 802401C8 4620018D */  trunc.w.d $f6, $f0
-/* CF2D9C 802401CC E626007C */  swc1      $f6, 0x7c($s1)
-/* CF2DA0 802401D0 AE620070 */  sw        $v0, 0x70($s3)
-/* CF2DA4 802401D4 8FBF0030 */  lw        $ra, 0x30($sp)
-/* CF2DA8 802401D8 8FB3002C */  lw        $s3, 0x2c($sp)
-/* CF2DAC 802401DC 8FB20028 */  lw        $s2, 0x28($sp)
-/* CF2DB0 802401E0 8FB10024 */  lw        $s1, 0x24($sp)
-/* CF2DB4 802401E4 8FB00020 */  lw        $s0, 0x20($sp)
-/* CF2DB8 802401E8 03E00008 */  jr        $ra
-/* CF2DBC 802401EC 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s
deleted file mode 100644
index 6d64df100a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C94_CF3864
-/* CF3864 80240C94 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF3868 80240C98 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF386C 80240C9C 0080802D */  daddu     $s0, $a0, $zero
-/* CF3870 80240CA0 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CF3874 80240CA4 8E020148 */  lw        $v0, 0x148($s0)
-/* CF3878 80240CA8 0C00EABB */  jal       get_npc_unsafe
-/* CF387C 80240CAC 84440008 */   lh       $a0, 8($v0)
-/* CF3880 80240CB0 9443008E */  lhu       $v1, 0x8e($v0)
-/* CF3884 80240CB4 C440003C */  lwc1      $f0, 0x3c($v0)
-/* CF3888 80240CB8 24640001 */  addiu     $a0, $v1, 1
-/* CF388C 80240CBC 00031C00 */  sll       $v1, $v1, 0x10
-/* CF3890 80240CC0 00031B83 */  sra       $v1, $v1, 0xe
-/* CF3894 80240CC4 A444008E */  sh        $a0, 0x8e($v0)
-/* CF3898 80240CC8 3C018024 */  lui       $at, %hi(D_8024291C_CF54EC)
-/* CF389C 80240CCC 00230821 */  addu      $at, $at, $v1
-/* CF38A0 80240CD0 C422291C */  lwc1      $f2, %lo(D_8024291C_CF54EC)($at)
-/* CF38A4 80240CD4 8443008E */  lh        $v1, 0x8e($v0)
-/* CF38A8 80240CD8 46020000 */  add.s     $f0, $f0, $f2
-/* CF38AC 80240CDC 28630005 */  slti      $v1, $v1, 5
-/* CF38B0 80240CE0 14600003 */  bnez      $v1, .L80240CF0
-/* CF38B4 80240CE4 E440003C */   swc1     $f0, 0x3c($v0)
-/* CF38B8 80240CE8 2402000C */  addiu     $v0, $zero, 0xc
-/* CF38BC 80240CEC AE020070 */  sw        $v0, 0x70($s0)
-.L80240CF0:
-/* CF38C0 80240CF0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CF38C4 80240CF4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF38C8 80240CF8 03E00008 */  jr        $ra
-/* CF38CC 80240CFC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s
deleted file mode 100644
index 889d3667f1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024134C_CF3F1C
-/* CF3F1C 8024134C 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CF3F20 80241350 AFB40040 */  sw        $s4, 0x40($sp)
-/* CF3F24 80241354 0080A02D */  daddu     $s4, $a0, $zero
-/* CF3F28 80241358 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CF3F2C 8024135C AFB50044 */  sw        $s5, 0x44($sp)
-/* CF3F30 80241360 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CF3F34 80241364 AFB20038 */  sw        $s2, 0x38($sp)
-/* CF3F38 80241368 AFB10034 */  sw        $s1, 0x34($sp)
-/* CF3F3C 8024136C AFB00030 */  sw        $s0, 0x30($sp)
-/* CF3F40 80241370 8E920148 */  lw        $s2, 0x148($s4)
-/* CF3F44 80241374 86440008 */  lh        $a0, 8($s2)
-/* CF3F48 80241378 8E90000C */  lw        $s0, 0xc($s4)
-/* CF3F4C 8024137C 0C00EABB */  jal       get_npc_unsafe
-/* CF3F50 80241380 00A0882D */   daddu    $s1, $a1, $zero
-/* CF3F54 80241384 0280202D */  daddu     $a0, $s4, $zero
-/* CF3F58 80241388 8E050000 */  lw        $a1, ($s0)
-/* CF3F5C 8024138C 0C0B1EAF */  jal       get_variable
-/* CF3F60 80241390 0040A82D */   daddu    $s5, $v0, $zero
-/* CF3F64 80241394 AFA00010 */  sw        $zero, 0x10($sp)
-/* CF3F68 80241398 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF3F6C 8024139C 8C630030 */  lw        $v1, 0x30($v1)
-/* CF3F70 802413A0 AFA30014 */  sw        $v1, 0x14($sp)
-/* CF3F74 802413A4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF3F78 802413A8 8C63001C */  lw        $v1, 0x1c($v1)
-/* CF3F7C 802413AC AFA30018 */  sw        $v1, 0x18($sp)
-/* CF3F80 802413B0 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF3F84 802413B4 8C630024 */  lw        $v1, 0x24($v1)
-/* CF3F88 802413B8 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CF3F8C 802413BC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF3F90 802413C0 8C630028 */  lw        $v1, 0x28($v1)
-/* CF3F94 802413C4 27B30010 */  addiu     $s3, $sp, 0x10
-/* CF3F98 802413C8 AFA30020 */  sw        $v1, 0x20($sp)
-/* CF3F9C 802413CC 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF3FA0 802413D0 3C0142F0 */  lui       $at, 0x42f0
-/* CF3FA4 802413D4 44810000 */  mtc1      $at, $f0
-/* CF3FA8 802413D8 8C63002C */  lw        $v1, 0x2c($v1)
-/* CF3FAC 802413DC 0040802D */  daddu     $s0, $v0, $zero
-/* CF3FB0 802413E0 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CF3FB4 802413E4 A7A0002C */  sh        $zero, 0x2c($sp)
-/* CF3FB8 802413E8 12200006 */  beqz      $s1, .L80241404
-/* CF3FBC 802413EC AFA30024 */   sw       $v1, 0x24($sp)
-/* CF3FC0 802413F0 02A0202D */  daddu     $a0, $s5, $zero
-/* CF3FC4 802413F4 0240282D */  daddu     $a1, $s2, $zero
-/* CF3FC8 802413F8 0280302D */  daddu     $a2, $s4, $zero
-/* CF3FCC 802413FC 0C09048A */  jal       flo_25_UnkFunc5
-/* CF3FD0 80241400 0200382D */   daddu    $a3, $s0, $zero
-.L80241404:
-/* CF3FD4 80241404 2402FFFE */  addiu     $v0, $zero, -2
-/* CF3FD8 80241408 A2A200AB */  sb        $v0, 0xab($s5)
-/* CF3FDC 8024140C 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CF3FE0 80241410 30620004 */  andi      $v0, $v1, 4
-/* CF3FE4 80241414 10400007 */  beqz      $v0, .L80241434
-/* CF3FE8 80241418 00000000 */   nop
-/* CF3FEC 8024141C 824200B4 */  lb        $v0, 0xb4($s2)
-/* CF3FF0 80241420 1440003C */  bnez      $v0, .L80241514
-/* CF3FF4 80241424 0000102D */   daddu    $v0, $zero, $zero
-/* CF3FF8 80241428 2402FFFB */  addiu     $v0, $zero, -5
-/* CF3FFC 8024142C 00621024 */  and       $v0, $v1, $v0
-/* CF4000 80241430 AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80241434:
-/* CF4004 80241434 8E830070 */  lw        $v1, 0x70($s4)
-/* CF4008 80241438 2C62000F */  sltiu     $v0, $v1, 0xf
-/* CF400C 8024143C 10400034 */  beqz      $v0, L80241510_CF40E0
-/* CF4010 80241440 00031080 */   sll      $v0, $v1, 2
-/* CF4014 80241444 3C018024 */  lui       $at, %hi(jtbl_80244EF8_CF7AC8)
-/* CF4018 80241448 00220821 */  addu      $at, $at, $v0
-/* CF401C 8024144C 8C224EF8 */  lw        $v0, %lo(jtbl_80244EF8_CF7AC8)($at)
-/* CF4020 80241450 00400008 */  jr        $v0
-/* CF4024 80241454 00000000 */   nop
-glabel L80241458_CF4028
-/* CF4028 80241458 0280202D */  daddu     $a0, $s4, $zero
-/* CF402C 8024145C 0200282D */  daddu     $a1, $s0, $zero
-/* CF4030 80241460 0C090010 */  jal       func_80240040_CF2C10
-/* CF4034 80241464 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241468_CF4038
-/* CF4038 80241468 0280202D */  daddu     $a0, $s4, $zero
-/* CF403C 8024146C 0200282D */  daddu     $a1, $s0, $zero
-/* CF4040 80241470 0C09007C */  jal       func_802401F0_CF2DC0
-/* CF4044 80241474 0260302D */   daddu    $a2, $s3, $zero
-/* CF4048 80241478 08090545 */  j         .L80241514
-/* CF404C 8024147C 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241480_CF4050
-/* CF4050 80241480 0280202D */  daddu     $a0, $s4, $zero
-/* CF4054 80241484 0200282D */  daddu     $a1, $s0, $zero
-/* CF4058 80241488 0C090206 */  jal       flo_25_UnkNpcAIFunc1
-/* CF405C 8024148C 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241490_CF4060
-/* CF4060 80241490 0280202D */  daddu     $a0, $s4, $zero
-/* CF4064 80241494 0200282D */  daddu     $a1, $s0, $zero
-/* CF4068 80241498 0C090236 */  jal       flo_25_UnkFunc4
-/* CF406C 8024149C 0260302D */   daddu    $a2, $s3, $zero
-/* CF4070 802414A0 08090545 */  j         .L80241514
-/* CF4074 802414A4 0000102D */   daddu    $v0, $zero, $zero
-glabel L802414A8_CF4078
-/* CF4078 802414A8 0280202D */  daddu     $a0, $s4, $zero
-/* CF407C 802414AC 0200282D */  daddu     $a1, $s0, $zero
-/* CF4080 802414B0 0C090307 */  jal       flo_25_UnkNpcAIFunc2
-/* CF4084 802414B4 0260302D */   daddu    $a2, $s3, $zero
-glabel L802414B8_CF4088
-/* CF4088 802414B8 0280202D */  daddu     $a0, $s4, $zero
-/* CF408C 802414BC 0200282D */  daddu     $a1, $s0, $zero
-/* CF4090 802414C0 0C090325 */  jal       func_80240C94_CF3864
-/* CF4094 802414C4 0260302D */   daddu    $a2, $s3, $zero
-/* CF4098 802414C8 08090545 */  j         .L80241514
-/* CF409C 802414CC 0000102D */   daddu    $v0, $zero, $zero
-glabel L802414D0_CF40A0
-/* CF40A0 802414D0 0280202D */  daddu     $a0, $s4, $zero
-/* CF40A4 802414D4 0200282D */  daddu     $a1, $s0, $zero
-/* CF40A8 802414D8 0C090340 */  jal       flo_25_UnkNpcAIFunc14
-/* CF40AC 802414DC 0260302D */   daddu    $a2, $s3, $zero
-/* CF40B0 802414E0 08090545 */  j         .L80241514
-/* CF40B4 802414E4 0000102D */   daddu    $v0, $zero, $zero
-glabel L802414E8_CF40B8
-/* CF40B8 802414E8 0280202D */  daddu     $a0, $s4, $zero
-/* CF40BC 802414EC 0200282D */  daddu     $a1, $s0, $zero
-/* CF40C0 802414F0 0C09038D */  jal       flo_25_UnkNpcAIFunc3
-/* CF40C4 802414F4 0260302D */   daddu    $a2, $s3, $zero
-/* CF40C8 802414F8 08090545 */  j         .L80241514
-/* CF40CC 802414FC 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241500_CF40D0
-/* CF40D0 80241500 0280202D */  daddu     $a0, $s4, $zero
-/* CF40D4 80241504 0200282D */  daddu     $a1, $s0, $zero
-/* CF40D8 80241508 0C0903A6 */  jal       flo_25_UnkFunc6
-/* CF40DC 8024150C 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241510_CF40E0
-/* CF40E0 80241510 0000102D */  daddu     $v0, $zero, $zero
-.L80241514:
-/* CF40E4 80241514 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CF40E8 80241518 8FB50044 */  lw        $s5, 0x44($sp)
-/* CF40EC 8024151C 8FB40040 */  lw        $s4, 0x40($sp)
-/* CF40F0 80241520 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CF40F4 80241524 8FB20038 */  lw        $s2, 0x38($sp)
-/* CF40F8 80241528 8FB10034 */  lw        $s1, 0x34($sp)
-/* CF40FC 8024152C 8FB00030 */  lw        $s0, 0x30($sp)
-/* CF4100 80241530 03E00008 */  jr        $ra
-/* CF4104 80241534 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s
deleted file mode 100644
index b6e7f2b392..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s
+++ /dev/null
@@ -1,172 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241668_CF4238
-/* CF4238 80241668 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* CF423C 8024166C AFB3004C */  sw        $s3, 0x4c($sp)
-/* CF4240 80241670 0080982D */  daddu     $s3, $a0, $zero
-/* CF4244 80241674 AFBF0050 */  sw        $ra, 0x50($sp)
-/* CF4248 80241678 AFB20048 */  sw        $s2, 0x48($sp)
-/* CF424C 8024167C AFB10044 */  sw        $s1, 0x44($sp)
-/* CF4250 80241680 AFB00040 */  sw        $s0, 0x40($sp)
-/* CF4254 80241684 8E720148 */  lw        $s2, 0x148($s3)
-/* CF4258 80241688 00A0882D */  daddu     $s1, $a1, $zero
-/* CF425C 8024168C 86440008 */  lh        $a0, 8($s2)
-/* CF4260 80241690 0C00EABB */  jal       get_npc_unsafe
-/* CF4264 80241694 00C0802D */   daddu    $s0, $a2, $zero
-/* CF4268 80241698 0200202D */  daddu     $a0, $s0, $zero
-/* CF426C 8024169C 0240282D */  daddu     $a1, $s2, $zero
-/* CF4270 802416A0 24030001 */  addiu     $v1, $zero, 1
-/* CF4274 802416A4 AFA30010 */  sw        $v1, 0x10($sp)
-/* CF4278 802416A8 8E260024 */  lw        $a2, 0x24($s1)
-/* CF427C 802416AC 8E270028 */  lw        $a3, 0x28($s1)
-/* CF4280 802416B0 0C01242D */  jal       func_800490B4
-/* CF4284 802416B4 0040802D */   daddu    $s0, $v0, $zero
-/* CF4288 802416B8 14400020 */  bnez      $v0, .L8024173C
-/* CF428C 802416BC 24040002 */   addiu    $a0, $zero, 2
-/* CF4290 802416C0 0200282D */  daddu     $a1, $s0, $zero
-/* CF4294 802416C4 0000302D */  daddu     $a2, $zero, $zero
-/* CF4298 802416C8 860300A8 */  lh        $v1, 0xa8($s0)
-/* CF429C 802416CC 3C013F80 */  lui       $at, 0x3f80
-/* CF42A0 802416D0 44810000 */  mtc1      $at, $f0
-/* CF42A4 802416D4 3C014000 */  lui       $at, 0x4000
-/* CF42A8 802416D8 44811000 */  mtc1      $at, $f2
-/* CF42AC 802416DC 3C01C1A0 */  lui       $at, 0xc1a0
-/* CF42B0 802416E0 44812000 */  mtc1      $at, $f4
-/* CF42B4 802416E4 2402000F */  addiu     $v0, $zero, 0xf
-/* CF42B8 802416E8 AFA2001C */  sw        $v0, 0x1c($sp)
-/* CF42BC 802416EC 44834000 */  mtc1      $v1, $f8
-/* CF42C0 802416F0 00000000 */  nop
-/* CF42C4 802416F4 46804220 */  cvt.s.w   $f8, $f8
-/* CF42C8 802416F8 44074000 */  mfc1      $a3, $f8
-/* CF42CC 802416FC 27A20028 */  addiu     $v0, $sp, 0x28
-/* CF42D0 80241700 AFA20020 */  sw        $v0, 0x20($sp)
-/* CF42D4 80241704 E7A00010 */  swc1      $f0, 0x10($sp)
-/* CF42D8 80241708 E7A20014 */  swc1      $f2, 0x14($sp)
-/* CF42DC 8024170C 0C01BFA4 */  jal       fx_emote
-/* CF42E0 80241710 E7A40018 */   swc1     $f4, 0x18($sp)
-/* CF42E4 80241714 8E4200CC */  lw        $v0, 0xcc($s2)
-/* CF42E8 80241718 8C430000 */  lw        $v1, ($v0)
-/* CF42EC 8024171C 2402001E */  addiu     $v0, $zero, 0x1e
-/* CF42F0 80241720 A602008E */  sh        $v0, 0x8e($s0)
-/* CF42F4 80241724 24020014 */  addiu     $v0, $zero, 0x14
-/* CF42F8 80241728 AE030028 */  sw        $v1, 0x28($s0)
-/* CF42FC 8024172C AE620070 */  sw        $v0, 0x70($s3)
-/* CF4300 80241730 2402001E */  addiu     $v0, $zero, 0x1e
-/* CF4304 80241734 08090633 */  j         .L802418CC
-/* CF4308 80241738 AE420090 */   sw       $v0, 0x90($s2)
-.L8024173C:
-/* CF430C 8024173C 8E050018 */  lw        $a1, 0x18($s0)
-/* CF4310 80241740 8E06000C */  lw        $a2, 0xc($s0)
-/* CF4314 80241744 0C00EA95 */  jal       npc_move_heading
-/* CF4318 80241748 0200202D */   daddu    $a0, $s0, $zero
-/* CF431C 8024174C 8E020000 */  lw        $v0, ($s0)
-/* CF4320 80241750 30420008 */  andi      $v0, $v0, 8
-/* CF4324 80241754 14400028 */  bnez      $v0, .L802417F8
-/* CF4328 80241758 0000882D */   daddu    $s1, $zero, $zero
-/* CF432C 8024175C 27A5002C */  addiu     $a1, $sp, 0x2c
-/* CF4330 80241760 27A60030 */  addiu     $a2, $sp, 0x30
-/* CF4334 80241764 860200A8 */  lh        $v0, 0xa8($s0)
-/* CF4338 80241768 C6000038 */  lwc1      $f0, 0x38($s0)
-/* CF433C 8024176C 44821000 */  mtc1      $v0, $f2
-/* CF4340 80241770 00000000 */  nop
-/* CF4344 80241774 468010A0 */  cvt.s.w   $f2, $f2
-/* CF4348 80241778 E7A0002C */  swc1      $f0, 0x2c($sp)
-/* CF434C 8024177C 860200A8 */  lh        $v0, 0xa8($s0)
-/* CF4350 80241780 C604003C */  lwc1      $f4, 0x3c($s0)
-/* CF4354 80241784 C6060040 */  lwc1      $f6, 0x40($s0)
-/* CF4358 80241788 44820000 */  mtc1      $v0, $f0
-/* CF435C 8024178C 00000000 */  nop
-/* CF4360 80241790 46800021 */  cvt.d.w   $f0, $f0
-/* CF4364 80241794 46022100 */  add.s     $f4, $f4, $f2
-/* CF4368 80241798 3C014008 */  lui       $at, 0x4008
-/* CF436C 8024179C 44811800 */  mtc1      $at, $f3
-/* CF4370 802417A0 44801000 */  mtc1      $zero, $f2
-/* CF4374 802417A4 27A20038 */  addiu     $v0, $sp, 0x38
-/* CF4378 802417A8 46220000 */  add.d     $f0, $f0, $f2
-/* CF437C 802417AC E7A60034 */  swc1      $f6, 0x34($sp)
-/* CF4380 802417B0 E7A40030 */  swc1      $f4, 0x30($sp)
-/* CF4384 802417B4 46200020 */  cvt.s.d   $f0, $f0
-/* CF4388 802417B8 E7A00038 */  swc1      $f0, 0x38($sp)
-/* CF438C 802417BC AFA20010 */  sw        $v0, 0x10($sp)
-/* CF4390 802417C0 8E040080 */  lw        $a0, 0x80($s0)
-/* CF4394 802417C4 0C0372DF */  jal       func_800DCB7C
-/* CF4398 802417C8 27A70034 */   addiu    $a3, $sp, 0x34
-/* CF439C 802417CC 1040000A */  beqz      $v0, .L802417F8
-/* CF43A0 802417D0 00000000 */   nop
-/* CF43A4 802417D4 860200A8 */  lh        $v0, 0xa8($s0)
-/* CF43A8 802417D8 C7A20038 */  lwc1      $f2, 0x38($sp)
-/* CF43AC 802417DC 44820000 */  mtc1      $v0, $f0
-/* CF43B0 802417E0 00000000 */  nop
-/* CF43B4 802417E4 46800020 */  cvt.s.w   $f0, $f0
-/* CF43B8 802417E8 4600103C */  c.lt.s    $f2, $f0
-/* CF43BC 802417EC 00000000 */  nop
-/* CF43C0 802417F0 45030001 */  bc1tl     .L802417F8
-/* CF43C4 802417F4 24110001 */   addiu    $s1, $zero, 1
-.L802417F8:
-/* CF43C8 802417F8 12200008 */  beqz      $s1, .L8024181C
-/* CF43CC 802417FC 00000000 */   nop
-/* CF43D0 80241800 C7A00030 */  lwc1      $f0, 0x30($sp)
-/* CF43D4 80241804 3C013FF0 */  lui       $at, 0x3ff0
-/* CF43D8 80241808 44811800 */  mtc1      $at, $f3
-/* CF43DC 8024180C 44801000 */  mtc1      $zero, $f2
-/* CF43E0 80241810 46000021 */  cvt.d.s   $f0, $f0
-/* CF43E4 80241814 08090629 */  j         .L802418A4
-/* CF43E8 80241818 46220000 */   add.d    $f0, $f0, $f2
-.L8024181C:
-/* CF43EC 8024181C 3C02800F */  lui       $v0, %hi(gPlayerStatusPtr)
-/* CF43F0 80241820 8C427B30 */  lw        $v0, %lo(gPlayerStatusPtr)($v0)
-/* CF43F4 80241824 3C014018 */  lui       $at, 0x4018
-/* CF43F8 80241828 44811800 */  mtc1      $at, $f3
-/* CF43FC 8024182C 44801000 */  mtc1      $zero, $f2
-/* CF4400 80241830 C440002C */  lwc1      $f0, 0x2c($v0)
-/* CF4404 80241834 C604003C */  lwc1      $f4, 0x3c($s0)
-/* CF4408 80241838 46000021 */  cvt.d.s   $f0, $f0
-/* CF440C 8024183C 46220000 */  add.d     $f0, $f0, $f2
-/* CF4410 80241840 46002121 */  cvt.d.s   $f4, $f4
-/* CF4414 80241844 46202001 */  sub.d     $f0, $f4, $f0
-/* CF4418 80241848 462001A0 */  cvt.s.d   $f6, $f0
-/* CF441C 8024184C 44800000 */  mtc1      $zero, $f0
-/* CF4420 80241850 44800800 */  mtc1      $zero, $f1
-/* CF4424 80241854 460030A1 */  cvt.d.s   $f2, $f6
-/* CF4428 80241858 4620103C */  c.lt.d    $f2, $f0
-/* CF442C 8024185C 00000000 */  nop
-/* CF4430 80241860 45010009 */  bc1t      .L80241888
-/* CF4434 80241864 00000000 */   nop
-/* CF4438 80241868 3C014010 */  lui       $at, 0x4010
-/* CF443C 8024186C 44810800 */  mtc1      $at, $f1
-/* CF4440 80241870 44800000 */  mtc1      $zero, $f0
-/* CF4444 80241874 00000000 */  nop
-/* CF4448 80241878 4622003C */  c.lt.d    $f0, $f2
-/* CF444C 8024187C 00000000 */  nop
-/* CF4450 80241880 4500000A */  bc1f      .L802418AC
-/* CF4454 80241884 00000000 */   nop
-.L80241888:
-/* CF4458 80241888 3C018024 */  lui       $at, %hi(D_80244F38_CF7B08)
-/* CF445C 8024188C D4224F38 */  ldc1      $f2, %lo(D_80244F38_CF7B08)($at)
-/* CF4460 80241890 46003187 */  neg.s     $f6, $f6
-/* CF4464 80241894 46003021 */  cvt.d.s   $f0, $f6
-/* CF4468 80241898 46220002 */  mul.d     $f0, $f0, $f2
-/* CF446C 8024189C 00000000 */  nop
-/* CF4470 802418A0 46202000 */  add.d     $f0, $f4, $f0
-.L802418A4:
-/* CF4474 802418A4 46200020 */  cvt.s.d   $f0, $f0
-/* CF4478 802418A8 E600003C */  swc1      $f0, 0x3c($s0)
-.L802418AC:
-/* CF447C 802418AC 8602008E */  lh        $v0, 0x8e($s0)
-/* CF4480 802418B0 9603008E */  lhu       $v1, 0x8e($s0)
-/* CF4484 802418B4 18400003 */  blez      $v0, .L802418C4
-/* CF4488 802418B8 2462FFFF */   addiu    $v0, $v1, -1
-/* CF448C 802418BC 08090633 */  j         .L802418CC
-/* CF4490 802418C0 A602008E */   sh       $v0, 0x8e($s0)
-.L802418C4:
-/* CF4494 802418C4 2402000C */  addiu     $v0, $zero, 0xc
-/* CF4498 802418C8 AE620070 */  sw        $v0, 0x70($s3)
-.L802418CC:
-/* CF449C 802418CC 8FBF0050 */  lw        $ra, 0x50($sp)
-/* CF44A0 802418D0 8FB3004C */  lw        $s3, 0x4c($sp)
-/* CF44A4 802418D4 8FB20048 */  lw        $s2, 0x48($sp)
-/* CF44A8 802418D8 8FB10044 */  lw        $s1, 0x44($sp)
-/* CF44AC 802418DC 8FB00040 */  lw        $s0, 0x40($sp)
-/* CF44B0 802418E0 03E00008 */  jr        $ra
-/* CF44B4 802418E4 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802418E8_CF44B8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802418E8_CF44B8.s
deleted file mode 100644
index 3c5cabc861..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802418E8_CF44B8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418E8_CF44B8
-/* CF44B8 802418E8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* CF44BC 802418EC AFB10014 */  sw        $s1, 0x14($sp)
-/* CF44C0 802418F0 0080882D */  daddu     $s1, $a0, $zero
-/* CF44C4 802418F4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* CF44C8 802418F8 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF44CC 802418FC 8E300148 */  lw        $s0, 0x148($s1)
-/* CF44D0 80241900 0C00EABB */  jal       get_npc_unsafe
-/* CF44D4 80241904 86040008 */   lh       $a0, 8($s0)
-/* CF44D8 80241908 0040182D */  daddu     $v1, $v0, $zero
-/* CF44DC 8024190C 9462008E */  lhu       $v0, 0x8e($v1)
-/* CF44E0 80241910 2442FFFF */  addiu     $v0, $v0, -1
-/* CF44E4 80241914 A462008E */  sh        $v0, 0x8e($v1)
-/* CF44E8 80241918 00021400 */  sll       $v0, $v0, 0x10
-/* CF44EC 8024191C 1C400004 */  bgtz      $v0, .L80241930
-/* CF44F0 80241920 00000000 */   nop
-/* CF44F4 80241924 AE000074 */  sw        $zero, 0x74($s0)
-/* CF44F8 80241928 A460008E */  sh        $zero, 0x8e($v1)
-/* CF44FC 8024192C AE200070 */  sw        $zero, 0x70($s1)
-.L80241930:
-/* CF4500 80241930 8FBF0018 */  lw        $ra, 0x18($sp)
-/* CF4504 80241934 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF4508 80241938 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF450C 8024193C 03E00008 */  jr        $ra
-/* CF4510 80241940 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s
deleted file mode 100644
index 242644857b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s
+++ /dev/null
@@ -1,139 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241944_CF4514
-/* CF4514 80241944 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* CF4518 80241948 AFB40040 */  sw        $s4, 0x40($sp)
-/* CF451C 8024194C 0080A02D */  daddu     $s4, $a0, $zero
-/* CF4520 80241950 AFBF0048 */  sw        $ra, 0x48($sp)
-/* CF4524 80241954 AFB50044 */  sw        $s5, 0x44($sp)
-/* CF4528 80241958 AFB3003C */  sw        $s3, 0x3c($sp)
-/* CF452C 8024195C AFB20038 */  sw        $s2, 0x38($sp)
-/* CF4530 80241960 AFB10034 */  sw        $s1, 0x34($sp)
-/* CF4534 80241964 AFB00030 */  sw        $s0, 0x30($sp)
-/* CF4538 80241968 8E920148 */  lw        $s2, 0x148($s4)
-/* CF453C 8024196C 86440008 */  lh        $a0, 8($s2)
-/* CF4540 80241970 8E90000C */  lw        $s0, 0xc($s4)
-/* CF4544 80241974 0C00EABB */  jal       get_npc_unsafe
-/* CF4548 80241978 00A0882D */   daddu    $s1, $a1, $zero
-/* CF454C 8024197C 0280202D */  daddu     $a0, $s4, $zero
-/* CF4550 80241980 8E050000 */  lw        $a1, ($s0)
-/* CF4554 80241984 0C0B1EAF */  jal       get_variable
-/* CF4558 80241988 0040A82D */   daddu    $s5, $v0, $zero
-/* CF455C 8024198C AFA00010 */  sw        $zero, 0x10($sp)
-/* CF4560 80241990 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF4564 80241994 8C630030 */  lw        $v1, 0x30($v1)
-/* CF4568 80241998 AFA30014 */  sw        $v1, 0x14($sp)
-/* CF456C 8024199C 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF4570 802419A0 8C63001C */  lw        $v1, 0x1c($v1)
-/* CF4574 802419A4 AFA30018 */  sw        $v1, 0x18($sp)
-/* CF4578 802419A8 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF457C 802419AC 8C630024 */  lw        $v1, 0x24($v1)
-/* CF4580 802419B0 AFA3001C */  sw        $v1, 0x1c($sp)
-/* CF4584 802419B4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF4588 802419B8 8C630028 */  lw        $v1, 0x28($v1)
-/* CF458C 802419BC 27B30010 */  addiu     $s3, $sp, 0x10
-/* CF4590 802419C0 AFA30020 */  sw        $v1, 0x20($sp)
-/* CF4594 802419C4 8E4300D0 */  lw        $v1, 0xd0($s2)
-/* CF4598 802419C8 3C0142F0 */  lui       $at, 0x42f0
-/* CF459C 802419CC 44810000 */  mtc1      $at, $f0
-/* CF45A0 802419D0 8C63002C */  lw        $v1, 0x2c($v1)
-/* CF45A4 802419D4 0040802D */  daddu     $s0, $v0, $zero
-/* CF45A8 802419D8 E7A00028 */  swc1      $f0, 0x28($sp)
-/* CF45AC 802419DC A7A0002C */  sh        $zero, 0x2c($sp)
-/* CF45B0 802419E0 12200007 */  beqz      $s1, .L80241A00
-/* CF45B4 802419E4 AFA30024 */   sw       $v1, 0x24($sp)
-/* CF45B8 802419E8 02A0202D */  daddu     $a0, $s5, $zero
-/* CF45BC 802419EC 0240282D */  daddu     $a1, $s2, $zero
-/* CF45C0 802419F0 0280302D */  daddu     $a2, $s4, $zero
-/* CF45C4 802419F4 0C09048A */  jal       flo_25_UnkFunc5
-/* CF45C8 802419F8 0200382D */   daddu    $a3, $s0, $zero
-/* CF45CC 802419FC AE800070 */  sw        $zero, 0x70($s4)
-.L80241A00:
-/* CF45D0 80241A00 2402FFFE */  addiu     $v0, $zero, -2
-/* CF45D4 80241A04 A2A200AB */  sb        $v0, 0xab($s5)
-/* CF45D8 80241A08 8E4300B0 */  lw        $v1, 0xb0($s2)
-/* CF45DC 80241A0C 30620004 */  andi      $v0, $v1, 4
-/* CF45E0 80241A10 10400007 */  beqz      $v0, .L80241A30
-/* CF45E4 80241A14 00000000 */   nop
-/* CF45E8 80241A18 824200B4 */  lb        $v0, 0xb4($s2)
-/* CF45EC 80241A1C 1440003A */  bnez      $v0, .L80241B08
-/* CF45F0 80241A20 0000102D */   daddu    $v0, $zero, $zero
-/* CF45F4 80241A24 2402FFFB */  addiu     $v0, $zero, -5
-/* CF45F8 80241A28 00621024 */  and       $v0, $v1, $v0
-/* CF45FC 80241A2C AE4200B0 */  sw        $v0, 0xb0($s2)
-.L80241A30:
-/* CF4600 80241A30 8E830070 */  lw        $v1, 0x70($s4)
-/* CF4604 80241A34 2C620015 */  sltiu     $v0, $v1, 0x15
-/* CF4608 80241A38 10400032 */  beqz      $v0, L80241B04_CF46D4
-/* CF460C 80241A3C 00031080 */   sll      $v0, $v1, 2
-/* CF4610 80241A40 3C018024 */  lui       $at, %hi(jtbl_80244F40_CF7B10)
-/* CF4614 80241A44 00220821 */  addu      $at, $at, $v0
-/* CF4618 80241A48 8C224F40 */  lw        $v0, %lo(jtbl_80244F40_CF7B10)($at)
-/* CF461C 80241A4C 00400008 */  jr        $v0
-/* CF4620 80241A50 00000000 */   nop
-glabel L80241A54_CF4624
-/* CF4624 80241A54 0280202D */  daddu     $a0, $s4, $zero
-/* CF4628 80241A58 0200282D */  daddu     $a1, $s0, $zero
-/* CF462C 80241A5C 0C090010 */  jal       func_80240040_CF2C10
-/* CF4630 80241A60 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241A64_CF4634
-/* CF4634 80241A64 0280202D */  daddu     $a0, $s4, $zero
-/* CF4638 80241A68 0200282D */  daddu     $a1, $s0, $zero
-/* CF463C 80241A6C 0C09007C */  jal       func_802401F0_CF2DC0
-/* CF4640 80241A70 0260302D */   daddu    $a2, $s3, $zero
-/* CF4644 80241A74 080906C2 */  j         .L80241B08
-/* CF4648 80241A78 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241A7C_CF464C
-/* CF464C 80241A7C 0280202D */  daddu     $a0, $s4, $zero
-/* CF4650 80241A80 0200282D */  daddu     $a1, $s0, $zero
-/* CF4654 80241A84 0C090206 */  jal       flo_25_UnkNpcAIFunc1
-/* CF4658 80241A88 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241A8C_CF465C
-/* CF465C 80241A8C 0280202D */  daddu     $a0, $s4, $zero
-/* CF4660 80241A90 0200282D */  daddu     $a1, $s0, $zero
-/* CF4664 80241A94 0C090236 */  jal       flo_25_UnkFunc4
-/* CF4668 80241A98 0260302D */   daddu    $a2, $s3, $zero
-/* CF466C 80241A9C 080906C2 */  j         .L80241B08
-/* CF4670 80241AA0 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241AA4_CF4674
-/* CF4674 80241AA4 0280202D */  daddu     $a0, $s4, $zero
-/* CF4678 80241AA8 0200282D */  daddu     $a1, $s0, $zero
-/* CF467C 80241AAC 0C090307 */  jal       flo_25_UnkNpcAIFunc2
-/* CF4680 80241AB0 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241AB4_CF4684
-/* CF4684 80241AB4 0280202D */  daddu     $a0, $s4, $zero
-/* CF4688 80241AB8 0200282D */  daddu     $a1, $s0, $zero
-/* CF468C 80241ABC 0C090325 */  jal       func_80240C94_CF3864
-/* CF4690 80241AC0 0260302D */   daddu    $a2, $s3, $zero
-/* CF4694 80241AC4 080906C2 */  j         .L80241B08
-/* CF4698 80241AC8 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241ACC_CF469C
-/* CF469C 80241ACC 0280202D */  daddu     $a0, $s4, $zero
-/* CF46A0 80241AD0 0200282D */  daddu     $a1, $s0, $zero
-/* CF46A4 80241AD4 0C09054E */  jal       flo_25_UnkNpcAIFunc13
-/* CF46A8 80241AD8 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241ADC_CF46AC
-/* CF46AC 80241ADC 0280202D */  daddu     $a0, $s4, $zero
-/* CF46B0 80241AE0 0200282D */  daddu     $a1, $s0, $zero
-/* CF46B4 80241AE4 0C09059A */  jal       func_80241668_CF4238
-/* CF46B8 80241AE8 0260302D */   daddu    $a2, $s3, $zero
-/* CF46BC 80241AEC 080906C2 */  j         .L80241B08
-/* CF46C0 80241AF0 0000102D */   daddu    $v0, $zero, $zero
-glabel L80241AF4_CF46C4
-/* CF46C4 80241AF4 0280202D */  daddu     $a0, $s4, $zero
-/* CF46C8 80241AF8 0200282D */  daddu     $a1, $s0, $zero
-/* CF46CC 80241AFC 0C09063A */  jal       func_802418E8_CF44B8
-/* CF46D0 80241B00 0260302D */   daddu    $a2, $s3, $zero
-glabel L80241B04_CF46D4
-/* CF46D4 80241B04 0000102D */  daddu     $v0, $zero, $zero
-.L80241B08:
-/* CF46D8 80241B08 8FBF0048 */  lw        $ra, 0x48($sp)
-/* CF46DC 80241B0C 8FB50044 */  lw        $s5, 0x44($sp)
-/* CF46E0 80241B10 8FB40040 */  lw        $s4, 0x40($sp)
-/* CF46E4 80241B14 8FB3003C */  lw        $s3, 0x3c($sp)
-/* CF46E8 80241B18 8FB20038 */  lw        $s2, 0x38($sp)
-/* CF46EC 80241B1C 8FB10034 */  lw        $s1, 0x34($sp)
-/* CF46F0 80241B20 8FB00030 */  lw        $s0, 0x30($sp)
-/* CF46F4 80241B24 03E00008 */  jr        $ra
-/* CF46F8 80241B28 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s
deleted file mode 100644
index 287b5414bd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D58_CF4928
-/* CF4928 80241D58 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF492C 80241D5C AFBF0010 */  sw        $ra, 0x10($sp)
-/* CF4930 80241D60 10A00003 */  beqz      $a1, .L80241D70
-/* CF4934 80241D64 8C86000C */   lw       $a2, 0xc($a0)
-/* CF4938 80241D68 3C018024 */  lui       $at, %hi(D_80242ACC_CF569C)
-/* CF493C 80241D6C AC202ACC */  sw        $zero, %lo(D_80242ACC_CF569C)($at)
-.L80241D70:
-/* CF4940 80241D70 3C038024 */  lui       $v1, %hi(D_80242ACC_CF569C)
-/* CF4944 80241D74 24632ACC */  addiu     $v1, $v1, %lo(D_80242ACC_CF569C)
-/* CF4948 80241D78 8C620000 */  lw        $v0, ($v1)
-/* CF494C 80241D7C 54400003 */  bnel      $v0, $zero, .L80241D8C
-/* CF4950 80241D80 AC600000 */   sw       $zero, ($v1)
-/* CF4954 80241D84 08090768 */  j         .L80241DA0
-/* CF4958 80241D88 0000102D */   daddu    $v0, $zero, $zero
-.L80241D8C:
-/* CF495C 80241D8C 8CC50000 */  lw        $a1, ($a2)
-/* CF4960 80241D90 3C068024 */  lui       $a2, %hi(D_80242AD0_CF56A0)
-/* CF4964 80241D94 0C0B2026 */  jal       set_variable
-/* CF4968 80241D98 8CC62AD0 */   lw       $a2, %lo(D_80242AD0_CF56A0)($a2)
-/* CF496C 80241D9C 24020002 */  addiu     $v0, $zero, 2
-.L80241DA0:
-/* CF4970 80241DA0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF4974 80241DA4 03E00008 */  jr        $ra
-/* CF4978 80241DA8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DAC_CF497C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DAC_CF497C.s
deleted file mode 100644
index 2aeb04c189..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DAC_CF497C.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241DAC_CF497C
-/* CF497C 80241DAC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF4980 80241DB0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CF4984 80241DB4 8C82000C */  lw        $v0, 0xc($a0)
-/* CF4988 80241DB8 0C0B1EAF */  jal       get_variable
-/* CF498C 80241DBC 8C450000 */   lw       $a1, ($v0)
-/* CF4990 80241DC0 3C018024 */  lui       $at, %hi(D_80242AD0_CF56A0)
-/* CF4994 80241DC4 AC222AD0 */  sw        $v0, %lo(D_80242AD0_CF56A0)($at)
-/* CF4998 80241DC8 24020002 */  addiu     $v0, $zero, 2
-/* CF499C 80241DCC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF49A0 80241DD0 24030001 */  addiu     $v1, $zero, 1
-/* CF49A4 80241DD4 3C018024 */  lui       $at, %hi(D_80242ACC_CF569C)
-/* CF49A8 80241DD8 AC232ACC */  sw        $v1, %lo(D_80242ACC_CF569C)($at)
-/* CF49AC 80241DDC 03E00008 */  jr        $ra
-/* CF49B0 80241DE0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s
deleted file mode 100644
index 23ae317df4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241DE4_CF49B4
-/* CF49B4 80241DE4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF49B8 80241DE8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CF49BC 80241DEC 8C82000C */  lw        $v0, 0xc($a0)
-/* CF49C0 80241DF0 0C0B1EAF */  jal       get_variable
-/* CF49C4 80241DF4 8C450000 */   lw       $a1, ($v0)
-/* CF49C8 80241DF8 0040182D */  daddu     $v1, $v0, $zero
-/* CF49CC 80241DFC 10600012 */  beqz      $v1, .L80241E48
-/* CF49D0 80241E00 0000202D */   daddu    $a0, $zero, $zero
-/* CF49D4 80241E04 8C620000 */  lw        $v0, ($v1)
-/* CF49D8 80241E08 5040000A */  beql      $v0, $zero, .L80241E34
-/* CF49DC 80241E0C 00041080 */   sll      $v0, $a0, 2
-/* CF49E0 80241E10 3C058024 */  lui       $a1, %hi(D_80244FA0_8F0DC0)
-/* CF49E4 80241E14 24A54FA0 */  addiu     $a1, $a1, %lo(D_80244FA0_8F0DC0)
-.L80241E18:
-/* CF49E8 80241E18 24630004 */  addiu     $v1, $v1, 4
-/* CF49EC 80241E1C 24840001 */  addiu     $a0, $a0, 1
-/* CF49F0 80241E20 ACA20000 */  sw        $v0, ($a1)
-/* CF49F4 80241E24 8C620000 */  lw        $v0, ($v1)
-/* CF49F8 80241E28 1440FFFB */  bnez      $v0, .L80241E18
-/* CF49FC 80241E2C 24A50004 */   addiu    $a1, $a1, 4
-/* CF4A00 80241E30 00041080 */  sll       $v0, $a0, 2
-.L80241E34:
-/* CF4A04 80241E34 3C018024 */  lui       $at, %hi(D_80244FA0_8F0DC0)
-/* CF4A08 80241E38 00220821 */  addu      $at, $at, $v0
-/* CF4A0C 80241E3C AC204FA0 */  sw        $zero, %lo(D_80244FA0_8F0DC0)($at)
-/* CF4A10 80241E40 0809079C */  j         .L80241E70
-/* CF4A14 80241E44 00000000 */   nop
-.L80241E48:
-/* CF4A18 80241E48 3C038024 */  lui       $v1, %hi(D_80244FA0_8F0DC0)
-/* CF4A1C 80241E4C 24634FA0 */  addiu     $v1, $v1, %lo(D_80244FA0_8F0DC0)
-/* CF4A20 80241E50 0060282D */  daddu     $a1, $v1, $zero
-.L80241E54:
-/* CF4A24 80241E54 24820080 */  addiu     $v0, $a0, 0x80
-/* CF4A28 80241E58 AC620000 */  sw        $v0, ($v1)
-/* CF4A2C 80241E5C 24630004 */  addiu     $v1, $v1, 4
-/* CF4A30 80241E60 24840001 */  addiu     $a0, $a0, 1
-/* CF4A34 80241E64 2882005B */  slti      $v0, $a0, 0x5b
-/* CF4A38 80241E68 1440FFFA */  bnez      $v0, .L80241E54
-/* CF4A3C 80241E6C ACA0016C */   sw       $zero, 0x16c($a1)
-.L80241E70:
-/* CF4A40 80241E70 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF4A44 80241E74 24020002 */  addiu     $v0, $zero, 2
-/* CF4A48 80241E78 03E00008 */  jr        $ra
-/* CF4A4C 80241E7C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241E80_CF4A50.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241E80_CF4A50.s
deleted file mode 100644
index 38b57b720d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241E80_CF4A50.s
+++ /dev/null
@@ -1,53 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E80_CF4A50
-/* CF4A50 80241E80 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CF4A54 80241E84 AFB10014 */  sw        $s1, 0x14($sp)
-/* CF4A58 80241E88 0080882D */  daddu     $s1, $a0, $zero
-/* CF4A5C 80241E8C AFBF0020 */  sw        $ra, 0x20($sp)
-/* CF4A60 80241E90 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CF4A64 80241E94 AFB20018 */  sw        $s2, 0x18($sp)
-/* CF4A68 80241E98 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF4A6C 80241E9C 8E30000C */  lw        $s0, 0xc($s1)
-/* CF4A70 80241EA0 8E050000 */  lw        $a1, ($s0)
-/* CF4A74 80241EA4 0C0B1EAF */  jal       get_variable
-/* CF4A78 80241EA8 26100004 */   addiu    $s0, $s0, 4
-/* CF4A7C 80241EAC 8E050000 */  lw        $a1, ($s0)
-/* CF4A80 80241EB0 26100004 */  addiu     $s0, $s0, 4
-/* CF4A84 80241EB4 0220202D */  daddu     $a0, $s1, $zero
-/* CF4A88 80241EB8 0C0B1EAF */  jal       get_variable
-/* CF4A8C 80241EBC 0040982D */   daddu    $s3, $v0, $zero
-/* CF4A90 80241EC0 8E050000 */  lw        $a1, ($s0)
-/* CF4A94 80241EC4 26100004 */  addiu     $s0, $s0, 4
-/* CF4A98 80241EC8 0220202D */  daddu     $a0, $s1, $zero
-/* CF4A9C 80241ECC 0C0B1EAF */  jal       get_variable
-/* CF4AA0 80241ED0 0040902D */   daddu    $s2, $v0, $zero
-/* CF4AA4 80241ED4 0220202D */  daddu     $a0, $s1, $zero
-/* CF4AA8 80241ED8 8E050000 */  lw        $a1, ($s0)
-/* CF4AAC 80241EDC 0C0B1EAF */  jal       get_variable
-/* CF4AB0 80241EE0 0040882D */   daddu    $s1, $v0, $zero
-/* CF4AB4 80241EE4 0260202D */  daddu     $a0, $s3, $zero
-/* CF4AB8 80241EE8 0C04C3D6 */  jal       get_item_entity
-/* CF4ABC 80241EEC 0040802D */   daddu    $s0, $v0, $zero
-/* CF4AC0 80241EF0 0040182D */  daddu     $v1, $v0, $zero
-/* CF4AC4 80241EF4 44920000 */  mtc1      $s2, $f0
-/* CF4AC8 80241EF8 00000000 */  nop
-/* CF4ACC 80241EFC 46800020 */  cvt.s.w   $f0, $f0
-/* CF4AD0 80241F00 E4600008 */  swc1      $f0, 8($v1)
-/* CF4AD4 80241F04 44910000 */  mtc1      $s1, $f0
-/* CF4AD8 80241F08 00000000 */  nop
-/* CF4ADC 80241F0C 46800020 */  cvt.s.w   $f0, $f0
-/* CF4AE0 80241F10 E460000C */  swc1      $f0, 0xc($v1)
-/* CF4AE4 80241F14 44900000 */  mtc1      $s0, $f0
-/* CF4AE8 80241F18 00000000 */  nop
-/* CF4AEC 80241F1C 46800020 */  cvt.s.w   $f0, $f0
-/* CF4AF0 80241F20 E4600010 */  swc1      $f0, 0x10($v1)
-/* CF4AF4 80241F24 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CF4AF8 80241F28 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CF4AFC 80241F2C 8FB20018 */  lw        $s2, 0x18($sp)
-/* CF4B00 80241F30 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF4B04 80241F34 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF4B08 80241F38 24020002 */  addiu     $v0, $zero, 2
-/* CF4B0C 80241F3C 03E00008 */  jr        $ra
-/* CF4B10 80241F40 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44_CF4B14.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44_CF4B14.s
deleted file mode 100644
index b9d6718f17..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44_CF4B14.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F44_CF4B14
-/* CF4B14 80241F44 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF4B18 80241F48 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF4B1C 80241F4C 0080802D */  daddu     $s0, $a0, $zero
-/* CF4B20 80241F50 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CF4B24 80241F54 8E02000C */  lw        $v0, 0xc($s0)
-/* CF4B28 80241F58 0C0B1EAF */  jal       get_variable
-/* CF4B2C 80241F5C 8C450000 */   lw       $a1, ($v0)
-/* CF4B30 80241F60 3C048008 */  lui       $a0, %hi(gItemTable)
-/* CF4B34 80241F64 248478E0 */  addiu     $a0, $a0, %lo(gItemTable)
-/* CF4B38 80241F68 00021940 */  sll       $v1, $v0, 5
-/* CF4B3C 80241F6C 00642021 */  addu      $a0, $v1, $a0
-/* CF4B40 80241F70 240300BB */  addiu     $v1, $zero, 0xbb
-/* CF4B44 80241F74 14430003 */  bne       $v0, $v1, .L80241F84
-/* CF4B48 80241F78 24020002 */   addiu    $v0, $zero, 2
-/* CF4B4C 80241F7C 080907E8 */  j         .L80241FA0
-/* CF4B50 80241F80 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80241F84:
-/* CF4B54 80241F84 94820018 */  lhu       $v0, 0x18($a0)
-/* CF4B58 80241F88 30420080 */  andi      $v0, $v0, 0x80
-/* CF4B5C 80241F8C 10400003 */  beqz      $v0, .L80241F9C
-/* CF4B60 80241F90 24020001 */   addiu    $v0, $zero, 1
-/* CF4B64 80241F94 080907E8 */  j         .L80241FA0
-/* CF4B68 80241F98 AE0200A8 */   sw       $v0, 0xa8($s0)
-.L80241F9C:
-/* CF4B6C 80241F9C AE0000A8 */  sw        $zero, 0xa8($s0)
-.L80241FA0:
-/* CF4B70 80241FA0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CF4B74 80241FA4 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF4B78 80241FA8 24020002 */  addiu     $v0, $zero, 2
-/* CF4B7C 80241FAC 03E00008 */  jr        $ra
-/* CF4B80 80241FB0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s
deleted file mode 100644
index 408dd72e25..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241FB4_CF4B84
-/* CF4B84 80241FB4 2404005A */  addiu     $a0, $zero, 0x5a
-/* CF4B88 80241FB8 3C038024 */  lui       $v1, %hi(D_80245278)
-/* CF4B8C 80241FBC 24635278 */  addiu     $v1, $v1, %lo(D_80245278)
-/* CF4B90 80241FC0 240200DA */  addiu     $v0, $zero, 0xda
-.L80241FC4:
-/* CF4B94 80241FC4 AC620000 */  sw        $v0, ($v1)
-/* CF4B98 80241FC8 2463FFFC */  addiu     $v1, $v1, -4
-/* CF4B9C 80241FCC 2484FFFF */  addiu     $a0, $a0, -1
-/* CF4BA0 80241FD0 0481FFFC */  bgez      $a0, .L80241FC4
-/* CF4BA4 80241FD4 2442FFFF */   addiu    $v0, $v0, -1
-/* CF4BA8 80241FD8 3C018024 */  lui       $at, %hi(D_8024527C)
-/* CF4BAC 80241FDC AC20527C */  sw        $zero, %lo(D_8024527C)($at)
-/* CF4BB0 80241FE0 03E00008 */  jr        $ra
-/* CF4BB4 80241FE4 24020002 */   addiu    $v0, $zero, 2
-/* CF4BB8 80241FE8 00000000 */  nop
-/* CF4BBC 80241FEC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF4E00/func_80242230_CF4E00.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF4E00/func_80242230_CF4E00.s
deleted file mode 100644
index 5d33556b46..0000000000
--- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF4E00/func_80242230_CF4E00.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242230_CF4E00
-/* CF4E00 80242230 8C820084 */  lw        $v0, 0x84($a0)
-/* CF4E04 80242234 8C830090 */  lw        $v1, 0x90($a0)
-/* CF4E08 80242238 00431023 */  subu      $v0, $v0, $v1
-/* CF4E0C 8024223C 44821000 */  mtc1      $v0, $f2
-/* CF4E10 80242240 00000000 */  nop
-/* CF4E14 80242244 468010A0 */  cvt.s.w   $f2, $f2
-/* CF4E18 80242248 8C820088 */  lw        $v0, 0x88($a0)
-/* CF4E1C 8024224C 8C830094 */  lw        $v1, 0x94($a0)
-/* CF4E20 80242250 46021082 */  mul.s     $f2, $f2, $f2
-/* CF4E24 80242254 00000000 */  nop
-/* CF4E28 80242258 00431023 */  subu      $v0, $v0, $v1
-/* CF4E2C 8024225C 44822000 */  mtc1      $v0, $f4
-/* CF4E30 80242260 00000000 */  nop
-/* CF4E34 80242264 46802120 */  cvt.s.w   $f4, $f4
-/* CF4E38 80242268 8C82008C */  lw        $v0, 0x8c($a0)
-/* CF4E3C 8024226C 46042102 */  mul.s     $f4, $f4, $f4
-/* CF4E40 80242270 00000000 */  nop
-/* CF4E44 80242274 8C830098 */  lw        $v1, 0x98($a0)
-/* CF4E48 80242278 00431023 */  subu      $v0, $v0, $v1
-/* CF4E4C 8024227C 44820000 */  mtc1      $v0, $f0
-/* CF4E50 80242280 00000000 */  nop
-/* CF4E54 80242284 46800020 */  cvt.s.w   $f0, $f0
-/* CF4E58 80242288 46000002 */  mul.s     $f0, $f0, $f0
-/* CF4E5C 8024228C 00000000 */  nop
-/* CF4E60 80242290 46041080 */  add.s     $f2, $f2, $f4
-/* CF4E64 80242294 46001080 */  add.s     $f2, $f2, $f0
-/* CF4E68 80242298 3C014561 */  lui       $at, 0x4561
-/* CF4E6C 8024229C 44810000 */  mtc1      $at, $f0
-/* CF4E70 802422A0 00000000 */  nop
-/* CF4E74 802422A4 4600103C */  c.lt.s    $f2, $f0
-/* CF4E78 802422A8 00000000 */  nop
-/* CF4E7C 802422AC 45010002 */  bc1t      .L802422B8
-/* CF4E80 802422B0 24020001 */   addiu    $v0, $zero, 1
-/* CF4E84 802422B4 0000102D */  daddu     $v0, $zero, $zero
-.L802422B8:
-/* CF4E88 802422B8 AC820084 */  sw        $v0, 0x84($a0)
-/* CF4E8C 802422BC 03E00008 */  jr        $ra
-/* CF4E90 802422C0 24020002 */   addiu    $v0, $zero, 2
-/* CF4E94 802422C4 00000000 */  nop
-/* CF4E98 802422C8 00000000 */  nop
-/* CF4E9C 802422CC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240034_E1E494.s b/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240034_E1E494.s
deleted file mode 100644
index 9e780da04c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240034_E1E494.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_E1E494
-/* E1E494 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* E1E498 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* E1E49C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E1E4A0 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* E1E4A4 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* E1E4A8 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* E1E4AC 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* E1E4B0 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* E1E4B4 80240054 24020002 */   addiu    $v0, $zero, 2
-/* E1E4B8 80240058 08090038 */  j         .L802400E0
-/* E1E4BC 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* E1E4C0 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* E1E4C4 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* E1E4C8 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* E1E4CC 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* E1E4D0 80240070 04420001 */  bltzl     $v0, .L80240078
-/* E1E4D4 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* E1E4D8 80240078 14400003 */  bnez      $v0, .L80240088
-/* E1E4DC 8024007C 00000000 */   nop
-/* E1E4E0 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* E1E4E4 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* E1E4E8 80240088 44822000 */  mtc1      $v0, $f4
-/* E1E4EC 8024008C 00000000 */  nop
-/* E1E4F0 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* E1E4F4 80240094 44062000 */  mfc1      $a2, $f4
-/* E1E4F8 80240098 44872000 */  mtc1      $a3, $f4
-/* E1E4FC 8024009C 00000000 */  nop
-/* E1E500 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* E1E504 802400A4 44806000 */  mtc1      $zero, $f12
-/* E1E508 802400A8 44072000 */  mfc1      $a3, $f4
-/* E1E50C 802400AC 0C00A720 */  jal       atan2
-/* E1E510 802400B0 46006386 */   mov.s    $f14, $f12
-/* E1E514 802400B4 3C014270 */  lui       $at, 0x4270
-/* E1E518 802400B8 44811000 */  mtc1      $at, $f2
-/* E1E51C 802400BC 00000000 */  nop
-/* E1E520 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* E1E524 802400C4 00000000 */  nop
-/* E1E528 802400C8 45000004 */  bc1f      .L802400DC
-/* E1E52C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* E1E530 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* E1E534 802400D4 08090038 */  j         .L802400E0
-/* E1E538 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* E1E53C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* E1E540 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* E1E544 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* E1E548 802400E8 03E00008 */  jr        $ra
-/* E1E54C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240768_A10FE8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240768_A10FE8.s
deleted file mode 100644
index 244237370c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240768_A10FE8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240768_A10FE8
-/* A10FE8 80240768 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A10FEC 8024076C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A10FF0 80240770 8C82000C */  lw        $v0, 0xc($a0)
-/* A10FF4 80240774 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* A10FF8 80240778 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* A10FFC 8024077C 0C0B2026 */  jal       set_variable
-/* A11000 80240780 8C450000 */   lw       $a1, ($v0)
-/* A11004 80240784 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A11008 80240788 24020002 */  addiu     $v0, $zero, 2
-/* A1100C 8024078C 03E00008 */  jr        $ra
-/* A11010 80240790 27BD0018 */   addiu    $sp, $sp, 0x18
-/* A11014 80240794 00000000 */  nop
-/* A11018 80240798 00000000 */  nop
-/* A1101C 8024079C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s
deleted file mode 100644
index 73afe01325..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240DEC_A1166C
-/* A1166C 80240DEC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A11670 80240DF0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A11674 80240DF4 8C82000C */  lw        $v0, 0xc($a0)
-/* A11678 80240DF8 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* A1167C 80240DFC 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* A11680 80240E00 0C0B2026 */  jal       set_variable
-/* A11684 80240E04 8C450000 */   lw       $a1, ($v0)
-/* A11688 80240E08 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1168C 80240E0C 24020002 */  addiu     $v0, $zero, 2
-/* A11690 80240E10 03E00008 */  jr        $ra
-/* A11694 80240E14 27BD0018 */   addiu    $sp, $sp, 0x18
-/* A11698 80240E18 00000000 */  nop
-/* A1169C 80240E1C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242898_A18AB8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242898_A18AB8.s
deleted file mode 100644
index 1271f125a0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242898_A18AB8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242898_A18AB8
-/* A18AB8 80242898 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A18ABC 8024289C AFB10014 */  sw        $s1, 0x14($sp)
-/* A18AC0 802428A0 0080882D */  daddu     $s1, $a0, $zero
-/* A18AC4 802428A4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A18AC8 802428A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* A18ACC 802428AC 8E300148 */  lw        $s0, 0x148($s1)
-/* A18AD0 802428B0 0C00EABB */  jal       get_npc_unsafe
-/* A18AD4 802428B4 86040008 */   lh       $a0, 8($s0)
-/* A18AD8 802428B8 0040182D */  daddu     $v1, $v0, $zero
-/* A18ADC 802428BC 9462008E */  lhu       $v0, 0x8e($v1)
-/* A18AE0 802428C0 2442FFFF */  addiu     $v0, $v0, -1
-/* A18AE4 802428C4 A462008E */  sh        $v0, 0x8e($v1)
-/* A18AE8 802428C8 00021400 */  sll       $v0, $v0, 0x10
-/* A18AEC 802428CC 1C400004 */  bgtz      $v0, .L802428E0
-/* A18AF0 802428D0 00000000 */   nop
-/* A18AF4 802428D4 AE000074 */  sw        $zero, 0x74($s0)
-/* A18AF8 802428D8 A460008E */  sh        $zero, 0x8e($v1)
-/* A18AFC 802428DC AE200070 */  sw        $zero, 0x70($s1)
-.L802428E0:
-/* A18B00 802428E0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A18B04 802428E4 8FB10014 */  lw        $s1, 0x14($sp)
-/* A18B08 802428E8 8FB00010 */  lw        $s0, 0x10($sp)
-/* A18B0C 802428EC 03E00008 */  jr        $ra
-/* A18B10 802428F0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
index f63efc9dd1..02ea5fa0b7 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
@@ -123,7 +123,7 @@ glabel L80242A8C_A18CAC
 glabel L80242AA4_A18CC4
 /* A18CC4 80242AA4 0280202D */  daddu     $a0, $s4, $zero
 /* A18CC8 80242AA8 0200282D */  daddu     $a1, $s0, $zero
-/* A18CCC 80242AAC 0C090A26 */  jal       func_80242898_A18AB8
+/* A18CCC 80242AAC 0C090A26 */  jal       hos_02_UnkFunc45
 /* A18CD0 80242AB0 0260302D */   daddu    $a2, $s3, $zero
 glabel L80242AB4_A18CD4
 /* A18CD4 80242AB4 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B100/func_80240000_A1B100.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B100/func_80240000_A1B100.s
deleted file mode 100644
index 90a3c7c175..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B100/func_80240000_A1B100.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_A1B100
-/* A1B100 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1B104 80240004 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1B108 80240008 8C82000C */  lw        $v0, 0xc($a0)
-/* A1B10C 8024000C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* A1B110 80240010 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* A1B114 80240014 0C0B2026 */  jal       set_variable
-/* A1B118 80240018 8C450000 */   lw       $a1, ($v0)
-/* A1B11C 8024001C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1B120 80240020 24020002 */  addiu     $v0, $zero, 2
-/* A1B124 80240024 03E00008 */  jr        $ra
-/* A1B128 80240028 27BD0018 */   addiu    $sp, $sp, 0x18
-/* A1B12C 8024002C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s
deleted file mode 100644
index d1fc66296e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421F0_A1D2F0
-/* A1D2F0 802421F0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A1D2F4 802421F4 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1D2F8 802421F8 0080882D */  daddu     $s1, $a0, $zero
-/* A1D2FC 802421FC AFBF0018 */  sw        $ra, 0x18($sp)
-/* A1D300 80242200 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1D304 80242204 8E30000C */  lw        $s0, 0xc($s1)
-/* A1D308 80242208 8E050000 */  lw        $a1, ($s0)
-/* A1D30C 8024220C 0C0B1EAF */  jal       get_variable
-/* A1D310 80242210 26100004 */   addiu    $s0, $s0, 4
-/* A1D314 80242214 0220202D */  daddu     $a0, $s1, $zero
-/* A1D318 80242218 8E050000 */  lw        $a1, ($s0)
-/* A1D31C 8024221C 0C0B1EAF */  jal       get_variable
-/* A1D320 80242220 0040882D */   daddu    $s1, $v0, $zero
-/* A1D324 80242224 0000202D */  daddu     $a0, $zero, $zero
-/* A1D328 80242228 0080282D */  daddu     $a1, $a0, $zero
-/* A1D32C 8024222C 0040802D */  daddu     $s0, $v0, $zero
-/* A1D330 80242230 240600BE */  addiu     $a2, $zero, 0xbe
-/* A1D334 80242234 0C04DF93 */  jal       set_transition_stencil_center
-/* A1D338 80242238 24070091 */   addiu    $a3, $zero, 0x91
-/* A1D33C 8024223C 44900000 */  mtc1      $s0, $f0
-/* A1D340 80242240 00000000 */  nop
-/* A1D344 80242244 46800020 */  cvt.s.w   $f0, $f0
-/* A1D348 80242248 44050000 */  mfc1      $a1, $f0
-/* A1D34C 8024224C 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* A1D350 80242250 322400FF */   andi     $a0, $s1, 0xff
-/* A1D354 80242254 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A1D358 80242258 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1D35C 8024225C 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1D360 80242260 24020002 */  addiu     $v0, $zero, 2
-/* A1D364 80242264 03E00008 */  jr        $ra
-/* A1D368 80242268 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s
deleted file mode 100644
index a00fadb692..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024226C_A1D36C
-/* A1D36C 8024226C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A1D370 80242270 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1D374 80242274 0080882D */  daddu     $s1, $a0, $zero
-/* A1D378 80242278 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A1D37C 8024227C AFB00010 */  sw        $s0, 0x10($sp)
-/* A1D380 80242280 8E30000C */  lw        $s0, 0xc($s1)
-/* A1D384 80242284 8E050000 */  lw        $a1, ($s0)
-/* A1D388 80242288 0C0B1EAF */  jal       get_variable
-/* A1D38C 8024228C 26100004 */   addiu    $s0, $s0, 4
-/* A1D390 80242290 0220202D */  daddu     $a0, $s1, $zero
-/* A1D394 80242294 8E050000 */  lw        $a1, ($s0)
-/* A1D398 80242298 0C0B1EAF */  jal       get_variable
-/* A1D39C 8024229C 0040802D */   daddu    $s0, $v0, $zero
-/* A1D3A0 802422A0 44820000 */  mtc1      $v0, $f0
-/* A1D3A4 802422A4 00000000 */  nop
-/* A1D3A8 802422A8 46800020 */  cvt.s.w   $f0, $f0
-/* A1D3AC 802422AC 24020002 */  addiu     $v0, $zero, 2
-/* A1D3B0 802422B0 00501804 */  sllv      $v1, $s0, $v0
-/* A1D3B4 802422B4 00701821 */  addu      $v1, $v1, $s0
-/* A1D3B8 802422B8 00431804 */  sllv      $v1, $v1, $v0
-/* A1D3BC 802422BC 00701823 */  subu      $v1, $v1, $s0
-/* A1D3C0 802422C0 000320C0 */  sll       $a0, $v1, 3
-/* A1D3C4 802422C4 00641821 */  addu      $v1, $v1, $a0
-/* A1D3C8 802422C8 000318C0 */  sll       $v1, $v1, 3
-/* A1D3CC 802422CC 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* A1D3D0 802422D0 00230821 */  addu      $at, $at, $v1
-/* A1D3D4 802422D4 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* A1D3D8 802422D8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A1D3DC 802422DC 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1D3E0 802422E0 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1D3E4 802422E4 03E00008 */  jr        $ra
-/* A1D3E8 802422E8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s
deleted file mode 100644
index d0f2c0b9cb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242368_A1D468
-/* A1D468 80242368 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* A1D46C 8024236C 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* A1D470 80242370 AC800088 */  sw        $zero, 0x88($a0)
-/* A1D474 80242374 80A30003 */  lb        $v1, 3($a1)
-/* A1D478 80242378 80A20002 */  lb        $v0, 2($a1)
-/* A1D47C 8024237C 1462000B */  bne       $v1, $v0, .L802423AC
-/* A1D480 80242380 00A0302D */   daddu    $a2, $a1, $zero
-/* A1D484 80242384 80A30006 */  lb        $v1, 6($a1)
-/* A1D488 80242388 80A20005 */  lb        $v0, 5($a1)
-/* A1D48C 8024238C 14620007 */  bne       $v1, $v0, .L802423AC
-/* A1D490 80242390 00000000 */   nop
-/* A1D494 80242394 80C2028E */  lb        $v0, 0x28e($a2)
-/* A1D498 80242398 84C30290 */  lh        $v1, 0x290($a2)
-/* A1D49C 8024239C 00021200 */  sll       $v0, $v0, 8
-/* A1D4A0 802423A0 14620004 */  bne       $v1, $v0, .L802423B4
-/* A1D4A4 802423A4 24020001 */   addiu    $v0, $zero, 1
-/* A1D4A8 802423A8 AC820088 */  sw        $v0, 0x88($a0)
-.L802423AC:
-/* A1D4AC 802423AC 03E00008 */  jr        $ra
-/* A1D4B0 802423B0 24020002 */   addiu    $v0, $zero, 2
-.L802423B4:
-/* A1D4B4 802423B4 03E00008 */  jr        $ra
-/* A1D4B8 802423B8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s
deleted file mode 100644
index d3e90071b8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802423BC_A1D4BC
-/* A1D4BC 802423BC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A1D4C0 802423C0 AFB10014 */  sw        $s1, 0x14($sp)
-/* A1D4C4 802423C4 0080882D */  daddu     $s1, $a0, $zero
-/* A1D4C8 802423C8 AFBF001C */  sw        $ra, 0x1c($sp)
-/* A1D4CC 802423CC AFB20018 */  sw        $s2, 0x18($sp)
-/* A1D4D0 802423D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1D4D4 802423D4 8E30000C */  lw        $s0, 0xc($s1)
-/* A1D4D8 802423D8 8E050000 */  lw        $a1, ($s0)
-/* A1D4DC 802423DC 0C0B1EAF */  jal       get_variable
-/* A1D4E0 802423E0 26100004 */   addiu    $s0, $s0, 4
-/* A1D4E4 802423E4 8E050000 */  lw        $a1, ($s0)
-/* A1D4E8 802423E8 26100004 */  addiu     $s0, $s0, 4
-/* A1D4EC 802423EC 0220202D */  daddu     $a0, $s1, $zero
-/* A1D4F0 802423F0 0C0B1EAF */  jal       get_variable
-/* A1D4F4 802423F4 0040902D */   daddu    $s2, $v0, $zero
-/* A1D4F8 802423F8 0220202D */  daddu     $a0, $s1, $zero
-/* A1D4FC 802423FC 8E050000 */  lw        $a1, ($s0)
-/* A1D500 80242400 0C0B1EAF */  jal       get_variable
-/* A1D504 80242404 0040802D */   daddu    $s0, $v0, $zero
-/* A1D508 80242408 0000202D */  daddu     $a0, $zero, $zero
-/* A1D50C 8024240C 324500FF */  andi      $a1, $s2, 0xff
-/* A1D510 80242410 320600FF */  andi      $a2, $s0, 0xff
-/* A1D514 80242414 0C04DF84 */  jal       set_transition_stencil_color
-/* A1D518 80242418 304700FF */   andi     $a3, $v0, 0xff
-/* A1D51C 8024241C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* A1D520 80242420 8FB20018 */  lw        $s2, 0x18($sp)
-/* A1D524 80242424 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1D528 80242428 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1D52C 8024242C 24020002 */  addiu     $v0, $zero, 2
-/* A1D530 80242430 03E00008 */  jr        $ra
-/* A1D534 80242434 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C_A1D59C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C_A1D59C.s
deleted file mode 100644
index 4c72aff514..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C_A1D59C.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024249C_A1D59C
-/* A1D59C 8024249C 03E00008 */  jr        $ra
-/* A1D5A0 802424A0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s
deleted file mode 100644
index 56fd04b423..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242804_A1D904
-/* A1D904 80242804 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D908 80242808 AFBF0014 */  sw        $ra, 0x14($sp)
-/* A1D90C 8024280C AFB00010 */  sw        $s0, 0x10($sp)
-/* A1D910 80242810 0C00EABB */  jal       get_npc_unsafe
-/* A1D914 80242814 8C84014C */   lw       $a0, 0x14c($a0)
-/* A1D918 80242818 24040008 */  addiu     $a0, $zero, 8
-/* A1D91C 8024281C 0040802D */  daddu     $s0, $v0, $zero
-/* A1D920 80242820 3C028024 */  lui       $v0, %hi(func_80242870_A1D970)
-/* A1D924 80242824 24422870 */  addiu     $v0, $v0, %lo(func_80242870_A1D970)
-/* A1D928 80242828 0C00AB39 */  jal       heap_malloc
-/* A1D92C 8024282C AE020008 */   sw       $v0, 8($s0)
-/* A1D930 80242830 0040182D */  daddu     $v1, $v0, $zero
-/* A1D934 80242834 AE030020 */  sw        $v1, 0x20($s0)
-/* A1D938 80242838 AC600000 */  sw        $zero, ($v1)
-/* A1D93C 8024283C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A1D940 80242840 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1D944 80242844 24020001 */  addiu     $v0, $zero, 1
-/* A1D948 80242848 03E00008 */  jr        $ra
-/* A1D94C 8024284C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242870_A1D970.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242870_A1D970.s
deleted file mode 100644
index 5293273430..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242870_A1D970.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242870_A1D970
-/* A1D970 80242870 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D974 80242874 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* A1D978 80242878 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* A1D97C 8024287C 3C05800B */  lui       $a1, %hi(gCameras)
-/* A1D980 80242880 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* A1D984 80242884 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A1D988 80242888 00031080 */  sll       $v0, $v1, 2
-/* A1D98C 8024288C 00431021 */  addu      $v0, $v0, $v1
-/* A1D990 80242890 00021080 */  sll       $v0, $v0, 2
-/* A1D994 80242894 00431023 */  subu      $v0, $v0, $v1
-/* A1D998 80242898 000218C0 */  sll       $v1, $v0, 3
-/* A1D99C 8024289C 00431021 */  addu      $v0, $v0, $v1
-/* A1D9A0 802428A0 8C830020 */  lw        $v1, 0x20($a0)
-/* A1D9A4 802428A4 000210C0 */  sll       $v0, $v0, 3
-/* A1D9A8 802428A8 8C630000 */  lw        $v1, ($v1)
-/* A1D9AC 802428AC 30630001 */  andi      $v1, $v1, 1
-/* A1D9B0 802428B0 10600004 */  beqz      $v1, .L802428C4
-/* A1D9B4 802428B4 00451021 */   addu     $v0, $v0, $a1
-/* A1D9B8 802428B8 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* A1D9BC 802428BC 0C00A6C9 */  jal       clamp_angle
-/* A1D9C0 802428C0 46006307 */   neg.s    $f12, $f12
-.L802428C4:
-/* A1D9C4 802428C4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1D9C8 802428C8 03E00008 */  jr        $ra
-/* A1D9CC 802428CC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s
deleted file mode 100644
index aab4b7307b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A1C_A1DB1C
-/* A1DB1C 80242A1C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A1DB20 80242A20 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1DB24 80242A24 0080802D */  daddu     $s0, $a0, $zero
-/* A1DB28 80242A28 AFBF0020 */  sw        $ra, 0x20($sp)
-/* A1DB2C 80242A2C AFB3001C */  sw        $s3, 0x1c($sp)
-/* A1DB30 80242A30 AFB20018 */  sw        $s2, 0x18($sp)
-/* A1DB34 80242A34 10A00009 */  beqz      $a1, .L80242A5C
-/* A1DB38 80242A38 AFB10014 */   sw       $s1, 0x14($sp)
-/* A1DB3C 80242A3C 0000202D */  daddu     $a0, $zero, $zero
-/* A1DB40 80242A40 0080282D */  daddu     $a1, $a0, $zero
-/* A1DB44 80242A44 0080302D */  daddu     $a2, $a0, $zero
-/* A1DB48 80242A48 0C046F97 */  jal       set_background_color_blend
-/* A1DB4C 80242A4C 240700FF */   addiu    $a3, $zero, 0xff
-/* A1DB50 80242A50 240200FF */  addiu     $v0, $zero, 0xff
-/* A1DB54 80242A54 AE020070 */  sw        $v0, 0x70($s0)
-/* A1DB58 80242A58 AE000074 */  sw        $zero, 0x74($s0)
-.L80242A5C:
-/* A1DB5C 80242A5C 8E020070 */  lw        $v0, 0x70($s0)
-/* A1DB60 80242A60 2442FFF8 */  addiu     $v0, $v0, -8
-/* A1DB64 80242A64 04410002 */  bgez      $v0, .L80242A70
-/* A1DB68 80242A68 AE020070 */   sw       $v0, 0x70($s0)
-/* A1DB6C 80242A6C AE000070 */  sw        $zero, 0x70($s0)
-.L80242A70:
-/* A1DB70 80242A70 0000202D */  daddu     $a0, $zero, $zero
-/* A1DB74 80242A74 0080282D */  daddu     $a1, $a0, $zero
-/* A1DB78 80242A78 92070073 */  lbu       $a3, 0x73($s0)
-/* A1DB7C 80242A7C 0C046F97 */  jal       set_background_color_blend
-/* A1DB80 80242A80 0080302D */   daddu    $a2, $a0, $zero
-/* A1DB84 80242A84 8E020070 */  lw        $v0, 0x70($s0)
-/* A1DB88 80242A88 14400006 */  bnez      $v0, .L80242AA4
-/* A1DB8C 80242A8C 00000000 */   nop
-/* A1DB90 80242A90 8E020074 */  lw        $v0, 0x74($s0)
-/* A1DB94 80242A94 14400003 */  bnez      $v0, .L80242AA4
-/* A1DB98 80242A98 24020001 */   addiu    $v0, $zero, 1
-/* A1DB9C 80242A9C 08090ADC */  j         .L80242B70
-/* A1DBA0 80242AA0 AE020074 */   sw       $v0, 0x74($s0)
-.L80242AA4:
-/* A1DBA4 80242AA4 8E030074 */  lw        $v1, 0x74($s0)
-/* A1DBA8 80242AA8 24020001 */  addiu     $v0, $zero, 1
-/* A1DBAC 80242AAC 14620031 */  bne       $v1, $v0, .L80242B74
-/* A1DBB0 80242AB0 0000102D */   daddu    $v0, $zero, $zero
-/* A1DBB4 80242AB4 0C04760B */  jal       func_8011D82C
-/* A1DBB8 80242AB8 0000202D */   daddu    $a0, $zero, $zero
-/* A1DBBC 80242ABC 0000802D */  daddu     $s0, $zero, $zero
-/* A1DBC0 80242AC0 2413FFFC */  addiu     $s3, $zero, -4
-/* A1DBC4 80242AC4 24120007 */  addiu     $s2, $zero, 7
-/* A1DBC8 80242AC8 3C11FF7F */  lui       $s1, 0xff7f
-/* A1DBCC 80242ACC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* A1DBD0 80242AD0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* A1DBD4 80242AD4 3631FFFF */  ori       $s1, $s1, 0xffff
-/* A1DBD8 80242AD8 A0400000 */  sb        $zero, ($v0)
-.L80242ADC:
-/* A1DBDC 80242ADC 0C00E2B7 */  jal       get_npc_by_index
-/* A1DBE0 80242AE0 0200202D */   daddu    $a0, $s0, $zero
-/* A1DBE4 80242AE4 0040202D */  daddu     $a0, $v0, $zero
-/* A1DBE8 80242AE8 5080000B */  beql      $a0, $zero, .L80242B18
-/* A1DBEC 80242AEC 26100001 */   addiu    $s0, $s0, 1
-/* A1DBF0 80242AF0 8C820000 */  lw        $v0, ($a0)
-/* A1DBF4 80242AF4 50400008 */  beql      $v0, $zero, .L80242B18
-/* A1DBF8 80242AF8 26100001 */   addiu    $s0, $s0, 1
-/* A1DBFC 80242AFC 808300A4 */  lb        $v1, 0xa4($a0)
-/* A1DC00 80242B00 10730005 */  beq       $v1, $s3, .L80242B18
-/* A1DC04 80242B04 26100001 */   addiu    $s0, $s0, 1
-/* A1DC08 80242B08 10720003 */  beq       $v1, $s2, .L80242B18
-/* A1DC0C 80242B0C 00000000 */   nop
-/* A1DC10 80242B10 00511024 */  and       $v0, $v0, $s1
-/* A1DC14 80242B14 AC820000 */  sw        $v0, ($a0)
-.L80242B18:
-/* A1DC18 80242B18 2A020040 */  slti      $v0, $s0, 0x40
-/* A1DC1C 80242B1C 1440FFEF */  bnez      $v0, .L80242ADC
-/* A1DC20 80242B20 00000000 */   nop
-/* A1DC24 80242B24 0000802D */  daddu     $s0, $zero, $zero
-/* A1DC28 80242B28 3C11F7FF */  lui       $s1, 0xf7ff
-/* A1DC2C 80242B2C 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80242B30:
-/* A1DC30 80242B30 0C04C3D6 */  jal       get_item_entity
-/* A1DC34 80242B34 0200202D */   daddu    $a0, $s0, $zero
-/* A1DC38 80242B38 0040182D */  daddu     $v1, $v0, $zero
-/* A1DC3C 80242B3C 10600007 */  beqz      $v1, .L80242B5C
-/* A1DC40 80242B40 26100001 */   addiu    $s0, $s0, 1
-/* A1DC44 80242B44 8C640000 */  lw        $a0, ($v1)
-/* A1DC48 80242B48 30820010 */  andi      $v0, $a0, 0x10
-/* A1DC4C 80242B4C 10400003 */  beqz      $v0, .L80242B5C
-/* A1DC50 80242B50 00000000 */   nop
-/* A1DC54 80242B54 00911024 */  and       $v0, $a0, $s1
-/* A1DC58 80242B58 AC620000 */  sw        $v0, ($v1)
-.L80242B5C:
-/* A1DC5C 80242B5C 2A020100 */  slti      $v0, $s0, 0x100
-/* A1DC60 80242B60 1440FFF3 */  bnez      $v0, .L80242B30
-/* A1DC64 80242B64 24020002 */   addiu    $v0, $zero, 2
-/* A1DC68 80242B68 08090ADD */  j         .L80242B74
-/* A1DC6C 80242B6C 00000000 */   nop
-.L80242B70:
-/* A1DC70 80242B70 0000102D */  daddu     $v0, $zero, $zero
-.L80242B74:
-/* A1DC74 80242B74 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A1DC78 80242B78 8FB3001C */  lw        $s3, 0x1c($sp)
-/* A1DC7C 80242B7C 8FB20018 */  lw        $s2, 0x18($sp)
-/* A1DC80 80242B80 8FB10014 */  lw        $s1, 0x14($sp)
-/* A1DC84 80242B84 8FB00010 */  lw        $s0, 0x10($sp)
-/* A1DC88 80242B88 03E00008 */  jr        $ra
-/* A1DC8C 80242B8C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s
deleted file mode 100644
index 06a83c95cd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_A2A240
-/* A2A240 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A2A244 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* A2A248 80240008 0080882D */  daddu     $s1, $a0, $zero
-/* A2A24C 8024000C AFBF001C */  sw        $ra, 0x1c($sp)
-/* A2A250 80240010 AFB20018 */  sw        $s2, 0x18($sp)
-/* A2A254 80240014 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2A258 80240018 8E30000C */  lw        $s0, 0xc($s1)
-/* A2A25C 8024001C 8E050000 */  lw        $a1, ($s0)
-/* A2A260 80240020 0C0B1EAF */  jal       get_variable
-/* A2A264 80240024 26100004 */   addiu    $s0, $s0, 4
-/* A2A268 80240028 8E050000 */  lw        $a1, ($s0)
-/* A2A26C 8024002C 26100004 */  addiu     $s0, $s0, 4
-/* A2A270 80240030 0220202D */  daddu     $a0, $s1, $zero
-/* A2A274 80240034 0C0B1EAF */  jal       get_variable
-/* A2A278 80240038 0040902D */   daddu    $s2, $v0, $zero
-/* A2A27C 8024003C 0220202D */  daddu     $a0, $s1, $zero
-/* A2A280 80240040 8E050000 */  lw        $a1, ($s0)
-/* A2A284 80240044 0C0B1EAF */  jal       get_variable
-/* A2A288 80240048 0040802D */   daddu    $s0, $v0, $zero
-/* A2A28C 8024004C 0040882D */  daddu     $s1, $v0, $zero
-/* A2A290 80240050 2402FFFF */  addiu     $v0, $zero, -1
-/* A2A294 80240054 16020005 */  bne       $s0, $v0, .L8024006C
-/* A2A298 80240058 24020001 */   addiu    $v0, $zero, 1
-/* A2A29C 8024005C 0C04760B */  jal       func_8011D82C
-/* A2A2A0 80240060 0220202D */   daddu    $a0, $s1, $zero
-/* A2A2A4 80240064 08090043 */  j         .L8024010C
-/* A2A2A8 80240068 24020002 */   addiu    $v0, $zero, 2
-.L8024006C:
-/* A2A2AC 8024006C 12420018 */  beq       $s2, $v0, .L802400D0
-/* A2A2B0 80240070 2A420002 */   slti     $v0, $s2, 2
-/* A2A2B4 80240074 10400005 */  beqz      $v0, .L8024008C
-/* A2A2B8 80240078 24020002 */   addiu    $v0, $zero, 2
-/* A2A2BC 8024007C 12400007 */  beqz      $s2, .L8024009C
-/* A2A2C0 80240080 3412FFFF */   ori      $s2, $zero, 0xffff
-/* A2A2C4 80240084 08090043 */  j         .L8024010C
-/* A2A2C8 80240088 00000000 */   nop
-.L8024008C:
-/* A2A2CC 8024008C 1242001B */  beq       $s2, $v0, .L802400FC
-/* A2A2D0 80240090 24020002 */   addiu    $v0, $zero, 2
-/* A2A2D4 80240094 08090043 */  j         .L8024010C
-/* A2A2D8 80240098 00000000 */   nop
-.L8024009C:
-/* A2A2DC 8024009C 8E040000 */  lw        $a0, ($s0)
-/* A2A2E0 802400A0 1092001A */  beq       $a0, $s2, .L8024010C
-/* A2A2E4 802400A4 24020002 */   addiu    $v0, $zero, 2
-/* A2A2E8 802400A8 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* A2A2EC 802400AC 26100004 */   addiu    $s0, $s0, 4
-/* A2A2F0 802400B0 0C046B4C */  jal       get_model_from_list_index
-/* A2A2F4 802400B4 0040202D */   daddu    $a0, $v0, $zero
-/* A2A2F8 802400B8 0040202D */  daddu     $a0, $v0, $zero
-/* A2A2FC 802400BC 2405FFFF */  addiu     $a1, $zero, -1
-/* A2A300 802400C0 0C046F1F */  jal       func_8011BC7C
-/* A2A304 802400C4 0220302D */   daddu    $a2, $s1, $zero
-/* A2A308 802400C8 08090027 */  j         .L8024009C
-/* A2A30C 802400CC 00000000 */   nop
-.L802400D0:
-/* A2A310 802400D0 3412FFFF */  ori       $s2, $zero, 0xffff
-.L802400D4:
-/* A2A314 802400D4 8E020000 */  lw        $v0, ($s0)
-/* A2A318 802400D8 1052000B */  beq       $v0, $s2, .L80240108
-/* A2A31C 802400DC 2405FFFF */   addiu    $a1, $zero, -1
-/* A2A320 802400E0 96040002 */  lhu       $a0, 2($s0)
-/* A2A324 802400E4 0220302D */  daddu     $a2, $s1, $zero
-/* A2A328 802400E8 26100004 */  addiu     $s0, $s0, 4
-/* A2A32C 802400EC 0C046E54 */  jal       func_8011B950
-/* A2A330 802400F0 0000382D */   daddu    $a3, $zero, $zero
-/* A2A334 802400F4 08090035 */  j         .L802400D4
-/* A2A338 802400F8 00000000 */   nop
-.L802400FC:
-/* A2A33C 802400FC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* A2A340 80240100 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* A2A344 80240104 A0510000 */  sb        $s1, ($v0)
-.L80240108:
-/* A2A348 80240108 24020002 */  addiu     $v0, $zero, 2
-.L8024010C:
-/* A2A34C 8024010C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* A2A350 80240110 8FB20018 */  lw        $s2, 0x18($sp)
-/* A2A354 80240114 8FB10014 */  lw        $s1, 0x14($sp)
-/* A2A358 80240118 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2A35C 8024011C 03E00008 */  jr        $ra
-/* A2A360 80240120 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240124_A2A364.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240124_A2A364.s
deleted file mode 100644
index 13d14231f7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240124_A2A364.s
+++ /dev/null
@@ -1,126 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240124_A2A364
-/* A2A364 80240124 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* A2A368 80240128 AFB10034 */  sw        $s1, 0x34($sp)
-/* A2A36C 8024012C 0080882D */  daddu     $s1, $a0, $zero
-/* A2A370 80240130 AFBF0054 */  sw        $ra, 0x54($sp)
-/* A2A374 80240134 AFBE0050 */  sw        $fp, 0x50($sp)
-/* A2A378 80240138 AFB7004C */  sw        $s7, 0x4c($sp)
-/* A2A37C 8024013C AFB60048 */  sw        $s6, 0x48($sp)
-/* A2A380 80240140 AFB50044 */  sw        $s5, 0x44($sp)
-/* A2A384 80240144 AFB40040 */  sw        $s4, 0x40($sp)
-/* A2A388 80240148 AFB3003C */  sw        $s3, 0x3c($sp)
-/* A2A38C 8024014C AFB20038 */  sw        $s2, 0x38($sp)
-/* A2A390 80240150 AFB00030 */  sw        $s0, 0x30($sp)
-/* A2A394 80240154 8E30000C */  lw        $s0, 0xc($s1)
-/* A2A398 80240158 8E050000 */  lw        $a1, ($s0)
-/* A2A39C 8024015C 0C0B1EAF */  jal       get_variable
-/* A2A3A0 80240160 26100004 */   addiu    $s0, $s0, 4
-/* A2A3A4 80240164 8E050000 */  lw        $a1, ($s0)
-/* A2A3A8 80240168 26100004 */  addiu     $s0, $s0, 4
-/* A2A3AC 8024016C 0220202D */  daddu     $a0, $s1, $zero
-/* A2A3B0 80240170 0C0B1EAF */  jal       get_variable
-/* A2A3B4 80240174 0040982D */   daddu    $s3, $v0, $zero
-/* A2A3B8 80240178 8E050000 */  lw        $a1, ($s0)
-/* A2A3BC 8024017C 26100004 */  addiu     $s0, $s0, 4
-/* A2A3C0 80240180 0220202D */  daddu     $a0, $s1, $zero
-/* A2A3C4 80240184 0C0B1EAF */  jal       get_variable
-/* A2A3C8 80240188 0040B02D */   daddu    $s6, $v0, $zero
-/* A2A3CC 8024018C 8E050000 */  lw        $a1, ($s0)
-/* A2A3D0 80240190 26100004 */  addiu     $s0, $s0, 4
-/* A2A3D4 80240194 0220202D */  daddu     $a0, $s1, $zero
-/* A2A3D8 80240198 0C0B1EAF */  jal       get_variable
-/* A2A3DC 8024019C 0040A82D */   daddu    $s5, $v0, $zero
-/* A2A3E0 802401A0 8E050000 */  lw        $a1, ($s0)
-/* A2A3E4 802401A4 26100004 */  addiu     $s0, $s0, 4
-/* A2A3E8 802401A8 0220202D */  daddu     $a0, $s1, $zero
-/* A2A3EC 802401AC 0C0B1EAF */  jal       get_variable
-/* A2A3F0 802401B0 0040A02D */   daddu    $s4, $v0, $zero
-/* A2A3F4 802401B4 8E050000 */  lw        $a1, ($s0)
-/* A2A3F8 802401B8 26100004 */  addiu     $s0, $s0, 4
-/* A2A3FC 802401BC 0220202D */  daddu     $a0, $s1, $zero
-/* A2A400 802401C0 0C0B1EAF */  jal       get_variable
-/* A2A404 802401C4 0040902D */   daddu    $s2, $v0, $zero
-/* A2A408 802401C8 8E050000 */  lw        $a1, ($s0)
-/* A2A40C 802401CC 26100004 */  addiu     $s0, $s0, 4
-/* A2A410 802401D0 0220202D */  daddu     $a0, $s1, $zero
-/* A2A414 802401D4 0C0B1EAF */  jal       get_variable
-/* A2A418 802401D8 AFA20028 */   sw       $v0, 0x28($sp)
-/* A2A41C 802401DC 8E050000 */  lw        $a1, ($s0)
-/* A2A420 802401E0 26100004 */  addiu     $s0, $s0, 4
-/* A2A424 802401E4 0220202D */  daddu     $a0, $s1, $zero
-/* A2A428 802401E8 0C0B1EAF */  jal       get_variable
-/* A2A42C 802401EC 0040F02D */   daddu    $fp, $v0, $zero
-/* A2A430 802401F0 8E050000 */  lw        $a1, ($s0)
-/* A2A434 802401F4 26100004 */  addiu     $s0, $s0, 4
-/* A2A438 802401F8 0220202D */  daddu     $a0, $s1, $zero
-/* A2A43C 802401FC 0C0B1EAF */  jal       get_variable
-/* A2A440 80240200 0040B82D */   daddu    $s7, $v0, $zero
-/* A2A444 80240204 0220202D */  daddu     $a0, $s1, $zero
-/* A2A448 80240208 8E050000 */  lw        $a1, ($s0)
-/* A2A44C 8024020C 0C0B1EAF */  jal       get_variable
-/* A2A450 80240210 0040802D */   daddu    $s0, $v0, $zero
-/* A2A454 80240214 0040182D */  daddu     $v1, $v0, $zero
-/* A2A458 80240218 24020002 */  addiu     $v0, $zero, 2
-/* A2A45C 8024021C 12620012 */  beq       $s3, $v0, .L80240268
-/* A2A460 80240220 2A620003 */   slti     $v0, $s3, 3
-/* A2A464 80240224 10400005 */  beqz      $v0, .L8024023C
-/* A2A468 80240228 24020001 */   addiu    $v0, $zero, 1
-/* A2A46C 8024022C 12620008 */  beq       $s3, $v0, .L80240250
-/* A2A470 80240230 32C400FF */   andi     $a0, $s6, 0xff
-/* A2A474 80240234 080900B1 */  j         .L802402C4
-/* A2A478 80240238 00000000 */   nop
-.L8024023C:
-/* A2A47C 8024023C 24020003 */  addiu     $v0, $zero, 3
-/* A2A480 80240240 12620018 */  beq       $s3, $v0, .L802402A4
-/* A2A484 80240244 32C400FF */   andi     $a0, $s6, 0xff
-/* A2A488 80240248 080900B1 */  j         .L802402C4
-/* A2A48C 8024024C 00000000 */   nop
-.L80240250:
-/* A2A490 80240250 32A500FF */  andi      $a1, $s5, 0xff
-/* A2A494 80240254 328600FF */  andi      $a2, $s4, 0xff
-/* A2A498 80240258 0C046F97 */  jal       set_background_color_blend
-/* A2A49C 8024025C 324700FF */   andi     $a3, $s2, 0xff
-/* A2A4A0 80240260 080900B1 */  j         .L802402C4
-/* A2A4A4 80240264 00000000 */   nop
-.L80240268:
-/* A2A4A8 80240268 32C400FF */  andi      $a0, $s6, 0xff
-/* A2A4AC 8024026C 32A500FF */  andi      $a1, $s5, 0xff
-/* A2A4B0 80240270 328600FF */  andi      $a2, $s4, 0xff
-/* A2A4B4 80240274 324700FF */  andi      $a3, $s2, 0xff
-/* A2A4B8 80240278 93A2002B */  lbu       $v0, 0x2b($sp)
-/* A2A4BC 8024027C AFB0001C */  sw        $s0, 0x1c($sp)
-/* A2A4C0 80240280 AFA30020 */  sw        $v1, 0x20($sp)
-/* A2A4C4 80240284 AFA20010 */  sw        $v0, 0x10($sp)
-/* A2A4C8 80240288 33C200FF */  andi      $v0, $fp, 0xff
-/* A2A4CC 8024028C AFA20014 */  sw        $v0, 0x14($sp)
-/* A2A4D0 80240290 32E200FF */  andi      $v0, $s7, 0xff
-/* A2A4D4 80240294 0C046FAD */  jal       func_8011BEB4
-/* A2A4D8 80240298 AFA20018 */   sw       $v0, 0x18($sp)
-/* A2A4DC 8024029C 080900B1 */  j         .L802402C4
-/* A2A4E0 802402A0 00000000 */   nop
-.L802402A4:
-/* A2A4E4 802402A4 32A500FF */  andi      $a1, $s5, 0xff
-/* A2A4E8 802402A8 328600FF */  andi      $a2, $s4, 0xff
-/* A2A4EC 802402AC 324700FF */  andi      $a3, $s2, 0xff
-/* A2A4F0 802402B0 93A2002B */  lbu       $v0, 0x2b($sp)
-/* A2A4F4 802402B4 AFA20010 */  sw        $v0, 0x10($sp)
-/* A2A4F8 802402B8 33C200FF */  andi      $v0, $fp, 0xff
-/* A2A4FC 802402BC 0C046FE6 */  jal       func_8011BF98
-/* A2A500 802402C0 AFA20014 */   sw       $v0, 0x14($sp)
-.L802402C4:
-/* A2A504 802402C4 8FBF0054 */  lw        $ra, 0x54($sp)
-/* A2A508 802402C8 8FBE0050 */  lw        $fp, 0x50($sp)
-/* A2A50C 802402CC 8FB7004C */  lw        $s7, 0x4c($sp)
-/* A2A510 802402D0 8FB60048 */  lw        $s6, 0x48($sp)
-/* A2A514 802402D4 8FB50044 */  lw        $s5, 0x44($sp)
-/* A2A518 802402D8 8FB40040 */  lw        $s4, 0x40($sp)
-/* A2A51C 802402DC 8FB3003C */  lw        $s3, 0x3c($sp)
-/* A2A520 802402E0 8FB20038 */  lw        $s2, 0x38($sp)
-/* A2A524 802402E4 8FB10034 */  lw        $s1, 0x34($sp)
-/* A2A528 802402E8 8FB00030 */  lw        $s0, 0x30($sp)
-/* A2A52C 802402EC 24020002 */  addiu     $v0, $zero, 2
-/* A2A530 802402F0 03E00008 */  jr        $ra
-/* A2A534 802402F4 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s
deleted file mode 100644
index cb9e408cea..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s
+++ /dev/null
@@ -1,126 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244DE4_A2F024
-/* A2F024 80244DE4 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* A2F028 80244DE8 AFB10034 */  sw        $s1, 0x34($sp)
-/* A2F02C 80244DEC 0080882D */  daddu     $s1, $a0, $zero
-/* A2F030 80244DF0 AFBF0054 */  sw        $ra, 0x54($sp)
-/* A2F034 80244DF4 AFBE0050 */  sw        $fp, 0x50($sp)
-/* A2F038 80244DF8 AFB7004C */  sw        $s7, 0x4c($sp)
-/* A2F03C 80244DFC AFB60048 */  sw        $s6, 0x48($sp)
-/* A2F040 80244E00 AFB50044 */  sw        $s5, 0x44($sp)
-/* A2F044 80244E04 AFB40040 */  sw        $s4, 0x40($sp)
-/* A2F048 80244E08 AFB3003C */  sw        $s3, 0x3c($sp)
-/* A2F04C 80244E0C AFB20038 */  sw        $s2, 0x38($sp)
-/* A2F050 80244E10 AFB00030 */  sw        $s0, 0x30($sp)
-/* A2F054 80244E14 8E30000C */  lw        $s0, 0xc($s1)
-/* A2F058 80244E18 8E050000 */  lw        $a1, ($s0)
-/* A2F05C 80244E1C 0C0B1EAF */  jal       get_variable
-/* A2F060 80244E20 26100004 */   addiu    $s0, $s0, 4
-/* A2F064 80244E24 8E050000 */  lw        $a1, ($s0)
-/* A2F068 80244E28 26100004 */  addiu     $s0, $s0, 4
-/* A2F06C 80244E2C 0220202D */  daddu     $a0, $s1, $zero
-/* A2F070 80244E30 0C0B1EAF */  jal       get_variable
-/* A2F074 80244E34 0040982D */   daddu    $s3, $v0, $zero
-/* A2F078 80244E38 8E050000 */  lw        $a1, ($s0)
-/* A2F07C 80244E3C 26100004 */  addiu     $s0, $s0, 4
-/* A2F080 80244E40 0220202D */  daddu     $a0, $s1, $zero
-/* A2F084 80244E44 0C0B1EAF */  jal       get_variable
-/* A2F088 80244E48 0040B02D */   daddu    $s6, $v0, $zero
-/* A2F08C 80244E4C 8E050000 */  lw        $a1, ($s0)
-/* A2F090 80244E50 26100004 */  addiu     $s0, $s0, 4
-/* A2F094 80244E54 0220202D */  daddu     $a0, $s1, $zero
-/* A2F098 80244E58 0C0B1EAF */  jal       get_variable
-/* A2F09C 80244E5C 0040A82D */   daddu    $s5, $v0, $zero
-/* A2F0A0 80244E60 8E050000 */  lw        $a1, ($s0)
-/* A2F0A4 80244E64 26100004 */  addiu     $s0, $s0, 4
-/* A2F0A8 80244E68 0220202D */  daddu     $a0, $s1, $zero
-/* A2F0AC 80244E6C 0C0B1EAF */  jal       get_variable
-/* A2F0B0 80244E70 0040A02D */   daddu    $s4, $v0, $zero
-/* A2F0B4 80244E74 8E050000 */  lw        $a1, ($s0)
-/* A2F0B8 80244E78 26100004 */  addiu     $s0, $s0, 4
-/* A2F0BC 80244E7C 0220202D */  daddu     $a0, $s1, $zero
-/* A2F0C0 80244E80 0C0B1EAF */  jal       get_variable
-/* A2F0C4 80244E84 0040902D */   daddu    $s2, $v0, $zero
-/* A2F0C8 80244E88 8E050000 */  lw        $a1, ($s0)
-/* A2F0CC 80244E8C 26100004 */  addiu     $s0, $s0, 4
-/* A2F0D0 80244E90 0220202D */  daddu     $a0, $s1, $zero
-/* A2F0D4 80244E94 0C0B1EAF */  jal       get_variable
-/* A2F0D8 80244E98 AFA20028 */   sw       $v0, 0x28($sp)
-/* A2F0DC 80244E9C 8E050000 */  lw        $a1, ($s0)
-/* A2F0E0 80244EA0 26100004 */  addiu     $s0, $s0, 4
-/* A2F0E4 80244EA4 0220202D */  daddu     $a0, $s1, $zero
-/* A2F0E8 80244EA8 0C0B1EAF */  jal       get_variable
-/* A2F0EC 80244EAC 0040F02D */   daddu    $fp, $v0, $zero
-/* A2F0F0 80244EB0 8E050000 */  lw        $a1, ($s0)
-/* A2F0F4 80244EB4 26100004 */  addiu     $s0, $s0, 4
-/* A2F0F8 80244EB8 0220202D */  daddu     $a0, $s1, $zero
-/* A2F0FC 80244EBC 0C0B1EAF */  jal       get_variable
-/* A2F100 80244EC0 0040B82D */   daddu    $s7, $v0, $zero
-/* A2F104 80244EC4 0220202D */  daddu     $a0, $s1, $zero
-/* A2F108 80244EC8 8E050000 */  lw        $a1, ($s0)
-/* A2F10C 80244ECC 0C0B1EAF */  jal       get_variable
-/* A2F110 80244ED0 0040802D */   daddu    $s0, $v0, $zero
-/* A2F114 80244ED4 0040182D */  daddu     $v1, $v0, $zero
-/* A2F118 80244ED8 24020002 */  addiu     $v0, $zero, 2
-/* A2F11C 80244EDC 12620012 */  beq       $s3, $v0, .L80244F28
-/* A2F120 80244EE0 2A620003 */   slti     $v0, $s3, 3
-/* A2F124 80244EE4 10400005 */  beqz      $v0, .L80244EFC
-/* A2F128 80244EE8 24020001 */   addiu    $v0, $zero, 1
-/* A2F12C 80244EEC 12620008 */  beq       $s3, $v0, .L80244F10
-/* A2F130 80244EF0 32C400FF */   andi     $a0, $s6, 0xff
-/* A2F134 80244EF4 080913E1 */  j         .L80244F84
-/* A2F138 80244EF8 00000000 */   nop
-.L80244EFC:
-/* A2F13C 80244EFC 24020003 */  addiu     $v0, $zero, 3
-/* A2F140 80244F00 12620018 */  beq       $s3, $v0, .L80244F64
-/* A2F144 80244F04 32C400FF */   andi     $a0, $s6, 0xff
-/* A2F148 80244F08 080913E1 */  j         .L80244F84
-/* A2F14C 80244F0C 00000000 */   nop
-.L80244F10:
-/* A2F150 80244F10 32A500FF */  andi      $a1, $s5, 0xff
-/* A2F154 80244F14 328600FF */  andi      $a2, $s4, 0xff
-/* A2F158 80244F18 0C046F97 */  jal       set_background_color_blend
-/* A2F15C 80244F1C 324700FF */   andi     $a3, $s2, 0xff
-/* A2F160 80244F20 080913E1 */  j         .L80244F84
-/* A2F164 80244F24 00000000 */   nop
-.L80244F28:
-/* A2F168 80244F28 32C400FF */  andi      $a0, $s6, 0xff
-/* A2F16C 80244F2C 32A500FF */  andi      $a1, $s5, 0xff
-/* A2F170 80244F30 328600FF */  andi      $a2, $s4, 0xff
-/* A2F174 80244F34 324700FF */  andi      $a3, $s2, 0xff
-/* A2F178 80244F38 93A2002B */  lbu       $v0, 0x2b($sp)
-/* A2F17C 80244F3C AFB0001C */  sw        $s0, 0x1c($sp)
-/* A2F180 80244F40 AFA30020 */  sw        $v1, 0x20($sp)
-/* A2F184 80244F44 AFA20010 */  sw        $v0, 0x10($sp)
-/* A2F188 80244F48 33C200FF */  andi      $v0, $fp, 0xff
-/* A2F18C 80244F4C AFA20014 */  sw        $v0, 0x14($sp)
-/* A2F190 80244F50 32E200FF */  andi      $v0, $s7, 0xff
-/* A2F194 80244F54 0C046FAD */  jal       func_8011BEB4
-/* A2F198 80244F58 AFA20018 */   sw       $v0, 0x18($sp)
-/* A2F19C 80244F5C 080913E1 */  j         .L80244F84
-/* A2F1A0 80244F60 00000000 */   nop
-.L80244F64:
-/* A2F1A4 80244F64 32A500FF */  andi      $a1, $s5, 0xff
-/* A2F1A8 80244F68 328600FF */  andi      $a2, $s4, 0xff
-/* A2F1AC 80244F6C 324700FF */  andi      $a3, $s2, 0xff
-/* A2F1B0 80244F70 93A2002B */  lbu       $v0, 0x2b($sp)
-/* A2F1B4 80244F74 AFA20010 */  sw        $v0, 0x10($sp)
-/* A2F1B8 80244F78 33C200FF */  andi      $v0, $fp, 0xff
-/* A2F1BC 80244F7C 0C046FE6 */  jal       func_8011BF98
-/* A2F1C0 80244F80 AFA20014 */   sw       $v0, 0x14($sp)
-.L80244F84:
-/* A2F1C4 80244F84 8FBF0054 */  lw        $ra, 0x54($sp)
-/* A2F1C8 80244F88 8FBE0050 */  lw        $fp, 0x50($sp)
-/* A2F1CC 80244F8C 8FB7004C */  lw        $s7, 0x4c($sp)
-/* A2F1D0 80244F90 8FB60048 */  lw        $s6, 0x48($sp)
-/* A2F1D4 80244F94 8FB50044 */  lw        $s5, 0x44($sp)
-/* A2F1D8 80244F98 8FB40040 */  lw        $s4, 0x40($sp)
-/* A2F1DC 80244F9C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* A2F1E0 80244FA0 8FB20038 */  lw        $s2, 0x38($sp)
-/* A2F1E4 80244FA4 8FB10034 */  lw        $s1, 0x34($sp)
-/* A2F1E8 80244FA8 8FB00030 */  lw        $s0, 0x30($sp)
-/* A2F1EC 80244FAC 24020002 */  addiu     $v0, $zero, 2
-/* A2F1F0 80244FB0 03E00008 */  jr        $ra
-/* A2F1F4 80244FB4 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s
deleted file mode 100644
index 2b089103f8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel pause_tabs_draw_badges_A2EF00
-/* A2EF00 80244CC0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A2EF04 80244CC4 AFB10014 */  sw        $s1, 0x14($sp)
-/* A2EF08 80244CC8 0080882D */  daddu     $s1, $a0, $zero
-/* A2EF0C 80244CCC AFBF001C */  sw        $ra, 0x1c($sp)
-/* A2EF10 80244CD0 AFB20018 */  sw        $s2, 0x18($sp)
-/* A2EF14 80244CD4 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2EF18 80244CD8 8E30000C */  lw        $s0, 0xc($s1)
-/* A2EF1C 80244CDC 8E050000 */  lw        $a1, ($s0)
-/* A2EF20 80244CE0 0C0B1EAF */  jal       get_variable
-/* A2EF24 80244CE4 26100004 */   addiu    $s0, $s0, 4
-/* A2EF28 80244CE8 8E050000 */  lw        $a1, ($s0)
-/* A2EF2C 80244CEC 26100004 */  addiu     $s0, $s0, 4
-/* A2EF30 80244CF0 0220202D */  daddu     $a0, $s1, $zero
-/* A2EF34 80244CF4 0C0B1EAF */  jal       get_variable
-/* A2EF38 80244CF8 0040902D */   daddu    $s2, $v0, $zero
-/* A2EF3C 80244CFC 0220202D */  daddu     $a0, $s1, $zero
-/* A2EF40 80244D00 8E050000 */  lw        $a1, ($s0)
-/* A2EF44 80244D04 0C0B1EAF */  jal       get_variable
-/* A2EF48 80244D08 0040802D */   daddu    $s0, $v0, $zero
-/* A2EF4C 80244D0C 0040882D */  daddu     $s1, $v0, $zero
-/* A2EF50 80244D10 2402FFFF */  addiu     $v0, $zero, -1
-/* A2EF54 80244D14 16020005 */  bne       $s0, $v0, .L80244D2C
-/* A2EF58 80244D18 24020001 */   addiu    $v0, $zero, 1
-/* A2EF5C 80244D1C 0C04760B */  jal       func_8011D82C
-/* A2EF60 80244D20 0220202D */   daddu    $a0, $s1, $zero
-/* A2EF64 80244D24 08091373 */  j         .L80244DCC
-/* A2EF68 80244D28 24020002 */   addiu    $v0, $zero, 2
-.L80244D2C:
-/* A2EF6C 80244D2C 12420018 */  beq       $s2, $v0, .L80244D90
-/* A2EF70 80244D30 2A420002 */   slti     $v0, $s2, 2
-/* A2EF74 80244D34 10400005 */  beqz      $v0, .L80244D4C
-/* A2EF78 80244D38 24020002 */   addiu    $v0, $zero, 2
-/* A2EF7C 80244D3C 12400007 */  beqz      $s2, .L80244D5C
-/* A2EF80 80244D40 3412FFFF */   ori      $s2, $zero, 0xffff
-/* A2EF84 80244D44 08091373 */  j         .L80244DCC
-/* A2EF88 80244D48 00000000 */   nop
-.L80244D4C:
-/* A2EF8C 80244D4C 1242001B */  beq       $s2, $v0, .L80244DBC
-/* A2EF90 80244D50 24020002 */   addiu    $v0, $zero, 2
-/* A2EF94 80244D54 08091373 */  j         .L80244DCC
-/* A2EF98 80244D58 00000000 */   nop
-.L80244D5C:
-/* A2EF9C 80244D5C 8E040000 */  lw        $a0, ($s0)
-/* A2EFA0 80244D60 1092001A */  beq       $a0, $s2, .L80244DCC
-/* A2EFA4 80244D64 24020002 */   addiu    $v0, $zero, 2
-/* A2EFA8 80244D68 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* A2EFAC 80244D6C 26100004 */   addiu    $s0, $s0, 4
-/* A2EFB0 80244D70 0C046B4C */  jal       get_model_from_list_index
-/* A2EFB4 80244D74 0040202D */   daddu    $a0, $v0, $zero
-/* A2EFB8 80244D78 0040202D */  daddu     $a0, $v0, $zero
-/* A2EFBC 80244D7C 2405FFFF */  addiu     $a1, $zero, -1
-/* A2EFC0 80244D80 0C046F1F */  jal       func_8011BC7C
-/* A2EFC4 80244D84 0220302D */   daddu    $a2, $s1, $zero
-/* A2EFC8 80244D88 08091357 */  j         .L80244D5C
-/* A2EFCC 80244D8C 00000000 */   nop
-.L80244D90:
-/* A2EFD0 80244D90 3412FFFF */  ori       $s2, $zero, 0xffff
-.L80244D94:
-/* A2EFD4 80244D94 8E020000 */  lw        $v0, ($s0)
-/* A2EFD8 80244D98 1052000B */  beq       $v0, $s2, .L80244DC8
-/* A2EFDC 80244D9C 2405FFFF */   addiu    $a1, $zero, -1
-/* A2EFE0 80244DA0 96040002 */  lhu       $a0, 2($s0)
-/* A2EFE4 80244DA4 0220302D */  daddu     $a2, $s1, $zero
-/* A2EFE8 80244DA8 26100004 */  addiu     $s0, $s0, 4
-/* A2EFEC 80244DAC 0C046E54 */  jal       func_8011B950
-/* A2EFF0 80244DB0 0000382D */   daddu    $a3, $zero, $zero
-/* A2EFF4 80244DB4 08091365 */  j         .L80244D94
-/* A2EFF8 80244DB8 00000000 */   nop
-.L80244DBC:
-/* A2EFFC 80244DBC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* A2F000 80244DC0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* A2F004 80244DC4 A0510000 */  sb        $s1, ($v0)
-.L80244DC8:
-/* A2F008 80244DC8 24020002 */  addiu     $v0, $zero, 2
-.L80244DCC:
-/* A2F00C 80244DCC 8FBF001C */  lw        $ra, 0x1c($sp)
-/* A2F010 80244DD0 8FB20018 */  lw        $s2, 0x18($sp)
-/* A2F014 80244DD4 8FB10014 */  lw        $s1, 0x14($sp)
-/* A2F018 80244DD8 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2F01C 80244DDC 03E00008 */  jr        $ra
-/* A2F020 80244DE0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s
deleted file mode 100644
index e27f00a73b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400D4_988C34
-/* 988C34 802400D4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 988C38 802400D8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 988C3C 802400DC 000420C0 */  sll       $a0, $a0, 3
-/* 988C40 802400E0 00822021 */  addu      $a0, $a0, $v0
-/* 988C44 802400E4 90820014 */  lbu       $v0, 0x14($a0)
-/* 988C48 802400E8 10400009 */  beqz      $v0, .L80240110
-/* 988C4C 802400EC 00000000 */   nop
-/* 988C50 802400F0 90820015 */  lbu       $v0, 0x15($a0)
-/* 988C54 802400F4 00022600 */  sll       $a0, $v0, 0x18
-/* 988C58 802400F8 00041E03 */  sra       $v1, $a0, 0x18
-/* 988C5C 802400FC 00051400 */  sll       $v0, $a1, 0x10
-/* 988C60 80240100 00021403 */  sra       $v0, $v0, 0x10
-/* 988C64 80240104 0043102A */  slt       $v0, $v0, $v1
-/* 988C68 80240108 10400003 */  beqz      $v0, .L80240118
-/* 988C6C 8024010C 00000000 */   nop
-.L80240110:
-/* 988C70 80240110 03E00008 */  jr        $ra
-/* 988C74 80240114 2402FFFF */   addiu    $v0, $zero, -1
-.L80240118:
-/* 988C78 80240118 03E00008 */  jr        $ra
-/* 988C7C 8024011C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s
deleted file mode 100644
index d25a33d76e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240120_988C80
-/* 988C80 80240120 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 988C84 80240124 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 988C88 80240128 0080982D */  daddu     $s3, $a0, $zero
-/* 988C8C 8024012C AFB00010 */  sw        $s0, 0x10($sp)
-/* 988C90 80240130 24100001 */  addiu     $s0, $zero, 1
-/* 988C94 80240134 AFB40020 */  sw        $s4, 0x20($sp)
-/* 988C98 80240138 2414FFFF */  addiu     $s4, $zero, -1
-/* 988C9C 8024013C AFB50024 */  sw        $s5, 0x24($sp)
-/* 988CA0 80240140 0200A82D */  daddu     $s5, $s0, $zero
-/* 988CA4 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* 988CA8 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 988CAC 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 988CB0 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 988CB4 80240154 AFB20018 */  sw        $s2, 0x18($sp)
-/* 988CB8 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 988CBC 8024015C 0280182D */  daddu     $v1, $s4, $zero
-/* 988CC0 80240160 AE630084 */  sw        $v1, 0x84($s3)
-/* 988CC4 80240164 00021027 */  nor       $v0, $zero, $v0
-/* 988CC8 80240168 000217C2 */  srl       $v0, $v0, 0x1f
-/* 988CCC 8024016C 00029400 */  sll       $s2, $v0, 0x10
-.L80240170:
-/* 988CD0 80240170 92220014 */  lbu       $v0, 0x14($s1)
-/* 988CD4 80240174 50400008 */  beql      $v0, $zero, .L80240198
-/* 988CD8 80240178 26100001 */   addiu    $s0, $s0, 1
-/* 988CDC 8024017C 0200202D */  daddu     $a0, $s0, $zero
-/* 988CE0 80240180 0C090035 */  jal       func_802400D4_988C34
-/* 988CE4 80240184 00122C03 */   sra      $a1, $s2, 0x10
-/* 988CE8 80240188 10540003 */  beq       $v0, $s4, .L80240198
-/* 988CEC 8024018C 26100001 */   addiu    $s0, $s0, 1
-/* 988CF0 80240190 08090069 */  j         .L802401A4
-/* 988CF4 80240194 AE750084 */   sw       $s5, 0x84($s3)
-.L80240198:
-/* 988CF8 80240198 2A02000C */  slti      $v0, $s0, 0xc
-/* 988CFC 8024019C 1440FFF4 */  bnez      $v0, .L80240170
-/* 988D00 802401A0 26310008 */   addiu    $s1, $s1, 8
-.L802401A4:
-/* 988D04 802401A4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 988D08 802401A8 8FB50024 */  lw        $s5, 0x24($sp)
-/* 988D0C 802401AC 8FB40020 */  lw        $s4, 0x20($sp)
-/* 988D10 802401B0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 988D14 802401B4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 988D18 802401B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 988D1C 802401BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 988D20 802401C0 24020002 */  addiu     $v0, $zero, 2
-/* 988D24 802401C4 03E00008 */  jr        $ra
-/* 988D28 802401C8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s
index ea5ec1857f..92068124ea 100644
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s
+++ b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s
@@ -49,7 +49,7 @@ glabel func_802401CC_988D2C
 /* 988DD8 80240278 AE300108 */  sw        $s0, 0x108($s1)
 /* 988DDC 8024027C 8C420000 */  lw        $v0, ($v0)
 /* 988DE0 80240280 02E0282D */  daddu     $a1, $s7, $zero
-/* 988DE4 80240284 0C090035 */  jal       func_802400D4_988C34
+/* 988DE4 80240284 0C090035 */  jal       isk_10_UnkFunc37
 /* 988DE8 80240288 AE220084 */   sw       $v0, 0x84($s1)
 /* 988DEC 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* 988DF0 80240290 04800011 */  bltz      $a0, .L802402D8
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510_989070.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510_989070.s
deleted file mode 100644
index a24efcde3e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510_989070.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240510_989070
-/* 989070 80240510 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 989074 80240514 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 989078 80240518 8C82000C */  lw        $v0, 0xc($a0)
-/* 98907C 8024051C 0C0B1EAF */  jal       get_variable
-/* 989080 80240520 8C450000 */   lw       $a1, ($v0)
-/* 989084 80240524 0040202D */  daddu     $a0, $v0, $zero
-/* 989088 80240528 8C830000 */  lw        $v1, ($a0)
-/* 98908C 8024052C 34630010 */  ori       $v1, $v1, 0x10
-/* 989090 80240530 AC830000 */  sw        $v1, ($a0)
-/* 989094 80240534 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 989098 80240538 24020002 */  addiu     $v0, $zero, 2
-/* 98909C 8024053C 03E00008 */  jr        $ra
-/* 9890A0 80240540 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s
index d5c912e85a..d69ea53a2a 100644
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s
+++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241BC4_9942F4
-/* 9942F4 80241BC4 3C048024 */  lui       $a0, %hi(D_80242AC4)
-/* 9942F8 80241BC8 8C842AC4 */  lw        $a0, %lo(D_80242AC4)($a0)
+/* 9942F4 80241BC4 3C048024 */  lui       $a0, %hi(flo_11_defeat_80242AC4)
+/* 9942F8 80241BC8 8C842AC4 */  lw        $a0, %lo(flo_11_defeat_80242AC4)($a0)
 /* 9942FC 80241BCC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 994300 80241BD0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 994304 80241BD4 0C048D70 */  jal       free_dynamic_entity
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s
deleted file mode 100644
index 176ca9780f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240800_9959F0
-/* 9959F0 80240800 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9959F4 80240804 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9959F8 80240808 0080882D */  daddu     $s1, $a0, $zero
-/* 9959FC 8024080C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 995A00 80240810 AFB20018 */  sw        $s2, 0x18($sp)
-/* 995A04 80240814 AFB00010 */  sw        $s0, 0x10($sp)
-/* 995A08 80240818 8E30000C */  lw        $s0, 0xc($s1)
-/* 995A0C 8024081C 8E050000 */  lw        $a1, ($s0)
-/* 995A10 80240820 0C0B1EAF */  jal       get_variable
-/* 995A14 80240824 26100004 */   addiu    $s0, $s0, 4
-/* 995A18 80240828 8E050000 */  lw        $a1, ($s0)
-/* 995A1C 8024082C 26100004 */  addiu     $s0, $s0, 4
-/* 995A20 80240830 0220202D */  daddu     $a0, $s1, $zero
-/* 995A24 80240834 0C0B1EAF */  jal       get_variable
-/* 995A28 80240838 0040902D */   daddu    $s2, $v0, $zero
-/* 995A2C 8024083C 0220202D */  daddu     $a0, $s1, $zero
-/* 995A30 80240840 8E050000 */  lw        $a1, ($s0)
-/* 995A34 80240844 0C0B1EAF */  jal       get_variable
-/* 995A38 80240848 0040802D */   daddu    $s0, $v0, $zero
-/* 995A3C 8024084C 0040882D */  daddu     $s1, $v0, $zero
-/* 995A40 80240850 2402FFFF */  addiu     $v0, $zero, -1
-/* 995A44 80240854 16020005 */  bne       $s0, $v0, .L8024086C
-/* 995A48 80240858 24020001 */   addiu    $v0, $zero, 1
-/* 995A4C 8024085C 0C04760B */  jal       func_8011D82C
-/* 995A50 80240860 0220202D */   daddu    $a0, $s1, $zero
-/* 995A54 80240864 08090243 */  j         .L8024090C
-/* 995A58 80240868 24020002 */   addiu    $v0, $zero, 2
-.L8024086C:
-/* 995A5C 8024086C 12420018 */  beq       $s2, $v0, .L802408D0
-/* 995A60 80240870 2A420002 */   slti     $v0, $s2, 2
-/* 995A64 80240874 10400005 */  beqz      $v0, .L8024088C
-/* 995A68 80240878 24020002 */   addiu    $v0, $zero, 2
-/* 995A6C 8024087C 12400007 */  beqz      $s2, .L8024089C
-/* 995A70 80240880 3412FFFF */   ori      $s2, $zero, 0xffff
-/* 995A74 80240884 08090243 */  j         .L8024090C
-/* 995A78 80240888 00000000 */   nop
-.L8024088C:
-/* 995A7C 8024088C 1242001B */  beq       $s2, $v0, .L802408FC
-/* 995A80 80240890 24020002 */   addiu    $v0, $zero, 2
-/* 995A84 80240894 08090243 */  j         .L8024090C
-/* 995A88 80240898 00000000 */   nop
-.L8024089C:
-/* 995A8C 8024089C 8E040000 */  lw        $a0, ($s0)
-/* 995A90 802408A0 1092001A */  beq       $a0, $s2, .L8024090C
-/* 995A94 802408A4 24020002 */   addiu    $v0, $zero, 2
-/* 995A98 802408A8 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 995A9C 802408AC 26100004 */   addiu    $s0, $s0, 4
-/* 995AA0 802408B0 0C046B4C */  jal       get_model_from_list_index
-/* 995AA4 802408B4 0040202D */   daddu    $a0, $v0, $zero
-/* 995AA8 802408B8 0040202D */  daddu     $a0, $v0, $zero
-/* 995AAC 802408BC 2405FFFF */  addiu     $a1, $zero, -1
-/* 995AB0 802408C0 0C046F1F */  jal       func_8011BC7C
-/* 995AB4 802408C4 0220302D */   daddu    $a2, $s1, $zero
-/* 995AB8 802408C8 08090227 */  j         .L8024089C
-/* 995ABC 802408CC 00000000 */   nop
-.L802408D0:
-/* 995AC0 802408D0 3412FFFF */  ori       $s2, $zero, 0xffff
-.L802408D4:
-/* 995AC4 802408D4 8E020000 */  lw        $v0, ($s0)
-/* 995AC8 802408D8 1052000B */  beq       $v0, $s2, .L80240908
-/* 995ACC 802408DC 2405FFFF */   addiu    $a1, $zero, -1
-/* 995AD0 802408E0 96040002 */  lhu       $a0, 2($s0)
-/* 995AD4 802408E4 0220302D */  daddu     $a2, $s1, $zero
-/* 995AD8 802408E8 26100004 */  addiu     $s0, $s0, 4
-/* 995ADC 802408EC 0C046E54 */  jal       func_8011B950
-/* 995AE0 802408F0 0000382D */   daddu    $a3, $zero, $zero
-/* 995AE4 802408F4 08090235 */  j         .L802408D4
-/* 995AE8 802408F8 00000000 */   nop
-.L802408FC:
-/* 995AEC 802408FC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 995AF0 80240900 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 995AF4 80240904 A0510000 */  sb        $s1, ($v0)
-.L80240908:
-/* 995AF8 80240908 24020002 */  addiu     $v0, $zero, 2
-.L8024090C:
-/* 995AFC 8024090C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 995B00 80240910 8FB20018 */  lw        $s2, 0x18($sp)
-/* 995B04 80240914 8FB10014 */  lw        $s1, 0x14($sp)
-/* 995B08 80240918 8FB00010 */  lw        $s0, 0x10($sp)
-/* 995B0C 8024091C 03E00008 */  jr        $ra
-/* 995B10 80240920 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s
deleted file mode 100644
index 668f32bdaa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240924_995B14
-/* 995B14 80240924 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 995B18 80240928 AFB10034 */  sw        $s1, 0x34($sp)
-/* 995B1C 8024092C 0080882D */  daddu     $s1, $a0, $zero
-/* 995B20 80240930 AFBF0054 */  sw        $ra, 0x54($sp)
-/* 995B24 80240934 AFBE0050 */  sw        $fp, 0x50($sp)
-/* 995B28 80240938 AFB7004C */  sw        $s7, 0x4c($sp)
-/* 995B2C 8024093C AFB60048 */  sw        $s6, 0x48($sp)
-/* 995B30 80240940 AFB50044 */  sw        $s5, 0x44($sp)
-/* 995B34 80240944 AFB40040 */  sw        $s4, 0x40($sp)
-/* 995B38 80240948 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 995B3C 8024094C AFB20038 */  sw        $s2, 0x38($sp)
-/* 995B40 80240950 AFB00030 */  sw        $s0, 0x30($sp)
-/* 995B44 80240954 8E30000C */  lw        $s0, 0xc($s1)
-/* 995B48 80240958 8E050000 */  lw        $a1, ($s0)
-/* 995B4C 8024095C 0C0B1EAF */  jal       get_variable
-/* 995B50 80240960 26100004 */   addiu    $s0, $s0, 4
-/* 995B54 80240964 8E050000 */  lw        $a1, ($s0)
-/* 995B58 80240968 26100004 */  addiu     $s0, $s0, 4
-/* 995B5C 8024096C 0220202D */  daddu     $a0, $s1, $zero
-/* 995B60 80240970 0C0B1EAF */  jal       get_variable
-/* 995B64 80240974 0040982D */   daddu    $s3, $v0, $zero
-/* 995B68 80240978 8E050000 */  lw        $a1, ($s0)
-/* 995B6C 8024097C 26100004 */  addiu     $s0, $s0, 4
-/* 995B70 80240980 0220202D */  daddu     $a0, $s1, $zero
-/* 995B74 80240984 0C0B1EAF */  jal       get_variable
-/* 995B78 80240988 0040B02D */   daddu    $s6, $v0, $zero
-/* 995B7C 8024098C 8E050000 */  lw        $a1, ($s0)
-/* 995B80 80240990 26100004 */  addiu     $s0, $s0, 4
-/* 995B84 80240994 0220202D */  daddu     $a0, $s1, $zero
-/* 995B88 80240998 0C0B1EAF */  jal       get_variable
-/* 995B8C 8024099C 0040A82D */   daddu    $s5, $v0, $zero
-/* 995B90 802409A0 8E050000 */  lw        $a1, ($s0)
-/* 995B94 802409A4 26100004 */  addiu     $s0, $s0, 4
-/* 995B98 802409A8 0220202D */  daddu     $a0, $s1, $zero
-/* 995B9C 802409AC 0C0B1EAF */  jal       get_variable
-/* 995BA0 802409B0 0040A02D */   daddu    $s4, $v0, $zero
-/* 995BA4 802409B4 8E050000 */  lw        $a1, ($s0)
-/* 995BA8 802409B8 26100004 */  addiu     $s0, $s0, 4
-/* 995BAC 802409BC 0220202D */  daddu     $a0, $s1, $zero
-/* 995BB0 802409C0 0C0B1EAF */  jal       get_variable
-/* 995BB4 802409C4 0040902D */   daddu    $s2, $v0, $zero
-/* 995BB8 802409C8 8E050000 */  lw        $a1, ($s0)
-/* 995BBC 802409CC 26100004 */  addiu     $s0, $s0, 4
-/* 995BC0 802409D0 0220202D */  daddu     $a0, $s1, $zero
-/* 995BC4 802409D4 0C0B1EAF */  jal       get_variable
-/* 995BC8 802409D8 AFA20028 */   sw       $v0, 0x28($sp)
-/* 995BCC 802409DC 8E050000 */  lw        $a1, ($s0)
-/* 995BD0 802409E0 26100004 */  addiu     $s0, $s0, 4
-/* 995BD4 802409E4 0220202D */  daddu     $a0, $s1, $zero
-/* 995BD8 802409E8 0C0B1EAF */  jal       get_variable
-/* 995BDC 802409EC 0040F02D */   daddu    $fp, $v0, $zero
-/* 995BE0 802409F0 8E050000 */  lw        $a1, ($s0)
-/* 995BE4 802409F4 26100004 */  addiu     $s0, $s0, 4
-/* 995BE8 802409F8 0220202D */  daddu     $a0, $s1, $zero
-/* 995BEC 802409FC 0C0B1EAF */  jal       get_variable
-/* 995BF0 80240A00 0040B82D */   daddu    $s7, $v0, $zero
-/* 995BF4 80240A04 0220202D */  daddu     $a0, $s1, $zero
-/* 995BF8 80240A08 8E050000 */  lw        $a1, ($s0)
-/* 995BFC 80240A0C 0C0B1EAF */  jal       get_variable
-/* 995C00 80240A10 0040802D */   daddu    $s0, $v0, $zero
-/* 995C04 80240A14 0040182D */  daddu     $v1, $v0, $zero
-/* 995C08 80240A18 24020002 */  addiu     $v0, $zero, 2
-/* 995C0C 80240A1C 12620012 */  beq       $s3, $v0, .L80240A68
-/* 995C10 80240A20 2A620003 */   slti     $v0, $s3, 3
-/* 995C14 80240A24 10400005 */  beqz      $v0, .L80240A3C
-/* 995C18 80240A28 24020001 */   addiu    $v0, $zero, 1
-/* 995C1C 80240A2C 12620008 */  beq       $s3, $v0, .L80240A50
-/* 995C20 80240A30 32C400FF */   andi     $a0, $s6, 0xff
-/* 995C24 80240A34 080902B1 */  j         .L80240AC4
-/* 995C28 80240A38 00000000 */   nop
-.L80240A3C:
-/* 995C2C 80240A3C 24020003 */  addiu     $v0, $zero, 3
-/* 995C30 80240A40 12620018 */  beq       $s3, $v0, .L80240AA4
-/* 995C34 80240A44 32C400FF */   andi     $a0, $s6, 0xff
-/* 995C38 80240A48 080902B1 */  j         .L80240AC4
-/* 995C3C 80240A4C 00000000 */   nop
-.L80240A50:
-/* 995C40 80240A50 32A500FF */  andi      $a1, $s5, 0xff
-/* 995C44 80240A54 328600FF */  andi      $a2, $s4, 0xff
-/* 995C48 80240A58 0C046F97 */  jal       set_background_color_blend
-/* 995C4C 80240A5C 324700FF */   andi     $a3, $s2, 0xff
-/* 995C50 80240A60 080902B1 */  j         .L80240AC4
-/* 995C54 80240A64 00000000 */   nop
-.L80240A68:
-/* 995C58 80240A68 32C400FF */  andi      $a0, $s6, 0xff
-/* 995C5C 80240A6C 32A500FF */  andi      $a1, $s5, 0xff
-/* 995C60 80240A70 328600FF */  andi      $a2, $s4, 0xff
-/* 995C64 80240A74 324700FF */  andi      $a3, $s2, 0xff
-/* 995C68 80240A78 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 995C6C 80240A7C AFB0001C */  sw        $s0, 0x1c($sp)
-/* 995C70 80240A80 AFA30020 */  sw        $v1, 0x20($sp)
-/* 995C74 80240A84 AFA20010 */  sw        $v0, 0x10($sp)
-/* 995C78 80240A88 33C200FF */  andi      $v0, $fp, 0xff
-/* 995C7C 80240A8C AFA20014 */  sw        $v0, 0x14($sp)
-/* 995C80 80240A90 32E200FF */  andi      $v0, $s7, 0xff
-/* 995C84 80240A94 0C046FAD */  jal       func_8011BEB4
-/* 995C88 80240A98 AFA20018 */   sw       $v0, 0x18($sp)
-/* 995C8C 80240A9C 080902B1 */  j         .L80240AC4
-/* 995C90 80240AA0 00000000 */   nop
-.L80240AA4:
-/* 995C94 80240AA4 32A500FF */  andi      $a1, $s5, 0xff
-/* 995C98 80240AA8 328600FF */  andi      $a2, $s4, 0xff
-/* 995C9C 80240AAC 324700FF */  andi      $a3, $s2, 0xff
-/* 995CA0 80240AB0 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 995CA4 80240AB4 AFA20010 */  sw        $v0, 0x10($sp)
-/* 995CA8 80240AB8 33C200FF */  andi      $v0, $fp, 0xff
-/* 995CAC 80240ABC 0C046FE6 */  jal       func_8011BF98
-/* 995CB0 80240AC0 AFA20014 */   sw       $v0, 0x14($sp)
-.L80240AC4:
-/* 995CB4 80240AC4 8FBF0054 */  lw        $ra, 0x54($sp)
-/* 995CB8 80240AC8 8FBE0050 */  lw        $fp, 0x50($sp)
-/* 995CBC 80240ACC 8FB7004C */  lw        $s7, 0x4c($sp)
-/* 995CC0 80240AD0 8FB60048 */  lw        $s6, 0x48($sp)
-/* 995CC4 80240AD4 8FB50044 */  lw        $s5, 0x44($sp)
-/* 995CC8 80240AD8 8FB40040 */  lw        $s4, 0x40($sp)
-/* 995CCC 80240ADC 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 995CD0 80240AE0 8FB20038 */  lw        $s2, 0x38($sp)
-/* 995CD4 80240AE4 8FB10034 */  lw        $s1, 0x34($sp)
-/* 995CD8 80240AE8 8FB00030 */  lw        $s0, 0x30($sp)
-/* 995CDC 80240AEC 24020002 */  addiu     $v0, $zero, 2
-/* 995CE0 80240AF0 03E00008 */  jr        $ra
-/* 995CE4 80240AF4 27BD0058 */   addiu    $sp, $sp, 0x58
-/* 995CE8 80240AF8 00000000 */  nop
-/* 995CEC 80240AFC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802403C4_91E934.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802403C4_91E934.s
deleted file mode 100644
index b837b6a945..0000000000
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802403C4_91E934.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403C4_91E934
-/* 91E934 802403C4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 91E938 802403C8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 91E93C 802403CC 000420C0 */  sll       $a0, $a0, 3
-/* 91E940 802403D0 00822021 */  addu      $a0, $a0, $v0
-/* 91E944 802403D4 90820014 */  lbu       $v0, 0x14($a0)
-/* 91E948 802403D8 10400009 */  beqz      $v0, .L80240400
-/* 91E94C 802403DC 00000000 */   nop
-/* 91E950 802403E0 90820015 */  lbu       $v0, 0x15($a0)
-/* 91E954 802403E4 00022600 */  sll       $a0, $v0, 0x18
-/* 91E958 802403E8 00041E03 */  sra       $v1, $a0, 0x18
-/* 91E95C 802403EC 00051400 */  sll       $v0, $a1, 0x10
-/* 91E960 802403F0 00021403 */  sra       $v0, $v0, 0x10
-/* 91E964 802403F4 0043102A */  slt       $v0, $v0, $v1
-/* 91E968 802403F8 10400003 */  beqz      $v0, .L80240408
-/* 91E96C 802403FC 00000000 */   nop
-.L80240400:
-/* 91E970 80240400 03E00008 */  jr        $ra
-/* 91E974 80240404 2402FFFF */   addiu    $v0, $zero, -1
-.L80240408:
-/* 91E978 80240408 03E00008 */  jr        $ra
-/* 91E97C 8024040C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s
deleted file mode 100644
index f2b96dfb38..0000000000
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240410_91E980
-/* 91E980 80240410 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 91E984 80240414 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 91E988 80240418 0080982D */  daddu     $s3, $a0, $zero
-/* 91E98C 8024041C AFB00010 */  sw        $s0, 0x10($sp)
-/* 91E990 80240420 24100001 */  addiu     $s0, $zero, 1
-/* 91E994 80240424 AFB40020 */  sw        $s4, 0x20($sp)
-/* 91E998 80240428 2414FFFF */  addiu     $s4, $zero, -1
-/* 91E99C 8024042C AFB50024 */  sw        $s5, 0x24($sp)
-/* 91E9A0 80240430 0200A82D */  daddu     $s5, $s0, $zero
-/* 91E9A4 80240434 AFB10014 */  sw        $s1, 0x14($sp)
-/* 91E9A8 80240438 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 91E9AC 8024043C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 91E9B0 80240440 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 91E9B4 80240444 AFB20018 */  sw        $s2, 0x18($sp)
-/* 91E9B8 80240448 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 91E9BC 8024044C 0280182D */  daddu     $v1, $s4, $zero
-/* 91E9C0 80240450 AE630084 */  sw        $v1, 0x84($s3)
-/* 91E9C4 80240454 00021027 */  nor       $v0, $zero, $v0
-/* 91E9C8 80240458 000217C2 */  srl       $v0, $v0, 0x1f
-/* 91E9CC 8024045C 00029400 */  sll       $s2, $v0, 0x10
-.L80240460:
-/* 91E9D0 80240460 92220014 */  lbu       $v0, 0x14($s1)
-/* 91E9D4 80240464 50400008 */  beql      $v0, $zero, .L80240488
-/* 91E9D8 80240468 26100001 */   addiu    $s0, $s0, 1
-/* 91E9DC 8024046C 0200202D */  daddu     $a0, $s0, $zero
-/* 91E9E0 80240470 0C0900F1 */  jal       func_802403C4_91E934
-/* 91E9E4 80240474 00122C03 */   sra      $a1, $s2, 0x10
-/* 91E9E8 80240478 10540003 */  beq       $v0, $s4, .L80240488
-/* 91E9EC 8024047C 26100001 */   addiu    $s0, $s0, 1
-/* 91E9F0 80240480 08090125 */  j         .L80240494
-/* 91E9F4 80240484 AE750084 */   sw       $s5, 0x84($s3)
-.L80240488:
-/* 91E9F8 80240488 2A02000C */  slti      $v0, $s0, 0xc
-/* 91E9FC 8024048C 1440FFF4 */  bnez      $v0, .L80240460
-/* 91EA00 80240490 26310008 */   addiu    $s1, $s1, 8
-.L80240494:
-/* 91EA04 80240494 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 91EA08 80240498 8FB50024 */  lw        $s5, 0x24($sp)
-/* 91EA0C 8024049C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 91EA10 802404A0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 91EA14 802404A4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 91EA18 802404A8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 91EA1C 802404AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 91EA20 802404B0 24020002 */  addiu     $v0, $zero, 2
-/* 91EA24 802404B4 03E00008 */  jr        $ra
-/* 91EA28 802404B8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s
index a0d9fcb92e..f042dab37a 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s
@@ -49,7 +49,7 @@ glabel func_802404BC_91EA2C
 /* 91EAD8 80240568 AE300108 */  sw        $s0, 0x108($s1)
 /* 91EADC 8024056C 8C420000 */  lw        $v0, ($v0)
 /* 91EAE0 80240570 02E0282D */  daddu     $a1, $s7, $zero
-/* 91EAE4 80240574 0C0900F1 */  jal       func_802403C4_91E934
+/* 91EAE4 80240574 0C0900F1 */  jal       iwa_10_UnkFunc37
 /* 91EAE8 80240578 AE220084 */   sw       $v0, 0x84($s1)
 /* 91EAEC 8024057C 0040202D */  daddu     $a0, $v0, $zero
 /* 91EAF0 80240580 04800011 */  bltz      $a0, .L802405C8
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800_91ED70.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800_91ED70.s
deleted file mode 100644
index 1db97ca50d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800_91ED70.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240800_91ED70
-/* 91ED70 80240800 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 91ED74 80240804 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 91ED78 80240808 8C82000C */  lw        $v0, 0xc($a0)
-/* 91ED7C 8024080C 0C0B1EAF */  jal       get_variable
-/* 91ED80 80240810 8C450000 */   lw       $a1, ($v0)
-/* 91ED84 80240814 0040202D */  daddu     $a0, $v0, $zero
-/* 91ED88 80240818 8C830000 */  lw        $v1, ($a0)
-/* 91ED8C 8024081C 34630010 */  ori       $v1, $v1, 0x10
-/* 91ED90 80240820 AC830000 */  sw        $v1, ($a0)
-/* 91ED94 80240824 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 91ED98 80240828 24020002 */  addiu     $v0, $zero, 2
-/* 91ED9C 8024082C 03E00008 */  jr        $ra
-/* 91EDA0 80240830 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s
deleted file mode 100644
index e83e9e19db..0000000000
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FF8_91F568
-/* 91F568 80240FF8 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 91F56C 80240FFC 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 91F570 80241000 AC800084 */  sw        $zero, 0x84($a0)
-/* 91F574 80241004 80620000 */  lb        $v0, ($v1)
-/* 91F578 80241008 10400005 */  beqz      $v0, .L80241020
-/* 91F57C 8024100C 24020003 */   addiu    $v0, $zero, 3
-/* 91F580 80241010 80630003 */  lb        $v1, 3($v1)
-/* 91F584 80241014 14620002 */  bne       $v1, $v0, .L80241020
-/* 91F588 80241018 24020001 */   addiu    $v0, $zero, 1
-/* 91F58C 8024101C AC820084 */  sw        $v0, 0x84($a0)
-.L80241020:
-/* 91F590 80241020 03E00008 */  jr        $ra
-/* 91F594 80241024 24020002 */   addiu    $v0, $zero, 2
-/* 91F598 80241028 00000000 */  nop
-/* 91F59C 8024102C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s
deleted file mode 100644
index 7456517dc6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241030_91F5A0
-/* 91F5A0 80241030 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 91F5A4 80241034 AFB20018 */  sw        $s2, 0x18($sp)
-/* 91F5A8 80241038 0080902D */  daddu     $s2, $a0, $zero
-/* 91F5AC 8024103C AFB10014 */  sw        $s1, 0x14($sp)
-/* 91F5B0 80241040 00A0882D */  daddu     $s1, $a1, $zero
-/* 91F5B4 80241044 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 91F5B8 80241048 AFB40020 */  sw        $s4, 0x20($sp)
-/* 91F5BC 8024104C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 91F5C0 80241050 AFB00010 */  sw        $s0, 0x10($sp)
-/* 91F5C4 80241054 8E50000C */  lw        $s0, 0xc($s2)
-/* 91F5C8 80241058 8E050000 */  lw        $a1, ($s0)
-/* 91F5CC 8024105C 0C0B1EAF */  jal       get_variable
-/* 91F5D0 80241060 26100004 */   addiu    $s0, $s0, 4
-/* 91F5D4 80241064 0240202D */  daddu     $a0, $s2, $zero
-/* 91F5D8 80241068 8E050000 */  lw        $a1, ($s0)
-/* 91F5DC 8024106C 0C0B1EAF */  jal       get_variable
-/* 91F5E0 80241070 0040802D */   daddu    $s0, $v0, $zero
-/* 91F5E4 80241074 0200202D */  daddu     $a0, $s0, $zero
-/* 91F5E8 80241078 0C00EAD2 */  jal       get_npc_safe
-/* 91F5EC 8024107C 0040A02D */   daddu    $s4, $v0, $zero
-/* 91F5F0 80241080 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* 91F5F4 80241084 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* 91F5F8 80241088 12200006 */  beqz      $s1, .L802410A4
-/* 91F5FC 8024108C 0040802D */   daddu    $s0, $v0, $zero
-/* 91F600 80241090 82620012 */  lb        $v0, 0x12($s3)
-/* 91F604 80241094 54400003 */  bnel      $v0, $zero, .L802410A4
-/* 91F608 80241098 AE400070 */   sw       $zero, 0x70($s2)
-/* 91F60C 8024109C 24020002 */  addiu     $v0, $zero, 2
-/* 91F610 802410A0 AE420070 */  sw        $v0, 0x70($s2)
-.L802410A4:
-/* 91F614 802410A4 8E430070 */  lw        $v1, 0x70($s2)
-/* 91F618 802410A8 24110001 */  addiu     $s1, $zero, 1
-/* 91F61C 802410AC 10710013 */  beq       $v1, $s1, .L802410FC
-/* 91F620 802410B0 28620002 */   slti     $v0, $v1, 2
-/* 91F624 802410B4 10400005 */  beqz      $v0, .L802410CC
-/* 91F628 802410B8 24020002 */   addiu    $v0, $zero, 2
-/* 91F62C 802410BC 10600009 */  beqz      $v1, .L802410E4
-/* 91F630 802410C0 0000102D */   daddu    $v0, $zero, $zero
-/* 91F634 802410C4 08090465 */  j         .L80241194
-/* 91F638 802410C8 00000000 */   nop
-.L802410CC:
-/* 91F63C 802410CC 10620013 */  beq       $v1, $v0, .L8024111C
-/* 91F640 802410D0 24020003 */   addiu    $v0, $zero, 3
-/* 91F644 802410D4 1062001E */  beq       $v1, $v0, .L80241150
-/* 91F648 802410D8 0000102D */   daddu    $v0, $zero, $zero
-/* 91F64C 802410DC 08090465 */  j         .L80241194
-/* 91F650 802410E0 00000000 */   nop
-.L802410E4:
-/* 91F654 802410E4 0C03AC5A */  jal       func_800EB168
-/* 91F658 802410E8 0000202D */   daddu    $a0, $zero, $zero
-/* 91F65C 802410EC 2402001E */  addiu     $v0, $zero, 0x1e
-/* 91F660 802410F0 AE420074 */  sw        $v0, 0x74($s2)
-/* 91F664 802410F4 08090464 */  j         .L80241190
-/* 91F668 802410F8 AE510070 */   sw       $s1, 0x70($s2)
-.L802410FC:
-/* 91F66C 802410FC 8E420074 */  lw        $v0, 0x74($s2)
-/* 91F670 80241100 2403FFFF */  addiu     $v1, $zero, -1
-/* 91F674 80241104 2442FFFF */  addiu     $v0, $v0, -1
-/* 91F678 80241108 14430021 */  bne       $v0, $v1, .L80241190
-/* 91F67C 8024110C AE420074 */   sw       $v0, 0x74($s2)
-/* 91F680 80241110 24020002 */  addiu     $v0, $zero, 2
-/* 91F684 80241114 08090464 */  j         .L80241190
-/* 91F688 80241118 AE420070 */   sw       $v0, 0x70($s2)
-.L8024111C:
-/* 91F68C 8024111C 0200202D */  daddu     $a0, $s0, $zero
-/* 91F690 80241120 00141600 */  sll       $v0, $s4, 0x18
-/* 91F694 80241124 00021543 */  sra       $v0, $v0, 0x15
-/* 91F698 80241128 02621021 */  addu      $v0, $s3, $v0
-/* 91F69C 8024112C A2740012 */  sb        $s4, 0x12($s3)
-/* 91F6A0 80241130 0C03BD17 */  jal       clear_partner_move_history
-/* 91F6A4 80241134 A0510014 */   sb       $s1, 0x14($v0)
-/* 91F6A8 80241138 82640012 */  lb        $a0, 0x12($s3)
-/* 91F6AC 8024113C 0C03ACA9 */  jal       func_800EB2A4
-/* 91F6B0 80241140 00000000 */   nop
-/* 91F6B4 80241144 24020003 */  addiu     $v0, $zero, 3
-/* 91F6B8 80241148 08090464 */  j         .L80241190
-/* 91F6BC 8024114C AE420070 */   sw       $v0, 0x70($s2)
-.L80241150:
-/* 91F6C0 80241150 0C00EAD2 */  jal       get_npc_safe
-/* 91F6C4 80241154 2404FFFC */   addiu    $a0, $zero, -4
-/* 91F6C8 80241158 8E05000C */  lw        $a1, 0xc($s0)
-/* 91F6CC 8024115C 0C00ECD0 */  jal       set_npc_yaw
-/* 91F6D0 80241160 0040202D */   daddu    $a0, $v0, $zero
-/* 91F6D4 80241164 0200202D */  daddu     $a0, $s0, $zero
-/* 91F6D8 80241168 8E020000 */  lw        $v0, ($s0)
-/* 91F6DC 8024116C 2403FFFB */  addiu     $v1, $zero, -5
-/* 91F6E0 80241170 00431024 */  and       $v0, $v0, $v1
-/* 91F6E4 80241174 0C00EAFF */  jal       disable_npc_shadow
-/* 91F6E8 80241178 AE020000 */   sw       $v0, ($s0)
-/* 91F6EC 8024117C 3C01C47A */  lui       $at, 0xc47a
-/* 91F6F0 80241180 44810000 */  mtc1      $at, $f0
-/* 91F6F4 80241184 24020002 */  addiu     $v0, $zero, 2
-/* 91F6F8 80241188 08090465 */  j         .L80241194
-/* 91F6FC 8024118C E600003C */   swc1     $f0, 0x3c($s0)
-.L80241190:
-/* 91F700 80241190 0000102D */  daddu     $v0, $zero, $zero
-.L80241194:
-/* 91F704 80241194 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 91F708 80241198 8FB40020 */  lw        $s4, 0x20($sp)
-/* 91F70C 8024119C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 91F710 802411A0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 91F714 802411A4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 91F718 802411A8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 91F71C 802411AC 03E00008 */  jr        $ra
-/* 91F720 802411B0 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s
deleted file mode 100644
index 3119c7222d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241974_B2DDE4
-/* B2DDE4 80241974 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2DDE8 80241978 AFBF0014 */  sw        $ra, 0x14($sp)
-/* B2DDEC 8024197C AFB00010 */  sw        $s0, 0x10($sp)
-/* B2DDF0 80241980 0C00EABB */  jal       get_npc_unsafe
-/* B2DDF4 80241984 8C84014C */   lw       $a0, 0x14c($a0)
-/* B2DDF8 80241988 24040008 */  addiu     $a0, $zero, 8
-/* B2DDFC 8024198C 0040802D */  daddu     $s0, $v0, $zero
-/* B2DE00 80241990 3C028024 */  lui       $v0, %hi(func_802419E0_B2DE50)
-/* B2DE04 80241994 244219E0 */  addiu     $v0, $v0, %lo(func_802419E0_B2DE50)
-/* B2DE08 80241998 0C00AB39 */  jal       heap_malloc
-/* B2DE0C 8024199C AE020008 */   sw       $v0, 8($s0)
-/* B2DE10 802419A0 0040182D */  daddu     $v1, $v0, $zero
-/* B2DE14 802419A4 AE030020 */  sw        $v1, 0x20($s0)
-/* B2DE18 802419A8 AC600000 */  sw        $zero, ($v1)
-/* B2DE1C 802419AC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B2DE20 802419B0 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2DE24 802419B4 24020001 */  addiu     $v0, $zero, 1
-/* B2DE28 802419B8 03E00008 */  jr        $ra
-/* B2DE2C 802419BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s
deleted file mode 100644
index 41b41a42f4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419E0_B2DE50
-/* B2DE50 802419E0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2DE54 802419E4 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* B2DE58 802419E8 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* B2DE5C 802419EC 3C05800B */  lui       $a1, %hi(gCameras)
-/* B2DE60 802419F0 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B2DE64 802419F4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B2DE68 802419F8 00031080 */  sll       $v0, $v1, 2
-/* B2DE6C 802419FC 00431021 */  addu      $v0, $v0, $v1
-/* B2DE70 80241A00 00021080 */  sll       $v0, $v0, 2
-/* B2DE74 80241A04 00431023 */  subu      $v0, $v0, $v1
-/* B2DE78 80241A08 000218C0 */  sll       $v1, $v0, 3
-/* B2DE7C 80241A0C 00431021 */  addu      $v0, $v0, $v1
-/* B2DE80 80241A10 8C830020 */  lw        $v1, 0x20($a0)
-/* B2DE84 80241A14 000210C0 */  sll       $v0, $v0, 3
-/* B2DE88 80241A18 8C630000 */  lw        $v1, ($v1)
-/* B2DE8C 80241A1C 30630001 */  andi      $v1, $v1, 1
-/* B2DE90 80241A20 10600004 */  beqz      $v1, .L80241A34
-/* B2DE94 80241A24 00451021 */   addu     $v0, $v0, $a1
-/* B2DE98 80241A28 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* B2DE9C 80241A2C 0C00A6C9 */  jal       clamp_angle
-/* B2DEA0 80241A30 46006307 */   neg.s    $f12, $f12
-.L80241A34:
-/* B2DEA4 80241A34 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B2DEA8 80241A38 03E00008 */  jr        $ra
-/* B2DEAC 80241A3C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s
deleted file mode 100644
index 6df187c69f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B8C_B2DFFC
-/* B2DFFC 80241B8C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B2E000 80241B90 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2E004 80241B94 0080802D */  daddu     $s0, $a0, $zero
-/* B2E008 80241B98 AFBF0020 */  sw        $ra, 0x20($sp)
-/* B2E00C 80241B9C AFB3001C */  sw        $s3, 0x1c($sp)
-/* B2E010 80241BA0 AFB20018 */  sw        $s2, 0x18($sp)
-/* B2E014 80241BA4 10A00009 */  beqz      $a1, .L80241BCC
-/* B2E018 80241BA8 AFB10014 */   sw       $s1, 0x14($sp)
-/* B2E01C 80241BAC 0000202D */  daddu     $a0, $zero, $zero
-/* B2E020 80241BB0 0080282D */  daddu     $a1, $a0, $zero
-/* B2E024 80241BB4 0080302D */  daddu     $a2, $a0, $zero
-/* B2E028 80241BB8 0C046F97 */  jal       set_background_color_blend
-/* B2E02C 80241BBC 240700FF */   addiu    $a3, $zero, 0xff
-/* B2E030 80241BC0 240200FF */  addiu     $v0, $zero, 0xff
-/* B2E034 80241BC4 AE020070 */  sw        $v0, 0x70($s0)
-/* B2E038 80241BC8 AE000074 */  sw        $zero, 0x74($s0)
-.L80241BCC:
-/* B2E03C 80241BCC 8E020070 */  lw        $v0, 0x70($s0)
-/* B2E040 80241BD0 2442FFF8 */  addiu     $v0, $v0, -8
-/* B2E044 80241BD4 04410002 */  bgez      $v0, .L80241BE0
-/* B2E048 80241BD8 AE020070 */   sw       $v0, 0x70($s0)
-/* B2E04C 80241BDC AE000070 */  sw        $zero, 0x70($s0)
-.L80241BE0:
-/* B2E050 80241BE0 0000202D */  daddu     $a0, $zero, $zero
-/* B2E054 80241BE4 0080282D */  daddu     $a1, $a0, $zero
-/* B2E058 80241BE8 92070073 */  lbu       $a3, 0x73($s0)
-/* B2E05C 80241BEC 0C046F97 */  jal       set_background_color_blend
-/* B2E060 80241BF0 0080302D */   daddu    $a2, $a0, $zero
-/* B2E064 80241BF4 8E020070 */  lw        $v0, 0x70($s0)
-/* B2E068 80241BF8 14400006 */  bnez      $v0, .L80241C14
-/* B2E06C 80241BFC 00000000 */   nop
-/* B2E070 80241C00 8E020074 */  lw        $v0, 0x74($s0)
-/* B2E074 80241C04 14400003 */  bnez      $v0, .L80241C14
-/* B2E078 80241C08 24020001 */   addiu    $v0, $zero, 1
-/* B2E07C 80241C0C 08090738 */  j         .L80241CE0
-/* B2E080 80241C10 AE020074 */   sw       $v0, 0x74($s0)
-.L80241C14:
-/* B2E084 80241C14 8E030074 */  lw        $v1, 0x74($s0)
-/* B2E088 80241C18 24020001 */  addiu     $v0, $zero, 1
-/* B2E08C 80241C1C 14620031 */  bne       $v1, $v0, .L80241CE4
-/* B2E090 80241C20 0000102D */   daddu    $v0, $zero, $zero
-/* B2E094 80241C24 0C04760B */  jal       func_8011D82C
-/* B2E098 80241C28 0000202D */   daddu    $a0, $zero, $zero
-/* B2E09C 80241C2C 0000802D */  daddu     $s0, $zero, $zero
-/* B2E0A0 80241C30 2413FFFC */  addiu     $s3, $zero, -4
-/* B2E0A4 80241C34 24120005 */  addiu     $s2, $zero, 5
-/* B2E0A8 80241C38 3C11FF7F */  lui       $s1, 0xff7f
-/* B2E0AC 80241C3C 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* B2E0B0 80241C40 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* B2E0B4 80241C44 3631FFFF */  ori       $s1, $s1, 0xffff
-/* B2E0B8 80241C48 A0400000 */  sb        $zero, ($v0)
-.L80241C4C:
-/* B2E0BC 80241C4C 0C00E2B7 */  jal       get_npc_by_index
-/* B2E0C0 80241C50 0200202D */   daddu    $a0, $s0, $zero
-/* B2E0C4 80241C54 0040202D */  daddu     $a0, $v0, $zero
-/* B2E0C8 80241C58 5080000B */  beql      $a0, $zero, .L80241C88
-/* B2E0CC 80241C5C 26100001 */   addiu    $s0, $s0, 1
-/* B2E0D0 80241C60 8C820000 */  lw        $v0, ($a0)
-/* B2E0D4 80241C64 50400008 */  beql      $v0, $zero, .L80241C88
-/* B2E0D8 80241C68 26100001 */   addiu    $s0, $s0, 1
-/* B2E0DC 80241C6C 808300A4 */  lb        $v1, 0xa4($a0)
-/* B2E0E0 80241C70 10730005 */  beq       $v1, $s3, .L80241C88
-/* B2E0E4 80241C74 26100001 */   addiu    $s0, $s0, 1
-/* B2E0E8 80241C78 10720003 */  beq       $v1, $s2, .L80241C88
-/* B2E0EC 80241C7C 00000000 */   nop
-/* B2E0F0 80241C80 00511024 */  and       $v0, $v0, $s1
-/* B2E0F4 80241C84 AC820000 */  sw        $v0, ($a0)
-.L80241C88:
-/* B2E0F8 80241C88 2A020040 */  slti      $v0, $s0, 0x40
-/* B2E0FC 80241C8C 1440FFEF */  bnez      $v0, .L80241C4C
-/* B2E100 80241C90 00000000 */   nop
-/* B2E104 80241C94 0000802D */  daddu     $s0, $zero, $zero
-/* B2E108 80241C98 3C11F7FF */  lui       $s1, 0xf7ff
-/* B2E10C 80241C9C 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80241CA0:
-/* B2E110 80241CA0 0C04C3D6 */  jal       get_item_entity
-/* B2E114 80241CA4 0200202D */   daddu    $a0, $s0, $zero
-/* B2E118 80241CA8 0040182D */  daddu     $v1, $v0, $zero
-/* B2E11C 80241CAC 10600007 */  beqz      $v1, .L80241CCC
-/* B2E120 80241CB0 26100001 */   addiu    $s0, $s0, 1
-/* B2E124 80241CB4 8C640000 */  lw        $a0, ($v1)
-/* B2E128 80241CB8 30820010 */  andi      $v0, $a0, 0x10
-/* B2E12C 80241CBC 10400003 */  beqz      $v0, .L80241CCC
-/* B2E130 80241CC0 00000000 */   nop
-/* B2E134 80241CC4 00911024 */  and       $v0, $a0, $s1
-/* B2E138 80241CC8 AC620000 */  sw        $v0, ($v1)
-.L80241CCC:
-/* B2E13C 80241CCC 2A020100 */  slti      $v0, $s0, 0x100
-/* B2E140 80241CD0 1440FFF3 */  bnez      $v0, .L80241CA0
-/* B2E144 80241CD4 24020002 */   addiu    $v0, $zero, 2
-/* B2E148 80241CD8 08090739 */  j         .L80241CE4
-/* B2E14C 80241CDC 00000000 */   nop
-.L80241CE0:
-/* B2E150 80241CE0 0000102D */  daddu     $v0, $zero, $zero
-.L80241CE4:
-/* B2E154 80241CE4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* B2E158 80241CE8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B2E15C 80241CEC 8FB20018 */  lw        $s2, 0x18($sp)
-/* B2E160 80241CF0 8FB10014 */  lw        $s1, 0x14($sp)
-/* B2E164 80241CF4 8FB00010 */  lw        $s0, 0x10($sp)
-/* B2E168 80241CF8 03E00008 */  jr        $ra
-/* B2E16C 80241CFC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240034_B34C04.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240034_B34C04.s
deleted file mode 100644
index 56bc1eadd4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240034_B34C04.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_B34C04
-/* B34C04 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* B34C08 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* B34C0C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B34C10 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* B34C14 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* B34C18 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* B34C1C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* B34C20 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* B34C24 80240054 24020002 */   addiu    $v0, $zero, 2
-/* B34C28 80240058 08090038 */  j         .L802400E0
-/* B34C2C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* B34C30 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* B34C34 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* B34C38 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* B34C3C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* B34C40 80240070 04420001 */  bltzl     $v0, .L80240078
-/* B34C44 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* B34C48 80240078 14400003 */  bnez      $v0, .L80240088
-/* B34C4C 8024007C 00000000 */   nop
-/* B34C50 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* B34C54 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* B34C58 80240088 44822000 */  mtc1      $v0, $f4
-/* B34C5C 8024008C 00000000 */  nop
-/* B34C60 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* B34C64 80240094 44062000 */  mfc1      $a2, $f4
-/* B34C68 80240098 44872000 */  mtc1      $a3, $f4
-/* B34C6C 8024009C 00000000 */  nop
-/* B34C70 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* B34C74 802400A4 44806000 */  mtc1      $zero, $f12
-/* B34C78 802400A8 44072000 */  mfc1      $a3, $f4
-/* B34C7C 802400AC 0C00A720 */  jal       atan2
-/* B34C80 802400B0 46006386 */   mov.s    $f14, $f12
-/* B34C84 802400B4 3C014270 */  lui       $at, 0x4270
-/* B34C88 802400B8 44811000 */  mtc1      $at, $f2
-/* B34C8C 802400BC 00000000 */  nop
-/* B34C90 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* B34C94 802400C4 00000000 */  nop
-/* B34C98 802400C8 45000004 */  bc1f      .L802400DC
-/* B34C9C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* B34CA0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* B34CA4 802400D4 08090038 */  j         .L802400E0
-/* B34CA8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* B34CAC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* B34CB0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B34CB4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* B34CB8 802400E8 03E00008 */  jr        $ra
-/* B34CBC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s
deleted file mode 100644
index e7cdb77b85..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414F8_B360C8.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414F8_B360C8
-/* B360C8 802414F8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B360CC 802414FC AFB10014 */  sw        $s1, 0x14($sp)
-/* B360D0 80241500 0080882D */  daddu     $s1, $a0, $zero
-/* B360D4 80241504 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B360D8 80241508 AFB00010 */  sw        $s0, 0x10($sp)
-/* B360DC 8024150C 8E30000C */  lw        $s0, 0xc($s1)
-/* B360E0 80241510 8E050000 */  lw        $a1, ($s0)
-/* B360E4 80241514 0C0B1EAF */  jal       get_variable
-/* B360E8 80241518 26100004 */   addiu    $s0, $s0, 4
-/* B360EC 8024151C 0220202D */  daddu     $a0, $s1, $zero
-/* B360F0 80241520 8E050000 */  lw        $a1, ($s0)
-/* B360F4 80241524 0C0B1EAF */  jal       get_variable
-/* B360F8 80241528 0040882D */   daddu    $s1, $v0, $zero
-/* B360FC 8024152C 0000202D */  daddu     $a0, $zero, $zero
-/* B36100 80241530 0080282D */  daddu     $a1, $a0, $zero
-/* B36104 80241534 0040802D */  daddu     $s0, $v0, $zero
-/* B36108 80241538 240600BE */  addiu     $a2, $zero, 0xbe
-/* B3610C 8024153C 0C04DF93 */  jal       set_transition_stencil_center
-/* B36110 80241540 24070091 */   addiu    $a3, $zero, 0x91
-/* B36114 80241544 44900000 */  mtc1      $s0, $f0
-/* B36118 80241548 00000000 */  nop
-/* B3611C 8024154C 46800020 */  cvt.s.w   $f0, $f0
-/* B36120 80241550 44050000 */  mfc1      $a1, $f0
-/* B36124 80241554 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* B36128 80241558 322400FF */   andi     $a0, $s1, 0xff
-/* B3612C 8024155C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B36130 80241560 8FB10014 */  lw        $s1, 0x14($sp)
-/* B36134 80241564 8FB00010 */  lw        $s0, 0x10($sp)
-/* B36138 80241568 24020002 */  addiu     $v0, $zero, 2
-/* B3613C 8024156C 03E00008 */  jr        $ra
-/* B36140 80241570 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s
deleted file mode 100644
index f99ce23b03..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241574_B36144
-/* B36144 80241574 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B36148 80241578 AFB10014 */  sw        $s1, 0x14($sp)
-/* B3614C 8024157C 0080882D */  daddu     $s1, $a0, $zero
-/* B36150 80241580 AFBF0018 */  sw        $ra, 0x18($sp)
-/* B36154 80241584 AFB00010 */  sw        $s0, 0x10($sp)
-/* B36158 80241588 8E30000C */  lw        $s0, 0xc($s1)
-/* B3615C 8024158C 8E050000 */  lw        $a1, ($s0)
-/* B36160 80241590 0C0B1EAF */  jal       get_variable
-/* B36164 80241594 26100004 */   addiu    $s0, $s0, 4
-/* B36168 80241598 0220202D */  daddu     $a0, $s1, $zero
-/* B3616C 8024159C 8E050000 */  lw        $a1, ($s0)
-/* B36170 802415A0 0C0B1EAF */  jal       get_variable
-/* B36174 802415A4 0040802D */   daddu    $s0, $v0, $zero
-/* B36178 802415A8 44820000 */  mtc1      $v0, $f0
-/* B3617C 802415AC 00000000 */  nop
-/* B36180 802415B0 46800020 */  cvt.s.w   $f0, $f0
-/* B36184 802415B4 24020002 */  addiu     $v0, $zero, 2
-/* B36188 802415B8 00501804 */  sllv      $v1, $s0, $v0
-/* B3618C 802415BC 00701821 */  addu      $v1, $v1, $s0
-/* B36190 802415C0 00431804 */  sllv      $v1, $v1, $v0
-/* B36194 802415C4 00701823 */  subu      $v1, $v1, $s0
-/* B36198 802415C8 000320C0 */  sll       $a0, $v1, 3
-/* B3619C 802415CC 00641821 */  addu      $v1, $v1, $a0
-/* B361A0 802415D0 000318C0 */  sll       $v1, $v1, 3
-/* B361A4 802415D4 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* B361A8 802415D8 00230821 */  addu      $at, $at, $v1
-/* B361AC 802415DC E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* B361B0 802415E0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* B361B4 802415E4 8FB10014 */  lw        $s1, 0x14($sp)
-/* B361B8 802415E8 8FB00010 */  lw        $s0, 0x10($sp)
-/* B361BC 802415EC 03E00008 */  jr        $ra
-/* B361C0 802415F0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s
deleted file mode 100644
index 11ee8052e5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241670_B36240
-/* B36240 80241670 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* B36244 80241674 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* B36248 80241678 AC800088 */  sw        $zero, 0x88($a0)
-/* B3624C 8024167C 80A30003 */  lb        $v1, 3($a1)
-/* B36250 80241680 80A20002 */  lb        $v0, 2($a1)
-/* B36254 80241684 1462000B */  bne       $v1, $v0, .L802416B4
-/* B36258 80241688 00A0302D */   daddu    $a2, $a1, $zero
-/* B3625C 8024168C 80A30006 */  lb        $v1, 6($a1)
-/* B36260 80241690 80A20005 */  lb        $v0, 5($a1)
-/* B36264 80241694 14620007 */  bne       $v1, $v0, .L802416B4
-/* B36268 80241698 00000000 */   nop
-/* B3626C 8024169C 80C2028E */  lb        $v0, 0x28e($a2)
-/* B36270 802416A0 84C30290 */  lh        $v1, 0x290($a2)
-/* B36274 802416A4 00021200 */  sll       $v0, $v0, 8
-/* B36278 802416A8 14620004 */  bne       $v1, $v0, .L802416BC
-/* B3627C 802416AC 24020001 */   addiu    $v0, $zero, 1
-/* B36280 802416B0 AC820088 */  sw        $v0, 0x88($a0)
-.L802416B4:
-/* B36284 802416B4 03E00008 */  jr        $ra
-/* B36288 802416B8 24020002 */   addiu    $v0, $zero, 2
-.L802416BC:
-/* B3628C 802416BC 03E00008 */  jr        $ra
-/* B36290 802416C0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802416C4_B36294.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802416C4_B36294.s
deleted file mode 100644
index 6fbcb82825..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802416C4_B36294.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416C4_B36294
-/* B36294 802416C4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B36298 802416C8 AFB10014 */  sw        $s1, 0x14($sp)
-/* B3629C 802416CC 0080882D */  daddu     $s1, $a0, $zero
-/* B362A0 802416D0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* B362A4 802416D4 AFB20018 */  sw        $s2, 0x18($sp)
-/* B362A8 802416D8 AFB00010 */  sw        $s0, 0x10($sp)
-/* B362AC 802416DC 8E30000C */  lw        $s0, 0xc($s1)
-/* B362B0 802416E0 8E050000 */  lw        $a1, ($s0)
-/* B362B4 802416E4 0C0B1EAF */  jal       get_variable
-/* B362B8 802416E8 26100004 */   addiu    $s0, $s0, 4
-/* B362BC 802416EC 8E050000 */  lw        $a1, ($s0)
-/* B362C0 802416F0 26100004 */  addiu     $s0, $s0, 4
-/* B362C4 802416F4 0220202D */  daddu     $a0, $s1, $zero
-/* B362C8 802416F8 0C0B1EAF */  jal       get_variable
-/* B362CC 802416FC 0040902D */   daddu    $s2, $v0, $zero
-/* B362D0 80241700 0220202D */  daddu     $a0, $s1, $zero
-/* B362D4 80241704 8E050000 */  lw        $a1, ($s0)
-/* B362D8 80241708 0C0B1EAF */  jal       get_variable
-/* B362DC 8024170C 0040802D */   daddu    $s0, $v0, $zero
-/* B362E0 80241710 0000202D */  daddu     $a0, $zero, $zero
-/* B362E4 80241714 324500FF */  andi      $a1, $s2, 0xff
-/* B362E8 80241718 320600FF */  andi      $a2, $s0, 0xff
-/* B362EC 8024171C 0C04DF84 */  jal       set_transition_stencil_color
-/* B362F0 80241720 304700FF */   andi     $a3, $v0, 0xff
-/* B362F4 80241724 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B362F8 80241728 8FB20018 */  lw        $s2, 0x18($sp)
-/* B362FC 8024172C 8FB10014 */  lw        $s1, 0x14($sp)
-/* B36300 80241730 8FB00010 */  lw        $s0, 0x10($sp)
-/* B36304 80241734 24020002 */  addiu     $v0, $zero, 2
-/* B36308 80241738 03E00008 */  jr        $ra
-/* B3630C 8024173C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802417A4_B36374.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802417A4_B36374.s
deleted file mode 100644
index 34e096fc88..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802417A4_B36374.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417A4_B36374
-/* B36374 802417A4 03E00008 */  jr        $ra
-/* B36378 802417A8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s
deleted file mode 100644
index 25839eea48..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241EFC_B36ACC
-/* B36ACC 80241EFC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36AD0 80241F00 AFBF0014 */  sw        $ra, 0x14($sp)
-/* B36AD4 80241F04 AFB00010 */  sw        $s0, 0x10($sp)
-/* B36AD8 80241F08 0C00EABB */  jal       get_npc_unsafe
-/* B36ADC 80241F0C 8C84014C */   lw       $a0, 0x14c($a0)
-/* B36AE0 80241F10 24040008 */  addiu     $a0, $zero, 8
-/* B36AE4 80241F14 0040802D */  daddu     $s0, $v0, $zero
-/* B36AE8 80241F18 3C028024 */  lui       $v0, %hi(func_80241F68_B36B38)
-/* B36AEC 80241F1C 24421F68 */  addiu     $v0, $v0, %lo(func_80241F68_B36B38)
-/* B36AF0 80241F20 0C00AB39 */  jal       heap_malloc
-/* B36AF4 80241F24 AE020008 */   sw       $v0, 8($s0)
-/* B36AF8 80241F28 0040182D */  daddu     $v1, $v0, $zero
-/* B36AFC 80241F2C AE030020 */  sw        $v1, 0x20($s0)
-/* B36B00 80241F30 AC600000 */  sw        $zero, ($v1)
-/* B36B04 80241F34 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B36B08 80241F38 8FB00010 */  lw        $s0, 0x10($sp)
-/* B36B0C 80241F3C 24020001 */  addiu     $v0, $zero, 1
-/* B36B10 80241F40 03E00008 */  jr        $ra
-/* B36B14 80241F44 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s
deleted file mode 100644
index 3982ac044a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F68_B36B38
-/* B36B38 80241F68 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36B3C 80241F6C 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* B36B40 80241F70 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* B36B44 80241F74 3C05800B */  lui       $a1, %hi(gCameras)
-/* B36B48 80241F78 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B36B4C 80241F7C AFBF0010 */  sw        $ra, 0x10($sp)
-/* B36B50 80241F80 00031080 */  sll       $v0, $v1, 2
-/* B36B54 80241F84 00431021 */  addu      $v0, $v0, $v1
-/* B36B58 80241F88 00021080 */  sll       $v0, $v0, 2
-/* B36B5C 80241F8C 00431023 */  subu      $v0, $v0, $v1
-/* B36B60 80241F90 000218C0 */  sll       $v1, $v0, 3
-/* B36B64 80241F94 00431021 */  addu      $v0, $v0, $v1
-/* B36B68 80241F98 8C830020 */  lw        $v1, 0x20($a0)
-/* B36B6C 80241F9C 000210C0 */  sll       $v0, $v0, 3
-/* B36B70 80241FA0 8C630000 */  lw        $v1, ($v1)
-/* B36B74 80241FA4 30630001 */  andi      $v1, $v1, 1
-/* B36B78 80241FA8 10600004 */  beqz      $v1, .L80241FBC
-/* B36B7C 80241FAC 00451021 */   addu     $v0, $v0, $a1
-/* B36B80 80241FB0 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* B36B84 80241FB4 0C00A6C9 */  jal       clamp_angle
-/* B36B88 80241FB8 46006307 */   neg.s    $f12, $f12
-.L80241FBC:
-/* B36B8C 80241FBC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36B90 80241FC0 03E00008 */  jr        $ra
-/* B36B94 80241FC4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s
deleted file mode 100644
index 36b16344be..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242114_B36CE4
-/* B36CE4 80242114 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B36CE8 80242118 AFB00010 */  sw        $s0, 0x10($sp)
-/* B36CEC 8024211C 0080802D */  daddu     $s0, $a0, $zero
-/* B36CF0 80242120 AFBF0020 */  sw        $ra, 0x20($sp)
-/* B36CF4 80242124 AFB3001C */  sw        $s3, 0x1c($sp)
-/* B36CF8 80242128 AFB20018 */  sw        $s2, 0x18($sp)
-/* B36CFC 8024212C 10A00009 */  beqz      $a1, .L80242154
-/* B36D00 80242130 AFB10014 */   sw       $s1, 0x14($sp)
-/* B36D04 80242134 0000202D */  daddu     $a0, $zero, $zero
-/* B36D08 80242138 0080282D */  daddu     $a1, $a0, $zero
-/* B36D0C 8024213C 0080302D */  daddu     $a2, $a0, $zero
-/* B36D10 80242140 0C046F97 */  jal       set_background_color_blend
-/* B36D14 80242144 240700FF */   addiu    $a3, $zero, 0xff
-/* B36D18 80242148 240200FF */  addiu     $v0, $zero, 0xff
-/* B36D1C 8024214C AE020070 */  sw        $v0, 0x70($s0)
-/* B36D20 80242150 AE000074 */  sw        $zero, 0x74($s0)
-.L80242154:
-/* B36D24 80242154 8E020070 */  lw        $v0, 0x70($s0)
-/* B36D28 80242158 2442FFF8 */  addiu     $v0, $v0, -8
-/* B36D2C 8024215C 04410002 */  bgez      $v0, .L80242168
-/* B36D30 80242160 AE020070 */   sw       $v0, 0x70($s0)
-/* B36D34 80242164 AE000070 */  sw        $zero, 0x70($s0)
-.L80242168:
-/* B36D38 80242168 0000202D */  daddu     $a0, $zero, $zero
-/* B36D3C 8024216C 0080282D */  daddu     $a1, $a0, $zero
-/* B36D40 80242170 92070073 */  lbu       $a3, 0x73($s0)
-/* B36D44 80242174 0C046F97 */  jal       set_background_color_blend
-/* B36D48 80242178 0080302D */   daddu    $a2, $a0, $zero
-/* B36D4C 8024217C 8E020070 */  lw        $v0, 0x70($s0)
-/* B36D50 80242180 14400006 */  bnez      $v0, .L8024219C
-/* B36D54 80242184 00000000 */   nop
-/* B36D58 80242188 8E020074 */  lw        $v0, 0x74($s0)
-/* B36D5C 8024218C 14400003 */  bnez      $v0, .L8024219C
-/* B36D60 80242190 24020001 */   addiu    $v0, $zero, 1
-/* B36D64 80242194 0809089A */  j         .L80242268
-/* B36D68 80242198 AE020074 */   sw       $v0, 0x74($s0)
-.L8024219C:
-/* B36D6C 8024219C 8E030074 */  lw        $v1, 0x74($s0)
-/* B36D70 802421A0 24020001 */  addiu     $v0, $zero, 1
-/* B36D74 802421A4 14620031 */  bne       $v1, $v0, .L8024226C
-/* B36D78 802421A8 0000102D */   daddu    $v0, $zero, $zero
-/* B36D7C 802421AC 0C04760B */  jal       func_8011D82C
-/* B36D80 802421B0 0000202D */   daddu    $a0, $zero, $zero
-/* B36D84 802421B4 0000802D */  daddu     $s0, $zero, $zero
-/* B36D88 802421B8 2413FFFC */  addiu     $s3, $zero, -4
-/* B36D8C 802421BC 24120011 */  addiu     $s2, $zero, 0x11
-/* B36D90 802421C0 3C11FF7F */  lui       $s1, 0xff7f
-/* B36D94 802421C4 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* B36D98 802421C8 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* B36D9C 802421CC 3631FFFF */  ori       $s1, $s1, 0xffff
-/* B36DA0 802421D0 A0400000 */  sb        $zero, ($v0)
-.L802421D4:
-/* B36DA4 802421D4 0C00E2B7 */  jal       get_npc_by_index
-/* B36DA8 802421D8 0200202D */   daddu    $a0, $s0, $zero
-/* B36DAC 802421DC 0040202D */  daddu     $a0, $v0, $zero
-/* B36DB0 802421E0 5080000B */  beql      $a0, $zero, .L80242210
-/* B36DB4 802421E4 26100001 */   addiu    $s0, $s0, 1
-/* B36DB8 802421E8 8C820000 */  lw        $v0, ($a0)
-/* B36DBC 802421EC 50400008 */  beql      $v0, $zero, .L80242210
-/* B36DC0 802421F0 26100001 */   addiu    $s0, $s0, 1
-/* B36DC4 802421F4 808300A4 */  lb        $v1, 0xa4($a0)
-/* B36DC8 802421F8 10730005 */  beq       $v1, $s3, .L80242210
-/* B36DCC 802421FC 26100001 */   addiu    $s0, $s0, 1
-/* B36DD0 80242200 10720003 */  beq       $v1, $s2, .L80242210
-/* B36DD4 80242204 00000000 */   nop
-/* B36DD8 80242208 00511024 */  and       $v0, $v0, $s1
-/* B36DDC 8024220C AC820000 */  sw        $v0, ($a0)
-.L80242210:
-/* B36DE0 80242210 2A020040 */  slti      $v0, $s0, 0x40
-/* B36DE4 80242214 1440FFEF */  bnez      $v0, .L802421D4
-/* B36DE8 80242218 00000000 */   nop
-/* B36DEC 8024221C 0000802D */  daddu     $s0, $zero, $zero
-/* B36DF0 80242220 3C11F7FF */  lui       $s1, 0xf7ff
-/* B36DF4 80242224 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80242228:
-/* B36DF8 80242228 0C04C3D6 */  jal       get_item_entity
-/* B36DFC 8024222C 0200202D */   daddu    $a0, $s0, $zero
-/* B36E00 80242230 0040182D */  daddu     $v1, $v0, $zero
-/* B36E04 80242234 10600007 */  beqz      $v1, .L80242254
-/* B36E08 80242238 26100001 */   addiu    $s0, $s0, 1
-/* B36E0C 8024223C 8C640000 */  lw        $a0, ($v1)
-/* B36E10 80242240 30820010 */  andi      $v0, $a0, 0x10
-/* B36E14 80242244 10400003 */  beqz      $v0, .L80242254
-/* B36E18 80242248 00000000 */   nop
-/* B36E1C 8024224C 00911024 */  and       $v0, $a0, $s1
-/* B36E20 80242250 AC620000 */  sw        $v0, ($v1)
-.L80242254:
-/* B36E24 80242254 2A020100 */  slti      $v0, $s0, 0x100
-/* B36E28 80242258 1440FFF3 */  bnez      $v0, .L80242228
-/* B36E2C 8024225C 24020002 */   addiu    $v0, $zero, 2
-/* B36E30 80242260 0809089B */  j         .L8024226C
-/* B36E34 80242264 00000000 */   nop
-.L80242268:
-/* B36E38 80242268 0000102D */  daddu     $v0, $zero, $zero
-.L8024226C:
-/* B36E3C 8024226C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* B36E40 80242270 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B36E44 80242274 8FB20018 */  lw        $s2, 0x18($sp)
-/* B36E48 80242278 8FB10014 */  lw        $s1, 0x14($sp)
-/* B36E4C 8024227C 8FB00010 */  lw        $s0, 0x10($sp)
-/* B36E50 80242280 03E00008 */  jr        $ra
-/* B36E54 80242284 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B44D80/func_80240610_B44D80.s b/ver/us/asm/nonmatchings/world/area_jan/jan_04/B44D80/func_80240610_B44D80.s
deleted file mode 100644
index 0ea364f25c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B44D80/func_80240610_B44D80.s
+++ /dev/null
@@ -1,112 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240610_B44D80
-/* B44D80 80240610 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B44D84 80240614 AFB20018 */  sw        $s2, 0x18($sp)
-/* B44D88 80240618 0080902D */  daddu     $s2, $a0, $zero
-/* B44D8C 8024061C AFB10014 */  sw        $s1, 0x14($sp)
-/* B44D90 80240620 00A0882D */  daddu     $s1, $a1, $zero
-/* B44D94 80240624 AFBF0024 */  sw        $ra, 0x24($sp)
-/* B44D98 80240628 AFB40020 */  sw        $s4, 0x20($sp)
-/* B44D9C 8024062C AFB3001C */  sw        $s3, 0x1c($sp)
-/* B44DA0 80240630 AFB00010 */  sw        $s0, 0x10($sp)
-/* B44DA4 80240634 8E50000C */  lw        $s0, 0xc($s2)
-/* B44DA8 80240638 8E050000 */  lw        $a1, ($s0)
-/* B44DAC 8024063C 0C0B1EAF */  jal       get_variable
-/* B44DB0 80240640 26100004 */   addiu    $s0, $s0, 4
-/* B44DB4 80240644 0240202D */  daddu     $a0, $s2, $zero
-/* B44DB8 80240648 8E050000 */  lw        $a1, ($s0)
-/* B44DBC 8024064C 0C0B1EAF */  jal       get_variable
-/* B44DC0 80240650 0040802D */   daddu    $s0, $v0, $zero
-/* B44DC4 80240654 0200202D */  daddu     $a0, $s0, $zero
-/* B44DC8 80240658 0C00EAD2 */  jal       get_npc_safe
-/* B44DCC 8024065C 0040A02D */   daddu    $s4, $v0, $zero
-/* B44DD0 80240660 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* B44DD4 80240664 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* B44DD8 80240668 12200006 */  beqz      $s1, .L80240684
-/* B44DDC 8024066C 0040802D */   daddu    $s0, $v0, $zero
-/* B44DE0 80240670 82620012 */  lb        $v0, 0x12($s3)
-/* B44DE4 80240674 54400003 */  bnel      $v0, $zero, .L80240684
-/* B44DE8 80240678 AE400070 */   sw       $zero, 0x70($s2)
-/* B44DEC 8024067C 24020002 */  addiu     $v0, $zero, 2
-/* B44DF0 80240680 AE420070 */  sw        $v0, 0x70($s2)
-.L80240684:
-/* B44DF4 80240684 8E430070 */  lw        $v1, 0x70($s2)
-/* B44DF8 80240688 24110001 */  addiu     $s1, $zero, 1
-/* B44DFC 8024068C 10710013 */  beq       $v1, $s1, .L802406DC
-/* B44E00 80240690 28620002 */   slti     $v0, $v1, 2
-/* B44E04 80240694 10400005 */  beqz      $v0, .L802406AC
-/* B44E08 80240698 24020002 */   addiu    $v0, $zero, 2
-/* B44E0C 8024069C 10600009 */  beqz      $v1, .L802406C4
-/* B44E10 802406A0 0000102D */   daddu    $v0, $zero, $zero
-/* B44E14 802406A4 080901DD */  j         .L80240774
-/* B44E18 802406A8 00000000 */   nop
-.L802406AC:
-/* B44E1C 802406AC 10620013 */  beq       $v1, $v0, .L802406FC
-/* B44E20 802406B0 24020003 */   addiu    $v0, $zero, 3
-/* B44E24 802406B4 1062001E */  beq       $v1, $v0, .L80240730
-/* B44E28 802406B8 0000102D */   daddu    $v0, $zero, $zero
-/* B44E2C 802406BC 080901DD */  j         .L80240774
-/* B44E30 802406C0 00000000 */   nop
-.L802406C4:
-/* B44E34 802406C4 0C03AC5A */  jal       func_800EB168
-/* B44E38 802406C8 0000202D */   daddu    $a0, $zero, $zero
-/* B44E3C 802406CC 2402001E */  addiu     $v0, $zero, 0x1e
-/* B44E40 802406D0 AE420074 */  sw        $v0, 0x74($s2)
-/* B44E44 802406D4 080901DC */  j         .L80240770
-/* B44E48 802406D8 AE510070 */   sw       $s1, 0x70($s2)
-.L802406DC:
-/* B44E4C 802406DC 8E420074 */  lw        $v0, 0x74($s2)
-/* B44E50 802406E0 2403FFFF */  addiu     $v1, $zero, -1
-/* B44E54 802406E4 2442FFFF */  addiu     $v0, $v0, -1
-/* B44E58 802406E8 14430021 */  bne       $v0, $v1, .L80240770
-/* B44E5C 802406EC AE420074 */   sw       $v0, 0x74($s2)
-/* B44E60 802406F0 24020002 */  addiu     $v0, $zero, 2
-/* B44E64 802406F4 080901DC */  j         .L80240770
-/* B44E68 802406F8 AE420070 */   sw       $v0, 0x70($s2)
-.L802406FC:
-/* B44E6C 802406FC 0200202D */  daddu     $a0, $s0, $zero
-/* B44E70 80240700 00141600 */  sll       $v0, $s4, 0x18
-/* B44E74 80240704 00021543 */  sra       $v0, $v0, 0x15
-/* B44E78 80240708 02621021 */  addu      $v0, $s3, $v0
-/* B44E7C 8024070C A2740012 */  sb        $s4, 0x12($s3)
-/* B44E80 80240710 0C03BD17 */  jal       clear_partner_move_history
-/* B44E84 80240714 A0510014 */   sb       $s1, 0x14($v0)
-/* B44E88 80240718 82640012 */  lb        $a0, 0x12($s3)
-/* B44E8C 8024071C 0C03ACA9 */  jal       func_800EB2A4
-/* B44E90 80240720 00000000 */   nop
-/* B44E94 80240724 24020003 */  addiu     $v0, $zero, 3
-/* B44E98 80240728 080901DC */  j         .L80240770
-/* B44E9C 8024072C AE420070 */   sw       $v0, 0x70($s2)
-.L80240730:
-/* B44EA0 80240730 0C00EAD2 */  jal       get_npc_safe
-/* B44EA4 80240734 2404FFFC */   addiu    $a0, $zero, -4
-/* B44EA8 80240738 8E05000C */  lw        $a1, 0xc($s0)
-/* B44EAC 8024073C 0C00ECD0 */  jal       set_npc_yaw
-/* B44EB0 80240740 0040202D */   daddu    $a0, $v0, $zero
-/* B44EB4 80240744 0200202D */  daddu     $a0, $s0, $zero
-/* B44EB8 80240748 8E020000 */  lw        $v0, ($s0)
-/* B44EBC 8024074C 2403FFFB */  addiu     $v1, $zero, -5
-/* B44EC0 80240750 00431024 */  and       $v0, $v0, $v1
-/* B44EC4 80240754 0C00EAFF */  jal       disable_npc_shadow
-/* B44EC8 80240758 AE020000 */   sw       $v0, ($s0)
-/* B44ECC 8024075C 3C01C47A */  lui       $at, 0xc47a
-/* B44ED0 80240760 44810000 */  mtc1      $at, $f0
-/* B44ED4 80240764 24020002 */  addiu     $v0, $zero, 2
-/* B44ED8 80240768 080901DD */  j         .L80240774
-/* B44EDC 8024076C E600003C */   swc1     $f0, 0x3c($s0)
-.L80240770:
-/* B44EE0 80240770 0000102D */  daddu     $v0, $zero, $zero
-.L80240774:
-/* B44EE4 80240774 8FBF0024 */  lw        $ra, 0x24($sp)
-/* B44EE8 80240778 8FB40020 */  lw        $s4, 0x20($sp)
-/* B44EEC 8024077C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B44EF0 80240780 8FB20018 */  lw        $s2, 0x18($sp)
-/* B44EF4 80240784 8FB10014 */  lw        $s1, 0x14($sp)
-/* B44EF8 80240788 8FB00010 */  lw        $s0, 0x10($sp)
-/* B44EFC 8024078C 03E00008 */  jr        $ra
-/* B44F00 80240790 27BD0028 */   addiu    $sp, $sp, 0x28
-/* B44F04 80240794 00000000 */  nop
-/* B44F08 80240798 00000000 */  nop
-/* B44F0C 8024079C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240734_B5E9E4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240734_B5E9E4.s
deleted file mode 100644
index 9bc4dae933..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240734_B5E9E4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240734_B5E9E4
-/* B5E9E4 80240734 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* B5E9E8 80240738 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* B5E9EC 8024073C 000420C0 */  sll       $a0, $a0, 3
-/* B5E9F0 80240740 00822021 */  addu      $a0, $a0, $v0
-/* B5E9F4 80240744 90820014 */  lbu       $v0, 0x14($a0)
-/* B5E9F8 80240748 10400009 */  beqz      $v0, .L80240770
-/* B5E9FC 8024074C 00000000 */   nop
-/* B5EA00 80240750 90820015 */  lbu       $v0, 0x15($a0)
-/* B5EA04 80240754 00022600 */  sll       $a0, $v0, 0x18
-/* B5EA08 80240758 00041E03 */  sra       $v1, $a0, 0x18
-/* B5EA0C 8024075C 00051400 */  sll       $v0, $a1, 0x10
-/* B5EA10 80240760 00021403 */  sra       $v0, $v0, 0x10
-/* B5EA14 80240764 0043102A */  slt       $v0, $v0, $v1
-/* B5EA18 80240768 10400003 */  beqz      $v0, .L80240778
-/* B5EA1C 8024076C 00000000 */   nop
-.L80240770:
-/* B5EA20 80240770 03E00008 */  jr        $ra
-/* B5EA24 80240774 2402FFFF */   addiu    $v0, $zero, -1
-.L80240778:
-/* B5EA28 80240778 03E00008 */  jr        $ra
-/* B5EA2C 8024077C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s
deleted file mode 100644
index e4c639c610..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240780_B5EA30
-/* B5EA30 80240780 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* B5EA34 80240784 AFB3001C */  sw        $s3, 0x1c($sp)
-/* B5EA38 80240788 0080982D */  daddu     $s3, $a0, $zero
-/* B5EA3C 8024078C AFB00010 */  sw        $s0, 0x10($sp)
-/* B5EA40 80240790 24100001 */  addiu     $s0, $zero, 1
-/* B5EA44 80240794 AFB40020 */  sw        $s4, 0x20($sp)
-/* B5EA48 80240798 2414FFFF */  addiu     $s4, $zero, -1
-/* B5EA4C 8024079C AFB50024 */  sw        $s5, 0x24($sp)
-/* B5EA50 802407A0 0200A82D */  daddu     $s5, $s0, $zero
-/* B5EA54 802407A4 AFB10014 */  sw        $s1, 0x14($sp)
-/* B5EA58 802407A8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* B5EA5C 802407AC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* B5EA60 802407B0 AFBF0028 */  sw        $ra, 0x28($sp)
-/* B5EA64 802407B4 AFB20018 */  sw        $s2, 0x18($sp)
-/* B5EA68 802407B8 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* B5EA6C 802407BC 0280182D */  daddu     $v1, $s4, $zero
-/* B5EA70 802407C0 AE630084 */  sw        $v1, 0x84($s3)
-/* B5EA74 802407C4 00021027 */  nor       $v0, $zero, $v0
-/* B5EA78 802407C8 000217C2 */  srl       $v0, $v0, 0x1f
-/* B5EA7C 802407CC 00029400 */  sll       $s2, $v0, 0x10
-.L802407D0:
-/* B5EA80 802407D0 92220014 */  lbu       $v0, 0x14($s1)
-/* B5EA84 802407D4 50400008 */  beql      $v0, $zero, .L802407F8
-/* B5EA88 802407D8 26100001 */   addiu    $s0, $s0, 1
-/* B5EA8C 802407DC 0200202D */  daddu     $a0, $s0, $zero
-/* B5EA90 802407E0 0C0901CD */  jal       func_80240734_B5E9E4
-/* B5EA94 802407E4 00122C03 */   sra      $a1, $s2, 0x10
-/* B5EA98 802407E8 10540003 */  beq       $v0, $s4, .L802407F8
-/* B5EA9C 802407EC 26100001 */   addiu    $s0, $s0, 1
-/* B5EAA0 802407F0 08090201 */  j         .L80240804
-/* B5EAA4 802407F4 AE750084 */   sw       $s5, 0x84($s3)
-.L802407F8:
-/* B5EAA8 802407F8 2A02000C */  slti      $v0, $s0, 0xc
-/* B5EAAC 802407FC 1440FFF4 */  bnez      $v0, .L802407D0
-/* B5EAB0 80240800 26310008 */   addiu    $s1, $s1, 8
-.L80240804:
-/* B5EAB4 80240804 8FBF0028 */  lw        $ra, 0x28($sp)
-/* B5EAB8 80240808 8FB50024 */  lw        $s5, 0x24($sp)
-/* B5EABC 8024080C 8FB40020 */  lw        $s4, 0x20($sp)
-/* B5EAC0 80240810 8FB3001C */  lw        $s3, 0x1c($sp)
-/* B5EAC4 80240814 8FB20018 */  lw        $s2, 0x18($sp)
-/* B5EAC8 80240818 8FB10014 */  lw        $s1, 0x14($sp)
-/* B5EACC 8024081C 8FB00010 */  lw        $s0, 0x10($sp)
-/* B5EAD0 80240820 24020002 */  addiu     $v0, $zero, 2
-/* B5EAD4 80240824 03E00008 */  jr        $ra
-/* B5EAD8 80240828 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s
index 8256286ab2..482084b67b 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s
@@ -49,7 +49,7 @@ glabel func_8024082C_B5EADC
 /* B5EB88 802408D8 AE300108 */  sw        $s0, 0x108($s1)
 /* B5EB8C 802408DC 8C420000 */  lw        $v0, ($v0)
 /* B5EB90 802408E0 02E0282D */  daddu     $a1, $s7, $zero
-/* B5EB94 802408E4 0C0901CD */  jal       func_80240734_B5E9E4
+/* B5EB94 802408E4 0C0901CD */  jal       jan_08_UnkFunc37
 /* B5EB98 802408E8 AE220084 */   sw       $v0, 0x84($s1)
 /* B5EB9C 802408EC 0040202D */  daddu     $a0, $v0, $zero
 /* B5EBA0 802408F0 04800011 */  bltz      $a0, .L80240938
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70_B5EE20.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70_B5EE20.s
deleted file mode 100644
index d076325d3a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70_B5EE20.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B70_B5EE20
-/* B5EE20 80240B70 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B5EE24 80240B74 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B5EE28 80240B78 8C82000C */  lw        $v0, 0xc($a0)
-/* B5EE2C 80240B7C 0C0B1EAF */  jal       get_variable
-/* B5EE30 80240B80 8C450000 */   lw       $a1, ($v0)
-/* B5EE34 80240B84 0040202D */  daddu     $a0, $v0, $zero
-/* B5EE38 80240B88 8C830000 */  lw        $v1, ($a0)
-/* B5EE3C 80240B8C 34630010 */  ori       $v1, $v1, 0x10
-/* B5EE40 80240B90 AC830000 */  sw        $v1, ($a0)
-/* B5EE44 80240B94 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B5EE48 80240B98 24020002 */  addiu     $v0, $zero, 2
-/* B5EE4C 80240B9C 03E00008 */  jr        $ra
-/* B5EE50 80240BA0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241368_B5F618.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241368_B5F618.s
deleted file mode 100644
index 0c9b96679a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241368_B5F618.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241368_B5F618
-/* B5F618 80241368 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* B5F61C 8024136C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* B5F620 80241370 AC800084 */  sw        $zero, 0x84($a0)
-/* B5F624 80241374 80620000 */  lb        $v0, ($v1)
-/* B5F628 80241378 10400005 */  beqz      $v0, .L80241390
-/* B5F62C 8024137C 24020003 */   addiu    $v0, $zero, 3
-/* B5F630 80241380 80630003 */  lb        $v1, 3($v1)
-/* B5F634 80241384 14620002 */  bne       $v1, $v0, .L80241390
-/* B5F638 80241388 24020001 */   addiu    $v0, $zero, 1
-/* B5F63C 8024138C AC820084 */  sw        $v0, 0x84($a0)
-.L80241390:
-/* B5F640 80241390 03E00008 */  jr        $ra
-/* B5F644 80241394 24020002 */   addiu    $v0, $zero, 2
-/* B5F648 80241398 00000000 */  nop
-/* B5F64C 8024139C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240034_B65AE4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240034_B65AE4.s
deleted file mode 100644
index a1a8cc72a4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240034_B65AE4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_B65AE4
-/* B65AE4 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* B65AE8 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* B65AEC 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B65AF0 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* B65AF4 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* B65AF8 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* B65AFC 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* B65B00 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* B65B04 80240054 24020002 */   addiu    $v0, $zero, 2
-/* B65B08 80240058 08090038 */  j         .L802400E0
-/* B65B0C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* B65B10 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* B65B14 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* B65B18 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* B65B1C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* B65B20 80240070 04420001 */  bltzl     $v0, .L80240078
-/* B65B24 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* B65B28 80240078 14400003 */  bnez      $v0, .L80240088
-/* B65B2C 8024007C 00000000 */   nop
-/* B65B30 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* B65B34 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* B65B38 80240088 44822000 */  mtc1      $v0, $f4
-/* B65B3C 8024008C 00000000 */  nop
-/* B65B40 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* B65B44 80240094 44062000 */  mfc1      $a2, $f4
-/* B65B48 80240098 44872000 */  mtc1      $a3, $f4
-/* B65B4C 8024009C 00000000 */  nop
-/* B65B50 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* B65B54 802400A4 44806000 */  mtc1      $zero, $f12
-/* B65B58 802400A8 44072000 */  mfc1      $a3, $f4
-/* B65B5C 802400AC 0C00A720 */  jal       atan2
-/* B65B60 802400B0 46006386 */   mov.s    $f14, $f12
-/* B65B64 802400B4 3C014270 */  lui       $at, 0x4270
-/* B65B68 802400B8 44811000 */  mtc1      $at, $f2
-/* B65B6C 802400BC 00000000 */  nop
-/* B65B70 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* B65B74 802400C4 00000000 */  nop
-/* B65B78 802400C8 45000004 */  bc1f      .L802400DC
-/* B65B7C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* B65B80 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* B65B84 802400D4 08090038 */  j         .L802400E0
-/* B65B88 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* B65B8C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* B65B90 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B65B94 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* B65B98 802400E8 03E00008 */  jr        $ra
-/* B65B9C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s
deleted file mode 100644
index b7fdc24bb8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024018C_B709EC
-/* B709EC 8024018C 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* B709F0 80240190 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* B709F4 80240194 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B709F8 80240198 AFB00010 */  sw        $s0, 0x10($sp)
-/* B709FC 8024019C 0080802D */  daddu     $s0, $a0, $zero
-/* B70A00 802401A0 AFBF0014 */  sw        $ra, 0x14($sp)
-/* B70A04 802401A4 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* B70A08 802401A8 10620003 */  beq       $v1, $v0, .L802401B8
-/* B70A0C 802401AC 24020002 */   addiu    $v0, $zero, 2
-/* B70A10 802401B0 0809008E */  j         .L80240238
-/* B70A14 802401B4 AE000084 */   sw       $zero, 0x84($s0)
-.L802401B8:
-/* B70A18 802401B8 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* B70A1C 802401BC 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* B70A20 802401C0 80620040 */  lb        $v0, 0x40($v1)
-/* B70A24 802401C4 80670044 */  lb        $a3, 0x44($v1)
-/* B70A28 802401C8 04420001 */  bltzl     $v0, .L802401D0
-/* B70A2C 802401CC 00021023 */   negu     $v0, $v0
-.L802401D0:
-/* B70A30 802401D0 14400003 */  bnez      $v0, .L802401E0
-/* B70A34 802401D4 00000000 */   nop
-/* B70A38 802401D8 50E00017 */  beql      $a3, $zero, .L80240238
-/* B70A3C 802401DC 0000102D */   daddu    $v0, $zero, $zero
-.L802401E0:
-/* B70A40 802401E0 44822000 */  mtc1      $v0, $f4
-/* B70A44 802401E4 00000000 */  nop
-/* B70A48 802401E8 46802120 */  cvt.s.w   $f4, $f4
-/* B70A4C 802401EC 44062000 */  mfc1      $a2, $f4
-/* B70A50 802401F0 44872000 */  mtc1      $a3, $f4
-/* B70A54 802401F4 00000000 */  nop
-/* B70A58 802401F8 46802120 */  cvt.s.w   $f4, $f4
-/* B70A5C 802401FC 44806000 */  mtc1      $zero, $f12
-/* B70A60 80240200 44072000 */  mfc1      $a3, $f4
-/* B70A64 80240204 0C00A720 */  jal       atan2
-/* B70A68 80240208 46006386 */   mov.s    $f14, $f12
-/* B70A6C 8024020C 3C014270 */  lui       $at, 0x4270
-/* B70A70 80240210 44811000 */  mtc1      $at, $f2
-/* B70A74 80240214 00000000 */  nop
-/* B70A78 80240218 4602003C */  c.lt.s    $f0, $f2
-/* B70A7C 8024021C 00000000 */  nop
-/* B70A80 80240220 45000004 */  bc1f      .L80240234
-/* B70A84 80240224 24020001 */   addiu    $v0, $zero, 1
-/* B70A88 80240228 AE020084 */  sw        $v0, 0x84($s0)
-/* B70A8C 8024022C 0809008E */  j         .L80240238
-/* B70A90 80240230 24020002 */   addiu    $v0, $zero, 2
-.L80240234:
-/* B70A94 80240234 0000102D */  daddu     $v0, $zero, $zero
-.L80240238:
-/* B70A98 80240238 8FBF0014 */  lw        $ra, 0x14($sp)
-/* B70A9C 8024023C 8FB00010 */  lw        $s0, 0x10($sp)
-/* B70AA0 80240240 03E00008 */  jr        $ra
-/* B70AA4 80240244 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0_B71010.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0_B71010.s
deleted file mode 100644
index e4d4f533b4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0_B71010.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802407B0_B71010
-/* B71010 802407B0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B71014 802407B4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B71018 802407B8 8C82000C */  lw        $v0, 0xc($a0)
-/* B7101C 802407BC 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* B71020 802407C0 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* B71024 802407C4 0C0B2026 */  jal       set_variable
-/* B71028 802407C8 8C450000 */   lw       $a1, ($v0)
-/* B7102C 802407CC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B71030 802407D0 24020002 */  addiu     $v0, $zero, 2
-/* B71034 802407D4 03E00008 */  jr        $ra
-/* B71038 802407D8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s b/ver/us/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s
deleted file mode 100644
index 403244d147..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_B80000
-/* B80000 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* B80004 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* B80008 80240008 0080882D */  daddu     $s1, $a0, $zero
-/* B8000C 8024000C AFBF001C */  sw        $ra, 0x1c($sp)
-/* B80010 80240010 AFB20018 */  sw        $s2, 0x18($sp)
-/* B80014 80240014 AFB00010 */  sw        $s0, 0x10($sp)
-/* B80018 80240018 8E30000C */  lw        $s0, 0xc($s1)
-/* B8001C 8024001C 8E050000 */  lw        $a1, ($s0)
-/* B80020 80240020 0C0B1EAF */  jal       get_variable
-/* B80024 80240024 26100004 */   addiu    $s0, $s0, 4
-/* B80028 80240028 8E050000 */  lw        $a1, ($s0)
-/* B8002C 8024002C 26100004 */  addiu     $s0, $s0, 4
-/* B80030 80240030 0220202D */  daddu     $a0, $s1, $zero
-/* B80034 80240034 0C0B1EAF */  jal       get_variable
-/* B80038 80240038 0040902D */   daddu    $s2, $v0, $zero
-/* B8003C 8024003C 0220202D */  daddu     $a0, $s1, $zero
-/* B80040 80240040 8E050000 */  lw        $a1, ($s0)
-/* B80044 80240044 0C0B1EAF */  jal       get_variable
-/* B80048 80240048 0040802D */   daddu    $s0, $v0, $zero
-/* B8004C 8024004C 0040882D */  daddu     $s1, $v0, $zero
-/* B80050 80240050 2402FFFF */  addiu     $v0, $zero, -1
-/* B80054 80240054 16020005 */  bne       $s0, $v0, .L8024006C
-/* B80058 80240058 24020001 */   addiu    $v0, $zero, 1
-/* B8005C 8024005C 0C04760B */  jal       func_8011D82C
-/* B80060 80240060 0220202D */   daddu    $a0, $s1, $zero
-/* B80064 80240064 08090043 */  j         .L8024010C
-/* B80068 80240068 24020002 */   addiu    $v0, $zero, 2
-.L8024006C:
-/* B8006C 8024006C 12420018 */  beq       $s2, $v0, .L802400D0
-/* B80070 80240070 2A420002 */   slti     $v0, $s2, 2
-/* B80074 80240074 10400005 */  beqz      $v0, .L8024008C
-/* B80078 80240078 24020002 */   addiu    $v0, $zero, 2
-/* B8007C 8024007C 12400007 */  beqz      $s2, .L8024009C
-/* B80080 80240080 3412FFFF */   ori      $s2, $zero, 0xffff
-/* B80084 80240084 08090043 */  j         .L8024010C
-/* B80088 80240088 00000000 */   nop
-.L8024008C:
-/* B8008C 8024008C 1242001B */  beq       $s2, $v0, .L802400FC
-/* B80090 80240090 24020002 */   addiu    $v0, $zero, 2
-/* B80094 80240094 08090043 */  j         .L8024010C
-/* B80098 80240098 00000000 */   nop
-.L8024009C:
-/* B8009C 8024009C 8E040000 */  lw        $a0, ($s0)
-/* B800A0 802400A0 1092001A */  beq       $a0, $s2, .L8024010C
-/* B800A4 802400A4 24020002 */   addiu    $v0, $zero, 2
-/* B800A8 802400A8 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* B800AC 802400AC 26100004 */   addiu    $s0, $s0, 4
-/* B800B0 802400B0 0C046B4C */  jal       get_model_from_list_index
-/* B800B4 802400B4 0040202D */   daddu    $a0, $v0, $zero
-/* B800B8 802400B8 0040202D */  daddu     $a0, $v0, $zero
-/* B800BC 802400BC 2405FFFF */  addiu     $a1, $zero, -1
-/* B800C0 802400C0 0C046F1F */  jal       func_8011BC7C
-/* B800C4 802400C4 0220302D */   daddu    $a2, $s1, $zero
-/* B800C8 802400C8 08090027 */  j         .L8024009C
-/* B800CC 802400CC 00000000 */   nop
-.L802400D0:
-/* B800D0 802400D0 3412FFFF */  ori       $s2, $zero, 0xffff
-.L802400D4:
-/* B800D4 802400D4 8E020000 */  lw        $v0, ($s0)
-/* B800D8 802400D8 1052000B */  beq       $v0, $s2, .L80240108
-/* B800DC 802400DC 2405FFFF */   addiu    $a1, $zero, -1
-/* B800E0 802400E0 96040002 */  lhu       $a0, 2($s0)
-/* B800E4 802400E4 0220302D */  daddu     $a2, $s1, $zero
-/* B800E8 802400E8 26100004 */  addiu     $s0, $s0, 4
-/* B800EC 802400EC 0C046E54 */  jal       func_8011B950
-/* B800F0 802400F0 0000382D */   daddu    $a3, $zero, $zero
-/* B800F4 802400F4 08090035 */  j         .L802400D4
-/* B800F8 802400F8 00000000 */   nop
-.L802400FC:
-/* B800FC 802400FC 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* B80100 80240100 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* B80104 80240104 A0510000 */  sb        $s1, ($v0)
-.L80240108:
-/* B80108 80240108 24020002 */  addiu     $v0, $zero, 2
-.L8024010C:
-/* B8010C 8024010C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* B80110 80240110 8FB20018 */  lw        $s2, 0x18($sp)
-/* B80114 80240114 8FB10014 */  lw        $s1, 0x14($sp)
-/* B80118 80240118 8FB00010 */  lw        $s0, 0x10($sp)
-/* B8011C 8024011C 03E00008 */  jr        $ra
-/* B80120 80240120 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240124_B80124.s b/ver/us/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240124_B80124.s
deleted file mode 100644
index a47606fede..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240124_B80124.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240124_B80124
-/* B80124 80240124 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* B80128 80240128 AFB10034 */  sw        $s1, 0x34($sp)
-/* B8012C 8024012C 0080882D */  daddu     $s1, $a0, $zero
-/* B80130 80240130 AFBF0054 */  sw        $ra, 0x54($sp)
-/* B80134 80240134 AFBE0050 */  sw        $fp, 0x50($sp)
-/* B80138 80240138 AFB7004C */  sw        $s7, 0x4c($sp)
-/* B8013C 8024013C AFB60048 */  sw        $s6, 0x48($sp)
-/* B80140 80240140 AFB50044 */  sw        $s5, 0x44($sp)
-/* B80144 80240144 AFB40040 */  sw        $s4, 0x40($sp)
-/* B80148 80240148 AFB3003C */  sw        $s3, 0x3c($sp)
-/* B8014C 8024014C AFB20038 */  sw        $s2, 0x38($sp)
-/* B80150 80240150 AFB00030 */  sw        $s0, 0x30($sp)
-/* B80154 80240154 8E30000C */  lw        $s0, 0xc($s1)
-/* B80158 80240158 8E050000 */  lw        $a1, ($s0)
-/* B8015C 8024015C 0C0B1EAF */  jal       get_variable
-/* B80160 80240160 26100004 */   addiu    $s0, $s0, 4
-/* B80164 80240164 8E050000 */  lw        $a1, ($s0)
-/* B80168 80240168 26100004 */  addiu     $s0, $s0, 4
-/* B8016C 8024016C 0220202D */  daddu     $a0, $s1, $zero
-/* B80170 80240170 0C0B1EAF */  jal       get_variable
-/* B80174 80240174 0040982D */   daddu    $s3, $v0, $zero
-/* B80178 80240178 8E050000 */  lw        $a1, ($s0)
-/* B8017C 8024017C 26100004 */  addiu     $s0, $s0, 4
-/* B80180 80240180 0220202D */  daddu     $a0, $s1, $zero
-/* B80184 80240184 0C0B1EAF */  jal       get_variable
-/* B80188 80240188 0040B02D */   daddu    $s6, $v0, $zero
-/* B8018C 8024018C 8E050000 */  lw        $a1, ($s0)
-/* B80190 80240190 26100004 */  addiu     $s0, $s0, 4
-/* B80194 80240194 0220202D */  daddu     $a0, $s1, $zero
-/* B80198 80240198 0C0B1EAF */  jal       get_variable
-/* B8019C 8024019C 0040A82D */   daddu    $s5, $v0, $zero
-/* B801A0 802401A0 8E050000 */  lw        $a1, ($s0)
-/* B801A4 802401A4 26100004 */  addiu     $s0, $s0, 4
-/* B801A8 802401A8 0220202D */  daddu     $a0, $s1, $zero
-/* B801AC 802401AC 0C0B1EAF */  jal       get_variable
-/* B801B0 802401B0 0040A02D */   daddu    $s4, $v0, $zero
-/* B801B4 802401B4 8E050000 */  lw        $a1, ($s0)
-/* B801B8 802401B8 26100004 */  addiu     $s0, $s0, 4
-/* B801BC 802401BC 0220202D */  daddu     $a0, $s1, $zero
-/* B801C0 802401C0 0C0B1EAF */  jal       get_variable
-/* B801C4 802401C4 0040902D */   daddu    $s2, $v0, $zero
-/* B801C8 802401C8 8E050000 */  lw        $a1, ($s0)
-/* B801CC 802401CC 26100004 */  addiu     $s0, $s0, 4
-/* B801D0 802401D0 0220202D */  daddu     $a0, $s1, $zero
-/* B801D4 802401D4 0C0B1EAF */  jal       get_variable
-/* B801D8 802401D8 AFA20028 */   sw       $v0, 0x28($sp)
-/* B801DC 802401DC 8E050000 */  lw        $a1, ($s0)
-/* B801E0 802401E0 26100004 */  addiu     $s0, $s0, 4
-/* B801E4 802401E4 0220202D */  daddu     $a0, $s1, $zero
-/* B801E8 802401E8 0C0B1EAF */  jal       get_variable
-/* B801EC 802401EC 0040F02D */   daddu    $fp, $v0, $zero
-/* B801F0 802401F0 8E050000 */  lw        $a1, ($s0)
-/* B801F4 802401F4 26100004 */  addiu     $s0, $s0, 4
-/* B801F8 802401F8 0220202D */  daddu     $a0, $s1, $zero
-/* B801FC 802401FC 0C0B1EAF */  jal       get_variable
-/* B80200 80240200 0040B82D */   daddu    $s7, $v0, $zero
-/* B80204 80240204 0220202D */  daddu     $a0, $s1, $zero
-/* B80208 80240208 8E050000 */  lw        $a1, ($s0)
-/* B8020C 8024020C 0C0B1EAF */  jal       get_variable
-/* B80210 80240210 0040802D */   daddu    $s0, $v0, $zero
-/* B80214 80240214 0040182D */  daddu     $v1, $v0, $zero
-/* B80218 80240218 24020002 */  addiu     $v0, $zero, 2
-/* B8021C 8024021C 12620012 */  beq       $s3, $v0, .L80240268
-/* B80220 80240220 2A620003 */   slti     $v0, $s3, 3
-/* B80224 80240224 10400005 */  beqz      $v0, .L8024023C
-/* B80228 80240228 24020001 */   addiu    $v0, $zero, 1
-/* B8022C 8024022C 12620008 */  beq       $s3, $v0, .L80240250
-/* B80230 80240230 32C400FF */   andi     $a0, $s6, 0xff
-/* B80234 80240234 080900B1 */  j         .L802402C4
-/* B80238 80240238 00000000 */   nop
-.L8024023C:
-/* B8023C 8024023C 24020003 */  addiu     $v0, $zero, 3
-/* B80240 80240240 12620018 */  beq       $s3, $v0, .L802402A4
-/* B80244 80240244 32C400FF */   andi     $a0, $s6, 0xff
-/* B80248 80240248 080900B1 */  j         .L802402C4
-/* B8024C 8024024C 00000000 */   nop
-.L80240250:
-/* B80250 80240250 32A500FF */  andi      $a1, $s5, 0xff
-/* B80254 80240254 328600FF */  andi      $a2, $s4, 0xff
-/* B80258 80240258 0C046F97 */  jal       set_background_color_blend
-/* B8025C 8024025C 324700FF */   andi     $a3, $s2, 0xff
-/* B80260 80240260 080900B1 */  j         .L802402C4
-/* B80264 80240264 00000000 */   nop
-.L80240268:
-/* B80268 80240268 32C400FF */  andi      $a0, $s6, 0xff
-/* B8026C 8024026C 32A500FF */  andi      $a1, $s5, 0xff
-/* B80270 80240270 328600FF */  andi      $a2, $s4, 0xff
-/* B80274 80240274 324700FF */  andi      $a3, $s2, 0xff
-/* B80278 80240278 93A2002B */  lbu       $v0, 0x2b($sp)
-/* B8027C 8024027C AFB0001C */  sw        $s0, 0x1c($sp)
-/* B80280 80240280 AFA30020 */  sw        $v1, 0x20($sp)
-/* B80284 80240284 AFA20010 */  sw        $v0, 0x10($sp)
-/* B80288 80240288 33C200FF */  andi      $v0, $fp, 0xff
-/* B8028C 8024028C AFA20014 */  sw        $v0, 0x14($sp)
-/* B80290 80240290 32E200FF */  andi      $v0, $s7, 0xff
-/* B80294 80240294 0C046FAD */  jal       func_8011BEB4
-/* B80298 80240298 AFA20018 */   sw       $v0, 0x18($sp)
-/* B8029C 8024029C 080900B1 */  j         .L802402C4
-/* B802A0 802402A0 00000000 */   nop
-.L802402A4:
-/* B802A4 802402A4 32A500FF */  andi      $a1, $s5, 0xff
-/* B802A8 802402A8 328600FF */  andi      $a2, $s4, 0xff
-/* B802AC 802402AC 324700FF */  andi      $a3, $s2, 0xff
-/* B802B0 802402B0 93A2002B */  lbu       $v0, 0x2b($sp)
-/* B802B4 802402B4 AFA20010 */  sw        $v0, 0x10($sp)
-/* B802B8 802402B8 33C200FF */  andi      $v0, $fp, 0xff
-/* B802BC 802402BC 0C046FE6 */  jal       func_8011BF98
-/* B802C0 802402C0 AFA20014 */   sw       $v0, 0x14($sp)
-.L802402C4:
-/* B802C4 802402C4 8FBF0054 */  lw        $ra, 0x54($sp)
-/* B802C8 802402C8 8FBE0050 */  lw        $fp, 0x50($sp)
-/* B802CC 802402CC 8FB7004C */  lw        $s7, 0x4c($sp)
-/* B802D0 802402D0 8FB60048 */  lw        $s6, 0x48($sp)
-/* B802D4 802402D4 8FB50044 */  lw        $s5, 0x44($sp)
-/* B802D8 802402D8 8FB40040 */  lw        $s4, 0x40($sp)
-/* B802DC 802402DC 8FB3003C */  lw        $s3, 0x3c($sp)
-/* B802E0 802402E0 8FB20038 */  lw        $s2, 0x38($sp)
-/* B802E4 802402E4 8FB10034 */  lw        $s1, 0x34($sp)
-/* B802E8 802402E8 8FB00030 */  lw        $s0, 0x30($sp)
-/* B802EC 802402EC 24020002 */  addiu     $v0, $zero, 2
-/* B802F0 802402F0 03E00008 */  jr        $ra
-/* B802F4 802402F4 27BD0058 */   addiu    $sp, $sp, 0x58
-/* B802F8 802402F8 00000000 */  nop
-/* B802FC 802402FC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240BE4_AF8534.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240BE4_AF8534.s
deleted file mode 100644
index c6afe39bd7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240BE4_AF8534.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BE4_AF8534
-/* AF8534 80240BE4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AF8538 80240BE8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* AF853C 80240BEC 8C82000C */  lw        $v0, 0xc($a0)
-/* AF8540 80240BF0 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* AF8544 80240BF4 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* AF8548 80240BF8 0C0B2026 */  jal       set_variable
-/* AF854C 80240BFC 8C450000 */   lw       $a1, ($v0)
-/* AF8550 80240C00 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AF8554 80240C04 24020002 */  addiu     $v0, $zero, 2
-/* AF8558 80240C08 03E00008 */  jr        $ra
-/* AF855C 80240C0C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s
deleted file mode 100644
index d30f4382a8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240308_AFDE48.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240308_AFDE48
-/* AFDE48 80240308 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* AFDE4C 8024030C AFB10014 */  sw        $s1, 0x14($sp)
-/* AFDE50 80240310 0080882D */  daddu     $s1, $a0, $zero
-/* AFDE54 80240314 AFBF0018 */  sw        $ra, 0x18($sp)
-/* AFDE58 80240318 AFB00010 */  sw        $s0, 0x10($sp)
-/* AFDE5C 8024031C 8E30000C */  lw        $s0, 0xc($s1)
-/* AFDE60 80240320 8E050000 */  lw        $a1, ($s0)
-/* AFDE64 80240324 0C0B1EAF */  jal       get_variable
-/* AFDE68 80240328 26100004 */   addiu    $s0, $s0, 4
-/* AFDE6C 8024032C 0220202D */  daddu     $a0, $s1, $zero
-/* AFDE70 80240330 8E050000 */  lw        $a1, ($s0)
-/* AFDE74 80240334 0C0B1EAF */  jal       get_variable
-/* AFDE78 80240338 0040882D */   daddu    $s1, $v0, $zero
-/* AFDE7C 8024033C 0000202D */  daddu     $a0, $zero, $zero
-/* AFDE80 80240340 0080282D */  daddu     $a1, $a0, $zero
-/* AFDE84 80240344 0040802D */  daddu     $s0, $v0, $zero
-/* AFDE88 80240348 240600BE */  addiu     $a2, $zero, 0xbe
-/* AFDE8C 8024034C 0C04DF93 */  jal       set_transition_stencil_center
-/* AFDE90 80240350 24070091 */   addiu    $a3, $zero, 0x91
-/* AFDE94 80240354 44900000 */  mtc1      $s0, $f0
-/* AFDE98 80240358 00000000 */  nop
-/* AFDE9C 8024035C 46800020 */  cvt.s.w   $f0, $f0
-/* AFDEA0 80240360 44050000 */  mfc1      $a1, $f0
-/* AFDEA4 80240364 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* AFDEA8 80240368 322400FF */   andi     $a0, $s1, 0xff
-/* AFDEAC 8024036C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* AFDEB0 80240370 8FB10014 */  lw        $s1, 0x14($sp)
-/* AFDEB4 80240374 8FB00010 */  lw        $s0, 0x10($sp)
-/* AFDEB8 80240378 24020002 */  addiu     $v0, $zero, 2
-/* AFDEBC 8024037C 03E00008 */  jr        $ra
-/* AFDEC0 80240380 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s
deleted file mode 100644
index 90f3aabdeb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240384_AFDEC4
-/* AFDEC4 80240384 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* AFDEC8 80240388 AFB10014 */  sw        $s1, 0x14($sp)
-/* AFDECC 8024038C 0080882D */  daddu     $s1, $a0, $zero
-/* AFDED0 80240390 AFBF0018 */  sw        $ra, 0x18($sp)
-/* AFDED4 80240394 AFB00010 */  sw        $s0, 0x10($sp)
-/* AFDED8 80240398 8E30000C */  lw        $s0, 0xc($s1)
-/* AFDEDC 8024039C 8E050000 */  lw        $a1, ($s0)
-/* AFDEE0 802403A0 0C0B1EAF */  jal       get_variable
-/* AFDEE4 802403A4 26100004 */   addiu    $s0, $s0, 4
-/* AFDEE8 802403A8 0220202D */  daddu     $a0, $s1, $zero
-/* AFDEEC 802403AC 8E050000 */  lw        $a1, ($s0)
-/* AFDEF0 802403B0 0C0B1EAF */  jal       get_variable
-/* AFDEF4 802403B4 0040802D */   daddu    $s0, $v0, $zero
-/* AFDEF8 802403B8 44820000 */  mtc1      $v0, $f0
-/* AFDEFC 802403BC 00000000 */  nop
-/* AFDF00 802403C0 46800020 */  cvt.s.w   $f0, $f0
-/* AFDF04 802403C4 24020002 */  addiu     $v0, $zero, 2
-/* AFDF08 802403C8 00501804 */  sllv      $v1, $s0, $v0
-/* AFDF0C 802403CC 00701821 */  addu      $v1, $v1, $s0
-/* AFDF10 802403D0 00431804 */  sllv      $v1, $v1, $v0
-/* AFDF14 802403D4 00701823 */  subu      $v1, $v1, $s0
-/* AFDF18 802403D8 000320C0 */  sll       $a0, $v1, 3
-/* AFDF1C 802403DC 00641821 */  addu      $v1, $v1, $a0
-/* AFDF20 802403E0 000318C0 */  sll       $v1, $v1, 3
-/* AFDF24 802403E4 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* AFDF28 802403E8 00230821 */  addu      $at, $at, $v1
-/* AFDF2C 802403EC E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* AFDF30 802403F0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* AFDF34 802403F4 8FB10014 */  lw        $s1, 0x14($sp)
-/* AFDF38 802403F8 8FB00010 */  lw        $s0, 0x10($sp)
-/* AFDF3C 802403FC 03E00008 */  jr        $ra
-/* AFDF40 80240400 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240480_AFDFC0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240480_AFDFC0.s
deleted file mode 100644
index 4d5e53ea08..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240480_AFDFC0.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240480_AFDFC0
-/* AFDFC0 80240480 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* AFDFC4 80240484 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* AFDFC8 80240488 AC800088 */  sw        $zero, 0x88($a0)
-/* AFDFCC 8024048C 80A30003 */  lb        $v1, 3($a1)
-/* AFDFD0 80240490 80A20002 */  lb        $v0, 2($a1)
-/* AFDFD4 80240494 1462000B */  bne       $v1, $v0, .L802404C4
-/* AFDFD8 80240498 00A0302D */   daddu    $a2, $a1, $zero
-/* AFDFDC 8024049C 80A30006 */  lb        $v1, 6($a1)
-/* AFDFE0 802404A0 80A20005 */  lb        $v0, 5($a1)
-/* AFDFE4 802404A4 14620007 */  bne       $v1, $v0, .L802404C4
-/* AFDFE8 802404A8 00000000 */   nop
-/* AFDFEC 802404AC 80C2028E */  lb        $v0, 0x28e($a2)
-/* AFDFF0 802404B0 84C30290 */  lh        $v1, 0x290($a2)
-/* AFDFF4 802404B4 00021200 */  sll       $v0, $v0, 8
-/* AFDFF8 802404B8 14620004 */  bne       $v1, $v0, .L802404CC
-/* AFDFFC 802404BC 24020001 */   addiu    $v0, $zero, 1
-/* AFE000 802404C0 AC820088 */  sw        $v0, 0x88($a0)
-.L802404C4:
-/* AFE004 802404C4 03E00008 */  jr        $ra
-/* AFE008 802404C8 24020002 */   addiu    $v0, $zero, 2
-.L802404CC:
-/* AFE00C 802404CC 03E00008 */  jr        $ra
-/* AFE010 802404D0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802404D4_AFE014.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802404D4_AFE014.s
deleted file mode 100644
index 22d9ef8aa2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802404D4_AFE014.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404D4_AFE014
-/* AFE014 802404D4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* AFE018 802404D8 AFB10014 */  sw        $s1, 0x14($sp)
-/* AFE01C 802404DC 0080882D */  daddu     $s1, $a0, $zero
-/* AFE020 802404E0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* AFE024 802404E4 AFB20018 */  sw        $s2, 0x18($sp)
-/* AFE028 802404E8 AFB00010 */  sw        $s0, 0x10($sp)
-/* AFE02C 802404EC 8E30000C */  lw        $s0, 0xc($s1)
-/* AFE030 802404F0 8E050000 */  lw        $a1, ($s0)
-/* AFE034 802404F4 0C0B1EAF */  jal       get_variable
-/* AFE038 802404F8 26100004 */   addiu    $s0, $s0, 4
-/* AFE03C 802404FC 8E050000 */  lw        $a1, ($s0)
-/* AFE040 80240500 26100004 */  addiu     $s0, $s0, 4
-/* AFE044 80240504 0220202D */  daddu     $a0, $s1, $zero
-/* AFE048 80240508 0C0B1EAF */  jal       get_variable
-/* AFE04C 8024050C 0040902D */   daddu    $s2, $v0, $zero
-/* AFE050 80240510 0220202D */  daddu     $a0, $s1, $zero
-/* AFE054 80240514 8E050000 */  lw        $a1, ($s0)
-/* AFE058 80240518 0C0B1EAF */  jal       get_variable
-/* AFE05C 8024051C 0040802D */   daddu    $s0, $v0, $zero
-/* AFE060 80240520 0000202D */  daddu     $a0, $zero, $zero
-/* AFE064 80240524 324500FF */  andi      $a1, $s2, 0xff
-/* AFE068 80240528 320600FF */  andi      $a2, $s0, 0xff
-/* AFE06C 8024052C 0C04DF84 */  jal       set_transition_stencil_color
-/* AFE070 80240530 304700FF */   andi     $a3, $v0, 0xff
-/* AFE074 80240534 8FBF001C */  lw        $ra, 0x1c($sp)
-/* AFE078 80240538 8FB20018 */  lw        $s2, 0x18($sp)
-/* AFE07C 8024053C 8FB10014 */  lw        $s1, 0x14($sp)
-/* AFE080 80240540 8FB00010 */  lw        $s0, 0x10($sp)
-/* AFE084 80240544 24020002 */  addiu     $v0, $zero, 2
-/* AFE088 80240548 03E00008 */  jr        $ra
-/* AFE08C 8024054C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4_AFE0F4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4_AFE0F4.s
deleted file mode 100644
index 6351afee78..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4_AFE0F4.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802405B4_AFE0F4
-/* AFE0F4 802405B4 03E00008 */  jr        $ra
-/* AFE0F8 802405B8 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240080_B06A80.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240080_B06A80.s
deleted file mode 100644
index 7f2a0fa486..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240080_B06A80.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240080_B06A80
-/* B06A80 80240080 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B06A84 80240084 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B06A88 80240088 8C82000C */  lw        $v0, 0xc($a0)
-/* B06A8C 8024008C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* B06A90 80240090 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* B06A94 80240094 0C0B2026 */  jal       set_variable
-/* B06A98 80240098 8C450000 */   lw       $a1, ($v0)
-/* B06A9C 8024009C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B06AA0 802400A0 24020002 */  addiu     $v0, $zero, 2
-/* B06AA4 802400A4 03E00008 */  jr        $ra
-/* B06AA8 802400A8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s
index 0f0630b67a..afd62b16df 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s
@@ -46,8 +46,8 @@ glabel func_80240000_8ABF90
 /* 8AC034 802400A4 26100004 */  addiu     $s0, $s0, 4
 /* 8AC038 802400A8 0C0B1EAF */  jal       get_variable
 /* 8AC03C 802400AC 0220202D */   daddu    $a0, $s1, $zero
-/* 8AC040 802400B0 3C018024 */  lui       $at, %hi(D_802440F4)
-/* 8AC044 802400B4 AC2240F4 */  sw        $v0, %lo(D_802440F4)($at)
+/* 8AC040 802400B0 3C018024 */  lui       $at, %hi(flo_16_npcGroup_802440F4)
+/* 8AC044 802400B4 AC2240F4 */  sw        $v0, %lo(flo_16_npcGroup_802440F4)($at)
 /* 8AC048 802400B8 8E050000 */  lw        $a1, ($s0)
 /* 8AC04C 802400BC 26100004 */  addiu     $s0, $s0, 4
 /* 8AC050 802400C0 0C0B1EAF */  jal       get_variable
@@ -139,8 +139,8 @@ glabel func_80240000_8ABF90
 /* 8AC18C 802401FC 00006012 */   mflo     $t4
 /* 8AC190 80240200 3C078024 */  lui       $a3, %hi(D_802440E3)
 /* 8AC194 80240204 90E740E3 */  lbu       $a3, %lo(D_802440E3)($a3)
-/* 8AC198 80240208 3C028024 */  lui       $v0, %hi(D_802440F4)
-/* 8AC19C 8024020C 8C4240F4 */  lw        $v0, %lo(D_802440F4)($v0)
+/* 8AC198 80240208 3C028024 */  lui       $v0, %hi(flo_16_npcGroup_802440F4)
+/* 8AC19C 8024020C 8C4240F4 */  lw        $v0, %lo(flo_16_npcGroup_802440F4)($v0)
 /* 8AC1A0 80240210 00471023 */  subu      $v0, $v0, $a3
 /* 8AC1A4 80240214 00430018 */  mult      $v0, $v1
 /* 8AC1A8 80240218 00004012 */  mflo      $t0
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240034_8B00A4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240034_8B00A4.s
deleted file mode 100644
index 50255ae96f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240034_8B00A4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_8B00A4
-/* 8B00A4 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8B00A8 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8B00AC 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B00B0 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B00B4 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 8B00B8 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8B00BC 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 8B00C0 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 8B00C4 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 8B00C8 80240058 08090038 */  j         .L802400E0
-/* 8B00CC 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 8B00D0 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8B00D4 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8B00D8 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 8B00DC 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 8B00E0 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 8B00E4 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 8B00E8 80240078 14400003 */  bnez      $v0, .L80240088
-/* 8B00EC 8024007C 00000000 */   nop
-/* 8B00F0 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 8B00F4 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 8B00F8 80240088 44822000 */  mtc1      $v0, $f4
-/* 8B00FC 8024008C 00000000 */  nop
-/* 8B0100 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 8B0104 80240094 44062000 */  mfc1      $a2, $f4
-/* 8B0108 80240098 44872000 */  mtc1      $a3, $f4
-/* 8B010C 8024009C 00000000 */  nop
-/* 8B0110 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 8B0114 802400A4 44806000 */  mtc1      $zero, $f12
-/* 8B0118 802400A8 44072000 */  mfc1      $a3, $f4
-/* 8B011C 802400AC 0C00A720 */  jal       atan2
-/* 8B0120 802400B0 46006386 */   mov.s    $f14, $f12
-/* 8B0124 802400B4 3C014270 */  lui       $at, 0x4270
-/* 8B0128 802400B8 44811000 */  mtc1      $at, $f2
-/* 8B012C 802400BC 00000000 */  nop
-/* 8B0130 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 8B0134 802400C4 00000000 */  nop
-/* 8B0138 802400C8 45000004 */  bc1f      .L802400DC
-/* 8B013C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 8B0140 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 8B0144 802400D4 08090038 */  j         .L802400E0
-/* 8B0148 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 8B014C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 8B0150 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8B0154 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B0158 802400E8 03E00008 */  jr        $ra
-/* 8B015C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s
deleted file mode 100644
index c44675208b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406F0_8B0760
-/* 8B0760 802406F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B0764 802406F4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8B0768 802406F8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B076C 802406FC 0C00EABB */  jal       get_npc_unsafe
-/* 8B0770 80240700 8C84014C */   lw       $a0, 0x14c($a0)
-/* 8B0774 80240704 24040008 */  addiu     $a0, $zero, 8
-/* 8B0778 80240708 0040802D */  daddu     $s0, $v0, $zero
-/* 8B077C 8024070C 3C028024 */  lui       $v0, %hi(func_8024075C_8B07CC)
-/* 8B0780 80240710 2442075C */  addiu     $v0, $v0, %lo(func_8024075C_8B07CC)
-/* 8B0784 80240714 0C00AB39 */  jal       heap_malloc
-/* 8B0788 80240718 AE020008 */   sw       $v0, 8($s0)
-/* 8B078C 8024071C 0040182D */  daddu     $v1, $v0, $zero
-/* 8B0790 80240720 AE030020 */  sw        $v1, 0x20($s0)
-/* 8B0794 80240724 AC600000 */  sw        $zero, ($v1)
-/* 8B0798 80240728 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8B079C 8024072C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B07A0 80240730 24020001 */  addiu     $v0, $zero, 1
-/* 8B07A4 80240734 03E00008 */  jr        $ra
-/* 8B07A8 80240738 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024075C_8B07CC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024075C_8B07CC.s
deleted file mode 100644
index aab2466ba6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024075C_8B07CC.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024075C_8B07CC
-/* 8B07CC 8024075C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B07D0 80240760 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 8B07D4 80240764 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 8B07D8 80240768 3C05800B */  lui       $a1, %hi(gCameras)
-/* 8B07DC 8024076C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 8B07E0 80240770 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B07E4 80240774 00031080 */  sll       $v0, $v1, 2
-/* 8B07E8 80240778 00431021 */  addu      $v0, $v0, $v1
-/* 8B07EC 8024077C 00021080 */  sll       $v0, $v0, 2
-/* 8B07F0 80240780 00431023 */  subu      $v0, $v0, $v1
-/* 8B07F4 80240784 000218C0 */  sll       $v1, $v0, 3
-/* 8B07F8 80240788 00431021 */  addu      $v0, $v0, $v1
-/* 8B07FC 8024078C 8C830020 */  lw        $v1, 0x20($a0)
-/* 8B0800 80240790 000210C0 */  sll       $v0, $v0, 3
-/* 8B0804 80240794 8C630000 */  lw        $v1, ($v1)
-/* 8B0808 80240798 30630001 */  andi      $v1, $v1, 1
-/* 8B080C 8024079C 10600004 */  beqz      $v1, .L802407B0
-/* 8B0810 802407A0 00451021 */   addu     $v0, $v0, $a1
-/* 8B0814 802407A4 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 8B0818 802407A8 0C00A6C9 */  jal       clamp_angle
-/* 8B081C 802407AC 46006307 */   neg.s    $f12, $f12
-.L802407B0:
-/* 8B0820 802407B0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B0824 802407B4 03E00008 */  jr        $ra
-/* 8B0828 802407B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s
deleted file mode 100644
index a0fbddb83e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240908_8B0978
-/* 8B0978 80240908 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8B097C 8024090C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B0980 80240910 0080802D */  daddu     $s0, $a0, $zero
-/* 8B0984 80240914 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8B0988 80240918 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8B098C 8024091C AFB20018 */  sw        $s2, 0x18($sp)
-/* 8B0990 80240920 10A00009 */  beqz      $a1, .L80240948
-/* 8B0994 80240924 AFB10014 */   sw       $s1, 0x14($sp)
-/* 8B0998 80240928 0000202D */  daddu     $a0, $zero, $zero
-/* 8B099C 8024092C 0080282D */  daddu     $a1, $a0, $zero
-/* 8B09A0 80240930 0080302D */  daddu     $a2, $a0, $zero
-/* 8B09A4 80240934 0C046F97 */  jal       set_background_color_blend
-/* 8B09A8 80240938 240700FF */   addiu    $a3, $zero, 0xff
-/* 8B09AC 8024093C 240200FF */  addiu     $v0, $zero, 0xff
-/* 8B09B0 80240940 AE020070 */  sw        $v0, 0x70($s0)
-/* 8B09B4 80240944 AE000074 */  sw        $zero, 0x74($s0)
-.L80240948:
-/* 8B09B8 80240948 8E020070 */  lw        $v0, 0x70($s0)
-/* 8B09BC 8024094C 2442FFF8 */  addiu     $v0, $v0, -8
-/* 8B09C0 80240950 04410002 */  bgez      $v0, .L8024095C
-/* 8B09C4 80240954 AE020070 */   sw       $v0, 0x70($s0)
-/* 8B09C8 80240958 AE000070 */  sw        $zero, 0x70($s0)
-.L8024095C:
-/* 8B09CC 8024095C 0000202D */  daddu     $a0, $zero, $zero
-/* 8B09D0 80240960 0080282D */  daddu     $a1, $a0, $zero
-/* 8B09D4 80240964 92070073 */  lbu       $a3, 0x73($s0)
-/* 8B09D8 80240968 0C046F97 */  jal       set_background_color_blend
-/* 8B09DC 8024096C 0080302D */   daddu    $a2, $a0, $zero
-/* 8B09E0 80240970 8E020070 */  lw        $v0, 0x70($s0)
-/* 8B09E4 80240974 14400006 */  bnez      $v0, .L80240990
-/* 8B09E8 80240978 00000000 */   nop
-/* 8B09EC 8024097C 8E020074 */  lw        $v0, 0x74($s0)
-/* 8B09F0 80240980 14400003 */  bnez      $v0, .L80240990
-/* 8B09F4 80240984 24020001 */   addiu    $v0, $zero, 1
-/* 8B09F8 80240988 08090297 */  j         .L80240A5C
-/* 8B09FC 8024098C AE020074 */   sw       $v0, 0x74($s0)
-.L80240990:
-/* 8B0A00 80240990 8E030074 */  lw        $v1, 0x74($s0)
-/* 8B0A04 80240994 24020001 */  addiu     $v0, $zero, 1
-/* 8B0A08 80240998 14620031 */  bne       $v1, $v0, .L80240A60
-/* 8B0A0C 8024099C 0000102D */   daddu    $v0, $zero, $zero
-/* 8B0A10 802409A0 0C04760B */  jal       func_8011D82C
-/* 8B0A14 802409A4 0000202D */   daddu    $a0, $zero, $zero
-/* 8B0A18 802409A8 0000802D */  daddu     $s0, $zero, $zero
-/* 8B0A1C 802409AC 2413FFFC */  addiu     $s3, $zero, -4
-/* 8B0A20 802409B0 24120008 */  addiu     $s2, $zero, 8
-/* 8B0A24 802409B4 3C11FF7F */  lui       $s1, 0xff7f
-/* 8B0A28 802409B8 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 8B0A2C 802409BC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 8B0A30 802409C0 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 8B0A34 802409C4 A0400000 */  sb        $zero, ($v0)
-.L802409C8:
-/* 8B0A38 802409C8 0C00E2B7 */  jal       get_npc_by_index
-/* 8B0A3C 802409CC 0200202D */   daddu    $a0, $s0, $zero
-/* 8B0A40 802409D0 0040202D */  daddu     $a0, $v0, $zero
-/* 8B0A44 802409D4 5080000B */  beql      $a0, $zero, .L80240A04
-/* 8B0A48 802409D8 26100001 */   addiu    $s0, $s0, 1
-/* 8B0A4C 802409DC 8C820000 */  lw        $v0, ($a0)
-/* 8B0A50 802409E0 50400008 */  beql      $v0, $zero, .L80240A04
-/* 8B0A54 802409E4 26100001 */   addiu    $s0, $s0, 1
-/* 8B0A58 802409E8 808300A4 */  lb        $v1, 0xa4($a0)
-/* 8B0A5C 802409EC 10730005 */  beq       $v1, $s3, .L80240A04
-/* 8B0A60 802409F0 26100001 */   addiu    $s0, $s0, 1
-/* 8B0A64 802409F4 10720003 */  beq       $v1, $s2, .L80240A04
-/* 8B0A68 802409F8 00000000 */   nop
-/* 8B0A6C 802409FC 00511024 */  and       $v0, $v0, $s1
-/* 8B0A70 80240A00 AC820000 */  sw        $v0, ($a0)
-.L80240A04:
-/* 8B0A74 80240A04 2A020040 */  slti      $v0, $s0, 0x40
-/* 8B0A78 80240A08 1440FFEF */  bnez      $v0, .L802409C8
-/* 8B0A7C 80240A0C 00000000 */   nop
-/* 8B0A80 80240A10 0000802D */  daddu     $s0, $zero, $zero
-/* 8B0A84 80240A14 3C11F7FF */  lui       $s1, 0xf7ff
-/* 8B0A88 80240A18 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80240A1C:
-/* 8B0A8C 80240A1C 0C04C3D6 */  jal       get_item_entity
-/* 8B0A90 80240A20 0200202D */   daddu    $a0, $s0, $zero
-/* 8B0A94 80240A24 0040182D */  daddu     $v1, $v0, $zero
-/* 8B0A98 80240A28 10600007 */  beqz      $v1, .L80240A48
-/* 8B0A9C 80240A2C 26100001 */   addiu    $s0, $s0, 1
-/* 8B0AA0 80240A30 8C640000 */  lw        $a0, ($v1)
-/* 8B0AA4 80240A34 30820010 */  andi      $v0, $a0, 0x10
-/* 8B0AA8 80240A38 10400003 */  beqz      $v0, .L80240A48
-/* 8B0AAC 80240A3C 00000000 */   nop
-/* 8B0AB0 80240A40 00911024 */  and       $v0, $a0, $s1
-/* 8B0AB4 80240A44 AC620000 */  sw        $v0, ($v1)
-.L80240A48:
-/* 8B0AB8 80240A48 2A020100 */  slti      $v0, $s0, 0x100
-/* 8B0ABC 80240A4C 1440FFF3 */  bnez      $v0, .L80240A1C
-/* 8B0AC0 80240A50 24020002 */   addiu    $v0, $zero, 2
-/* 8B0AC4 80240A54 08090298 */  j         .L80240A60
-/* 8B0AC8 80240A58 00000000 */   nop
-.L80240A5C:
-/* 8B0ACC 80240A5C 0000102D */  daddu     $v0, $zero, $zero
-.L80240A60:
-/* 8B0AD0 80240A60 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 8B0AD4 80240A64 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8B0AD8 80240A68 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8B0ADC 80240A6C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B0AE0 80240A70 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B0AE4 80240A74 03E00008 */  jr        $ra
-/* 8B0AE8 80240A78 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s
deleted file mode 100644
index 9de8aef0ec..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E90_8B1F00
-/* 8B1F00 80241E90 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8B1F04 80241E94 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8B1F08 80241E98 0080902D */  daddu     $s2, $a0, $zero
-/* 8B1F0C 80241E9C AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B1F10 80241EA0 00A0882D */  daddu     $s1, $a1, $zero
-/* 8B1F14 80241EA4 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 8B1F18 80241EA8 AFB40020 */  sw        $s4, 0x20($sp)
-/* 8B1F1C 80241EAC AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8B1F20 80241EB0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B1F24 80241EB4 8E50000C */  lw        $s0, 0xc($s2)
-/* 8B1F28 80241EB8 8E050000 */  lw        $a1, ($s0)
-/* 8B1F2C 80241EBC 0C0B1EAF */  jal       get_variable
-/* 8B1F30 80241EC0 26100004 */   addiu    $s0, $s0, 4
-/* 8B1F34 80241EC4 0240202D */  daddu     $a0, $s2, $zero
-/* 8B1F38 80241EC8 8E050000 */  lw        $a1, ($s0)
-/* 8B1F3C 80241ECC 0C0B1EAF */  jal       get_variable
-/* 8B1F40 80241ED0 0040802D */   daddu    $s0, $v0, $zero
-/* 8B1F44 80241ED4 0200202D */  daddu     $a0, $s0, $zero
-/* 8B1F48 80241ED8 0C00EAD2 */  jal       get_npc_safe
-/* 8B1F4C 80241EDC 0040A02D */   daddu    $s4, $v0, $zero
-/* 8B1F50 80241EE0 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* 8B1F54 80241EE4 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* 8B1F58 80241EE8 12200006 */  beqz      $s1, .L80241F04
-/* 8B1F5C 80241EEC 0040802D */   daddu    $s0, $v0, $zero
-/* 8B1F60 80241EF0 82620012 */  lb        $v0, 0x12($s3)
-/* 8B1F64 80241EF4 54400003 */  bnel      $v0, $zero, .L80241F04
-/* 8B1F68 80241EF8 AE400070 */   sw       $zero, 0x70($s2)
-/* 8B1F6C 80241EFC 24020002 */  addiu     $v0, $zero, 2
-/* 8B1F70 80241F00 AE420070 */  sw        $v0, 0x70($s2)
-.L80241F04:
-/* 8B1F74 80241F04 8E430070 */  lw        $v1, 0x70($s2)
-/* 8B1F78 80241F08 24110001 */  addiu     $s1, $zero, 1
-/* 8B1F7C 80241F0C 10710013 */  beq       $v1, $s1, .L80241F5C
-/* 8B1F80 80241F10 28620002 */   slti     $v0, $v1, 2
-/* 8B1F84 80241F14 10400005 */  beqz      $v0, .L80241F2C
-/* 8B1F88 80241F18 24020002 */   addiu    $v0, $zero, 2
-/* 8B1F8C 80241F1C 10600009 */  beqz      $v1, .L80241F44
-/* 8B1F90 80241F20 0000102D */   daddu    $v0, $zero, $zero
-/* 8B1F94 80241F24 080907FD */  j         .L80241FF4
-/* 8B1F98 80241F28 00000000 */   nop
-.L80241F2C:
-/* 8B1F9C 80241F2C 10620013 */  beq       $v1, $v0, .L80241F7C
-/* 8B1FA0 80241F30 24020003 */   addiu    $v0, $zero, 3
-/* 8B1FA4 80241F34 1062001E */  beq       $v1, $v0, .L80241FB0
-/* 8B1FA8 80241F38 0000102D */   daddu    $v0, $zero, $zero
-/* 8B1FAC 80241F3C 080907FD */  j         .L80241FF4
-/* 8B1FB0 80241F40 00000000 */   nop
-.L80241F44:
-/* 8B1FB4 80241F44 0C03AC5A */  jal       func_800EB168
-/* 8B1FB8 80241F48 0000202D */   daddu    $a0, $zero, $zero
-/* 8B1FBC 80241F4C 2402001E */  addiu     $v0, $zero, 0x1e
-/* 8B1FC0 80241F50 AE420074 */  sw        $v0, 0x74($s2)
-/* 8B1FC4 80241F54 080907FC */  j         .L80241FF0
-/* 8B1FC8 80241F58 AE510070 */   sw       $s1, 0x70($s2)
-.L80241F5C:
-/* 8B1FCC 80241F5C 8E420074 */  lw        $v0, 0x74($s2)
-/* 8B1FD0 80241F60 2403FFFF */  addiu     $v1, $zero, -1
-/* 8B1FD4 80241F64 2442FFFF */  addiu     $v0, $v0, -1
-/* 8B1FD8 80241F68 14430021 */  bne       $v0, $v1, .L80241FF0
-/* 8B1FDC 80241F6C AE420074 */   sw       $v0, 0x74($s2)
-/* 8B1FE0 80241F70 24020002 */  addiu     $v0, $zero, 2
-/* 8B1FE4 80241F74 080907FC */  j         .L80241FF0
-/* 8B1FE8 80241F78 AE420070 */   sw       $v0, 0x70($s2)
-.L80241F7C:
-/* 8B1FEC 80241F7C 0200202D */  daddu     $a0, $s0, $zero
-/* 8B1FF0 80241F80 00141600 */  sll       $v0, $s4, 0x18
-/* 8B1FF4 80241F84 00021543 */  sra       $v0, $v0, 0x15
-/* 8B1FF8 80241F88 02621021 */  addu      $v0, $s3, $v0
-/* 8B1FFC 80241F8C A2740012 */  sb        $s4, 0x12($s3)
-/* 8B2000 80241F90 0C03BD17 */  jal       clear_partner_move_history
-/* 8B2004 80241F94 A0510014 */   sb       $s1, 0x14($v0)
-/* 8B2008 80241F98 82640012 */  lb        $a0, 0x12($s3)
-/* 8B200C 80241F9C 0C03ACA9 */  jal       func_800EB2A4
-/* 8B2010 80241FA0 00000000 */   nop
-/* 8B2014 80241FA4 24020003 */  addiu     $v0, $zero, 3
-/* 8B2018 80241FA8 080907FC */  j         .L80241FF0
-/* 8B201C 80241FAC AE420070 */   sw       $v0, 0x70($s2)
-.L80241FB0:
-/* 8B2020 80241FB0 0C00EAD2 */  jal       get_npc_safe
-/* 8B2024 80241FB4 2404FFFC */   addiu    $a0, $zero, -4
-/* 8B2028 80241FB8 8E05000C */  lw        $a1, 0xc($s0)
-/* 8B202C 80241FBC 0C00ECD0 */  jal       set_npc_yaw
-/* 8B2030 80241FC0 0040202D */   daddu    $a0, $v0, $zero
-/* 8B2034 80241FC4 0200202D */  daddu     $a0, $s0, $zero
-/* 8B2038 80241FC8 8E020000 */  lw        $v0, ($s0)
-/* 8B203C 80241FCC 2403FFFB */  addiu     $v1, $zero, -5
-/* 8B2040 80241FD0 00431024 */  and       $v0, $v0, $v1
-/* 8B2044 80241FD4 0C00EAFF */  jal       disable_npc_shadow
-/* 8B2048 80241FD8 AE020000 */   sw       $v0, ($s0)
-/* 8B204C 80241FDC 3C01C47A */  lui       $at, 0xc47a
-/* 8B2050 80241FE0 44810000 */  mtc1      $at, $f0
-/* 8B2054 80241FE4 24020002 */  addiu     $v0, $zero, 2
-/* 8B2058 80241FE8 080907FD */  j         .L80241FF4
-/* 8B205C 80241FEC E600003C */   swc1     $f0, 0x3c($s0)
-.L80241FF0:
-/* 8B2060 80241FF0 0000102D */  daddu     $v0, $zero, $zero
-.L80241FF4:
-/* 8B2064 80241FF4 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 8B2068 80241FF8 8FB40020 */  lw        $s4, 0x20($sp)
-/* 8B206C 80241FFC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8B2070 80242000 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8B2074 80242004 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B2078 80242008 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B207C 8024200C 03E00008 */  jr        $ra
-/* 8B2080 80242010 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s
deleted file mode 100644
index fb86efd685..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802430B8_8B3128
-/* 8B3128 802430B8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B312C 802430BC AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B3130 802430C0 0080882D */  daddu     $s1, $a0, $zero
-/* 8B3134 802430C4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8B3138 802430C8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B313C 802430CC 8E30000C */  lw        $s0, 0xc($s1)
-/* 8B3140 802430D0 8E050000 */  lw        $a1, ($s0)
-/* 8B3144 802430D4 0C0B1EAF */  jal       get_variable
-/* 8B3148 802430D8 26100004 */   addiu    $s0, $s0, 4
-/* 8B314C 802430DC 0220202D */  daddu     $a0, $s1, $zero
-/* 8B3150 802430E0 8E050000 */  lw        $a1, ($s0)
-/* 8B3154 802430E4 0C0B1EAF */  jal       get_variable
-/* 8B3158 802430E8 0040882D */   daddu    $s1, $v0, $zero
-/* 8B315C 802430EC 0000202D */  daddu     $a0, $zero, $zero
-/* 8B3160 802430F0 0080282D */  daddu     $a1, $a0, $zero
-/* 8B3164 802430F4 0040802D */  daddu     $s0, $v0, $zero
-/* 8B3168 802430F8 240600BE */  addiu     $a2, $zero, 0xbe
-/* 8B316C 802430FC 0C04DF93 */  jal       set_transition_stencil_center
-/* 8B3170 80243100 24070091 */   addiu    $a3, $zero, 0x91
-/* 8B3174 80243104 44900000 */  mtc1      $s0, $f0
-/* 8B3178 80243108 00000000 */  nop
-/* 8B317C 8024310C 46800020 */  cvt.s.w   $f0, $f0
-/* 8B3180 80243110 44050000 */  mfc1      $a1, $f0
-/* 8B3184 80243114 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* 8B3188 80243118 322400FF */   andi     $a0, $s1, 0xff
-/* 8B318C 8024311C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8B3190 80243120 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B3194 80243124 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B3198 80243128 24020002 */  addiu     $v0, $zero, 2
-/* 8B319C 8024312C 03E00008 */  jr        $ra
-/* 8B31A0 80243130 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s
deleted file mode 100644
index a0e579a5bd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243134_8B31A4
-/* 8B31A4 80243134 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B31A8 80243138 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B31AC 8024313C 0080882D */  daddu     $s1, $a0, $zero
-/* 8B31B0 80243140 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8B31B4 80243144 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B31B8 80243148 8E30000C */  lw        $s0, 0xc($s1)
-/* 8B31BC 8024314C 8E050000 */  lw        $a1, ($s0)
-/* 8B31C0 80243150 0C0B1EAF */  jal       get_variable
-/* 8B31C4 80243154 26100004 */   addiu    $s0, $s0, 4
-/* 8B31C8 80243158 0220202D */  daddu     $a0, $s1, $zero
-/* 8B31CC 8024315C 8E050000 */  lw        $a1, ($s0)
-/* 8B31D0 80243160 0C0B1EAF */  jal       get_variable
-/* 8B31D4 80243164 0040802D */   daddu    $s0, $v0, $zero
-/* 8B31D8 80243168 44820000 */  mtc1      $v0, $f0
-/* 8B31DC 8024316C 00000000 */  nop
-/* 8B31E0 80243170 46800020 */  cvt.s.w   $f0, $f0
-/* 8B31E4 80243174 24020002 */  addiu     $v0, $zero, 2
-/* 8B31E8 80243178 00501804 */  sllv      $v1, $s0, $v0
-/* 8B31EC 8024317C 00701821 */  addu      $v1, $v1, $s0
-/* 8B31F0 80243180 00431804 */  sllv      $v1, $v1, $v0
-/* 8B31F4 80243184 00701823 */  subu      $v1, $v1, $s0
-/* 8B31F8 80243188 000320C0 */  sll       $a0, $v1, 3
-/* 8B31FC 8024318C 00641821 */  addu      $v1, $v1, $a0
-/* 8B3200 80243190 000318C0 */  sll       $v1, $v1, 3
-/* 8B3204 80243194 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* 8B3208 80243198 00230821 */  addu      $at, $at, $v1
-/* 8B320C 8024319C E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* 8B3210 802431A0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8B3214 802431A4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B3218 802431A8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B321C 802431AC 03E00008 */  jr        $ra
-/* 8B3220 802431B0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s
deleted file mode 100644
index 1110ac2639..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243230_8B32A0
-/* 8B32A0 80243230 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* 8B32A4 80243234 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* 8B32A8 80243238 AC800088 */  sw        $zero, 0x88($a0)
-/* 8B32AC 8024323C 80A30003 */  lb        $v1, 3($a1)
-/* 8B32B0 80243240 80A20002 */  lb        $v0, 2($a1)
-/* 8B32B4 80243244 1462000B */  bne       $v1, $v0, .L80243274
-/* 8B32B8 80243248 00A0302D */   daddu    $a2, $a1, $zero
-/* 8B32BC 8024324C 80A30006 */  lb        $v1, 6($a1)
-/* 8B32C0 80243250 80A20005 */  lb        $v0, 5($a1)
-/* 8B32C4 80243254 14620007 */  bne       $v1, $v0, .L80243274
-/* 8B32C8 80243258 00000000 */   nop
-/* 8B32CC 8024325C 80C2028E */  lb        $v0, 0x28e($a2)
-/* 8B32D0 80243260 84C30290 */  lh        $v1, 0x290($a2)
-/* 8B32D4 80243264 00021200 */  sll       $v0, $v0, 8
-/* 8B32D8 80243268 14620004 */  bne       $v1, $v0, .L8024327C
-/* 8B32DC 8024326C 24020001 */   addiu    $v0, $zero, 1
-/* 8B32E0 80243270 AC820088 */  sw        $v0, 0x88($a0)
-.L80243274:
-/* 8B32E4 80243274 03E00008 */  jr        $ra
-/* 8B32E8 80243278 24020002 */   addiu    $v0, $zero, 2
-.L8024327C:
-/* 8B32EC 8024327C 03E00008 */  jr        $ra
-/* 8B32F0 80243280 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s
deleted file mode 100644
index 0093b509da..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243284_8B32F4
-/* 8B32F4 80243284 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8B32F8 80243288 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B32FC 8024328C 0080882D */  daddu     $s1, $a0, $zero
-/* 8B3300 80243290 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8B3304 80243294 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8B3308 80243298 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B330C 8024329C 8E30000C */  lw        $s0, 0xc($s1)
-/* 8B3310 802432A0 8E050000 */  lw        $a1, ($s0)
-/* 8B3314 802432A4 0C0B1EAF */  jal       get_variable
-/* 8B3318 802432A8 26100004 */   addiu    $s0, $s0, 4
-/* 8B331C 802432AC 8E050000 */  lw        $a1, ($s0)
-/* 8B3320 802432B0 26100004 */  addiu     $s0, $s0, 4
-/* 8B3324 802432B4 0220202D */  daddu     $a0, $s1, $zero
-/* 8B3328 802432B8 0C0B1EAF */  jal       get_variable
-/* 8B332C 802432BC 0040902D */   daddu    $s2, $v0, $zero
-/* 8B3330 802432C0 0220202D */  daddu     $a0, $s1, $zero
-/* 8B3334 802432C4 8E050000 */  lw        $a1, ($s0)
-/* 8B3338 802432C8 0C0B1EAF */  jal       get_variable
-/* 8B333C 802432CC 0040802D */   daddu    $s0, $v0, $zero
-/* 8B3340 802432D0 0000202D */  daddu     $a0, $zero, $zero
-/* 8B3344 802432D4 324500FF */  andi      $a1, $s2, 0xff
-/* 8B3348 802432D8 320600FF */  andi      $a2, $s0, 0xff
-/* 8B334C 802432DC 0C04DF84 */  jal       set_transition_stencil_color
-/* 8B3350 802432E0 304700FF */   andi     $a3, $v0, 0xff
-/* 8B3354 802432E4 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 8B3358 802432E8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8B335C 802432EC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B3360 802432F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B3364 802432F4 24020002 */  addiu     $v0, $zero, 2
-/* 8B3368 802432F8 03E00008 */  jr        $ra
-/* 8B336C 802432FC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s
deleted file mode 100644
index 1bbbab0937..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243364_8B33D4
-/* 8B33D4 80243364 03E00008 */  jr        $ra
-/* 8B33D8 80243368 24020002 */   addiu    $v0, $zero, 2
-/* 8B33DC 8024336C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s
deleted file mode 100644
index 4029116e1a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802436FC_8B376C
-/* 8B376C 802436FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B3770 80243700 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B3774 80243704 0080802D */  daddu     $s0, $a0, $zero
-/* 8B3778 80243708 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8B377C 8024370C C60C0084 */  lwc1      $f12, 0x84($s0)
-/* 8B3780 80243710 46806320 */  cvt.s.w   $f12, $f12
-/* 8B3784 80243714 C6020090 */  lwc1      $f2, 0x90($s0)
-/* 8B3788 80243718 468010A0 */  cvt.s.w   $f2, $f2
-/* 8B378C 8024371C 44061000 */  mfc1      $a2, $f2
-/* 8B3790 80243720 C6020098 */  lwc1      $f2, 0x98($s0)
-/* 8B3794 80243724 468010A0 */  cvt.s.w   $f2, $f2
-/* 8B3798 80243728 44071000 */  mfc1      $a3, $f2
-/* 8B379C 8024372C C60E008C */  lwc1      $f14, 0x8c($s0)
-/* 8B37A0 80243730 0C00A720 */  jal       atan2
-/* 8B37A4 80243734 468073A0 */   cvt.s.w  $f14, $f14
-/* 8B37A8 80243738 4600008D */  trunc.w.s $f2, $f0
-/* 8B37AC 8024373C E60200AC */  swc1      $f2, 0xac($s0)
-/* 8B37B0 80243740 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8B37B4 80243744 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B37B8 80243748 24020002 */  addiu     $v0, $zero, 2
-/* 8B37BC 8024374C 03E00008 */  jr        $ra
-/* 8B37C0 80243750 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 8B37C4 80243754 00000000 */  nop
-/* 8B37C8 80243758 00000000 */  nop
-/* 8B37CC 8024375C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s
index d05cc040e4..a6aac3916c 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s
@@ -3,8 +3,8 @@
 
 glabel func_802403E0_8CACE0
 /* 8CACE0 802403E0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8CACE4 802403E4 3C048024 */  lui       $a0, %hi(dup_dro_01_GetCurrentCameraYawClamped180)
-/* 8CACE8 802403E8 24843770 */  addiu     $a0, $a0, %lo(dup_dro_01_GetCurrentCameraYawClamped180)
+/* 8CACE4 802403E4 3C048024 */  lui       $a0, %hi(dro_01_dup_GetCurrentCameraYawClamped180)
+/* 8CACE8 802403E8 24843770 */  addiu     $a0, $a0, %lo(dro_01_dup_GetCurrentCameraYawClamped180)
 /* 8CACEC 802403EC 3C028024 */  lui       $v0, %hi(D_80241BF0_8CC4F0)
 /* 8CACF0 802403F0 24421BF0 */  addiu     $v0, $v0, %lo(D_80241BF0_8CC4F0)
 /* 8CACF4 802403F4 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s
deleted file mode 100644
index 28ee01ec3f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240064_8EBE84
-/* 8EBE84 80240064 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8EBE88 80240068 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8EBE8C 8024006C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8EBE90 80240070 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8EBE94 80240074 0080802D */  daddu     $s0, $a0, $zero
-/* 8EBE98 80240078 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8EBE9C 8024007C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 8EBEA0 80240080 10620003 */  beq       $v1, $v0, .L80240090
-/* 8EBEA4 80240084 24020002 */   addiu    $v0, $zero, 2
-/* 8EBEA8 80240088 08090044 */  j         .L80240110
-/* 8EBEAC 8024008C AE000084 */   sw       $zero, 0x84($s0)
-.L80240090:
-/* 8EBEB0 80240090 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8EBEB4 80240094 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8EBEB8 80240098 80620040 */  lb        $v0, 0x40($v1)
-/* 8EBEBC 8024009C 80670044 */  lb        $a3, 0x44($v1)
-/* 8EBEC0 802400A0 04420001 */  bltzl     $v0, .L802400A8
-/* 8EBEC4 802400A4 00021023 */   negu     $v0, $v0
-.L802400A8:
-/* 8EBEC8 802400A8 14400003 */  bnez      $v0, .L802400B8
-/* 8EBECC 802400AC 00000000 */   nop
-/* 8EBED0 802400B0 50E00017 */  beql      $a3, $zero, .L80240110
-/* 8EBED4 802400B4 0000102D */   daddu    $v0, $zero, $zero
-.L802400B8:
-/* 8EBED8 802400B8 44822000 */  mtc1      $v0, $f4
-/* 8EBEDC 802400BC 00000000 */  nop
-/* 8EBEE0 802400C0 46802120 */  cvt.s.w   $f4, $f4
-/* 8EBEE4 802400C4 44062000 */  mfc1      $a2, $f4
-/* 8EBEE8 802400C8 44872000 */  mtc1      $a3, $f4
-/* 8EBEEC 802400CC 00000000 */  nop
-/* 8EBEF0 802400D0 46802120 */  cvt.s.w   $f4, $f4
-/* 8EBEF4 802400D4 44806000 */  mtc1      $zero, $f12
-/* 8EBEF8 802400D8 44072000 */  mfc1      $a3, $f4
-/* 8EBEFC 802400DC 0C00A720 */  jal       atan2
-/* 8EBF00 802400E0 46006386 */   mov.s    $f14, $f12
-/* 8EBF04 802400E4 3C014270 */  lui       $at, 0x4270
-/* 8EBF08 802400E8 44811000 */  mtc1      $at, $f2
-/* 8EBF0C 802400EC 00000000 */  nop
-/* 8EBF10 802400F0 4602003C */  c.lt.s    $f0, $f2
-/* 8EBF14 802400F4 00000000 */  nop
-/* 8EBF18 802400F8 45000004 */  bc1f      .L8024010C
-/* 8EBF1C 802400FC 24020001 */   addiu    $v0, $zero, 1
-/* 8EBF20 80240100 AE020084 */  sw        $v0, 0x84($s0)
-/* 8EBF24 80240104 08090044 */  j         .L80240110
-/* 8EBF28 80240108 24020002 */   addiu    $v0, $zero, 2
-.L8024010C:
-/* 8EBF2C 8024010C 0000102D */  daddu     $v0, $zero, $zero
-.L80240110:
-/* 8EBF30 80240110 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8EBF34 80240114 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8EBF38 80240118 03E00008 */  jr        $ra
-/* 8EBF3C 8024011C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s
deleted file mode 100644
index f31280b935..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412E8_8ED108
-/* 8ED108 802412E8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8ED10C 802412EC AFB10014 */  sw        $s1, 0x14($sp)
-/* 8ED110 802412F0 0080882D */  daddu     $s1, $a0, $zero
-/* 8ED114 802412F4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8ED118 802412F8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8ED11C 802412FC 8E30000C */  lw        $s0, 0xc($s1)
-/* 8ED120 80241300 8E050000 */  lw        $a1, ($s0)
-/* 8ED124 80241304 0C0B1EAF */  jal       get_variable
-/* 8ED128 80241308 26100004 */   addiu    $s0, $s0, 4
-/* 8ED12C 8024130C 0220202D */  daddu     $a0, $s1, $zero
-/* 8ED130 80241310 8E050000 */  lw        $a1, ($s0)
-/* 8ED134 80241314 0C0B1EAF */  jal       get_variable
-/* 8ED138 80241318 0040882D */   daddu    $s1, $v0, $zero
-/* 8ED13C 8024131C 0000202D */  daddu     $a0, $zero, $zero
-/* 8ED140 80241320 0080282D */  daddu     $a1, $a0, $zero
-/* 8ED144 80241324 0040802D */  daddu     $s0, $v0, $zero
-/* 8ED148 80241328 240600BE */  addiu     $a2, $zero, 0xbe
-/* 8ED14C 8024132C 0C04DF93 */  jal       set_transition_stencil_center
-/* 8ED150 80241330 24070091 */   addiu    $a3, $zero, 0x91
-/* 8ED154 80241334 44900000 */  mtc1      $s0, $f0
-/* 8ED158 80241338 00000000 */  nop
-/* 8ED15C 8024133C 46800020 */  cvt.s.w   $f0, $f0
-/* 8ED160 80241340 44050000 */  mfc1      $a1, $f0
-/* 8ED164 80241344 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* 8ED168 80241348 322400FF */   andi     $a0, $s1, 0xff
-/* 8ED16C 8024134C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8ED170 80241350 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8ED174 80241354 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8ED178 80241358 24020002 */  addiu     $v0, $zero, 2
-/* 8ED17C 8024135C 03E00008 */  jr        $ra
-/* 8ED180 80241360 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s
deleted file mode 100644
index 3526b9b28b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241364_8ED184
-/* 8ED184 80241364 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8ED188 80241368 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8ED18C 8024136C 0080882D */  daddu     $s1, $a0, $zero
-/* 8ED190 80241370 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 8ED194 80241374 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8ED198 80241378 8E30000C */  lw        $s0, 0xc($s1)
-/* 8ED19C 8024137C 8E050000 */  lw        $a1, ($s0)
-/* 8ED1A0 80241380 0C0B1EAF */  jal       get_variable
-/* 8ED1A4 80241384 26100004 */   addiu    $s0, $s0, 4
-/* 8ED1A8 80241388 0220202D */  daddu     $a0, $s1, $zero
-/* 8ED1AC 8024138C 8E050000 */  lw        $a1, ($s0)
-/* 8ED1B0 80241390 0C0B1EAF */  jal       get_variable
-/* 8ED1B4 80241394 0040802D */   daddu    $s0, $v0, $zero
-/* 8ED1B8 80241398 44820000 */  mtc1      $v0, $f0
-/* 8ED1BC 8024139C 00000000 */  nop
-/* 8ED1C0 802413A0 46800020 */  cvt.s.w   $f0, $f0
-/* 8ED1C4 802413A4 24020002 */  addiu     $v0, $zero, 2
-/* 8ED1C8 802413A8 00501804 */  sllv      $v1, $s0, $v0
-/* 8ED1CC 802413AC 00701821 */  addu      $v1, $v1, $s0
-/* 8ED1D0 802413B0 00431804 */  sllv      $v1, $v1, $v0
-/* 8ED1D4 802413B4 00701823 */  subu      $v1, $v1, $s0
-/* 8ED1D8 802413B8 000320C0 */  sll       $a0, $v1, 3
-/* 8ED1DC 802413BC 00641821 */  addu      $v1, $v1, $a0
-/* 8ED1E0 802413C0 000318C0 */  sll       $v1, $v1, 3
-/* 8ED1E4 802413C4 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* 8ED1E8 802413C8 00230821 */  addu      $at, $at, $v1
-/* 8ED1EC 802413CC E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* 8ED1F0 802413D0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8ED1F4 802413D4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8ED1F8 802413D8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8ED1FC 802413DC 03E00008 */  jr        $ra
-/* 8ED200 802413E0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s
deleted file mode 100644
index 82e9d6428c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241460_8ED280
-/* 8ED280 80241460 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* 8ED284 80241464 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* 8ED288 80241468 AC800088 */  sw        $zero, 0x88($a0)
-/* 8ED28C 8024146C 80A30003 */  lb        $v1, 3($a1)
-/* 8ED290 80241470 80A20002 */  lb        $v0, 2($a1)
-/* 8ED294 80241474 1462000B */  bne       $v1, $v0, .L802414A4
-/* 8ED298 80241478 00A0302D */   daddu    $a2, $a1, $zero
-/* 8ED29C 8024147C 80A30006 */  lb        $v1, 6($a1)
-/* 8ED2A0 80241480 80A20005 */  lb        $v0, 5($a1)
-/* 8ED2A4 80241484 14620007 */  bne       $v1, $v0, .L802414A4
-/* 8ED2A8 80241488 00000000 */   nop
-/* 8ED2AC 8024148C 80C2028E */  lb        $v0, 0x28e($a2)
-/* 8ED2B0 80241490 84C30290 */  lh        $v1, 0x290($a2)
-/* 8ED2B4 80241494 00021200 */  sll       $v0, $v0, 8
-/* 8ED2B8 80241498 14620004 */  bne       $v1, $v0, .L802414AC
-/* 8ED2BC 8024149C 24020001 */   addiu    $v0, $zero, 1
-/* 8ED2C0 802414A0 AC820088 */  sw        $v0, 0x88($a0)
-.L802414A4:
-/* 8ED2C4 802414A4 03E00008 */  jr        $ra
-/* 8ED2C8 802414A8 24020002 */   addiu    $v0, $zero, 2
-.L802414AC:
-/* 8ED2CC 802414AC 03E00008 */  jr        $ra
-/* 8ED2D0 802414B0 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s
deleted file mode 100644
index 486c6f983e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414B4_8ED2D4
-/* 8ED2D4 802414B4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8ED2D8 802414B8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8ED2DC 802414BC 0080882D */  daddu     $s1, $a0, $zero
-/* 8ED2E0 802414C0 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 8ED2E4 802414C4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8ED2E8 802414C8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8ED2EC 802414CC 8E30000C */  lw        $s0, 0xc($s1)
-/* 8ED2F0 802414D0 8E050000 */  lw        $a1, ($s0)
-/* 8ED2F4 802414D4 0C0B1EAF */  jal       get_variable
-/* 8ED2F8 802414D8 26100004 */   addiu    $s0, $s0, 4
-/* 8ED2FC 802414DC 8E050000 */  lw        $a1, ($s0)
-/* 8ED300 802414E0 26100004 */  addiu     $s0, $s0, 4
-/* 8ED304 802414E4 0220202D */  daddu     $a0, $s1, $zero
-/* 8ED308 802414E8 0C0B1EAF */  jal       get_variable
-/* 8ED30C 802414EC 0040902D */   daddu    $s2, $v0, $zero
-/* 8ED310 802414F0 0220202D */  daddu     $a0, $s1, $zero
-/* 8ED314 802414F4 8E050000 */  lw        $a1, ($s0)
-/* 8ED318 802414F8 0C0B1EAF */  jal       get_variable
-/* 8ED31C 802414FC 0040802D */   daddu    $s0, $v0, $zero
-/* 8ED320 80241500 0000202D */  daddu     $a0, $zero, $zero
-/* 8ED324 80241504 324500FF */  andi      $a1, $s2, 0xff
-/* 8ED328 80241508 320600FF */  andi      $a2, $s0, 0xff
-/* 8ED32C 8024150C 0C04DF84 */  jal       set_transition_stencil_color
-/* 8ED330 80241510 304700FF */   andi     $a3, $v0, 0xff
-/* 8ED334 80241514 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 8ED338 80241518 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8ED33C 8024151C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8ED340 80241520 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8ED344 80241524 24020002 */  addiu     $v0, $zero, 2
-/* 8ED348 80241528 03E00008 */  jr        $ra
-/* 8ED34C 8024152C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594_8ED3B4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594_8ED3B4.s
deleted file mode 100644
index db4c2294e5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594_8ED3B4.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241594_8ED3B4
-/* 8ED3B4 80241594 03E00008 */  jr        $ra
-/* 8ED3B8 80241598 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s
deleted file mode 100644
index 4bf59ba869..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415EC_8ED40C
-/* 8ED40C 802415EC 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 8ED410 802415F0 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 8ED414 802415F4 AC800084 */  sw        $zero, 0x84($a0)
-/* 8ED418 802415F8 80620000 */  lb        $v0, ($v1)
-/* 8ED41C 802415FC 10400005 */  beqz      $v0, .L80241614
-/* 8ED420 80241600 24020003 */   addiu    $v0, $zero, 3
-/* 8ED424 80241604 80630003 */  lb        $v1, 3($v1)
-/* 8ED428 80241608 14620002 */  bne       $v1, $v0, .L80241614
-/* 8ED42C 8024160C 24020001 */   addiu    $v0, $zero, 1
-/* 8ED430 80241610 AC820084 */  sw        $v0, 0x84($a0)
-.L80241614:
-/* 8ED434 80241614 03E00008 */  jr        $ra
-/* 8ED438 80241618 24020002 */   addiu    $v0, $zero, 2
-/* 8ED43C 8024161C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s
deleted file mode 100644
index dc80978139..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417B4_8ED5D4
-/* 8ED5D4 802417B4 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8ED5D8 802417B8 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8ED5DC 802417BC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8ED5E0 802417C0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8ED5E4 802417C4 0080802D */  daddu     $s0, $a0, $zero
-/* 8ED5E8 802417C8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8ED5EC 802417CC 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 8ED5F0 802417D0 10620003 */  beq       $v1, $v0, .L802417E0
-/* 8ED5F4 802417D4 24020002 */   addiu    $v0, $zero, 2
-/* 8ED5F8 802417D8 08090618 */  j         .L80241860
-/* 8ED5FC 802417DC AE000084 */   sw       $zero, 0x84($s0)
-.L802417E0:
-/* 8ED600 802417E0 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8ED604 802417E4 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8ED608 802417E8 80620040 */  lb        $v0, 0x40($v1)
-/* 8ED60C 802417EC 80670044 */  lb        $a3, 0x44($v1)
-/* 8ED610 802417F0 04420001 */  bltzl     $v0, .L802417F8
-/* 8ED614 802417F4 00021023 */   negu     $v0, $v0
-.L802417F8:
-/* 8ED618 802417F8 14400003 */  bnez      $v0, .L80241808
-/* 8ED61C 802417FC 00000000 */   nop
-/* 8ED620 80241800 50E00017 */  beql      $a3, $zero, .L80241860
-/* 8ED624 80241804 0000102D */   daddu    $v0, $zero, $zero
-.L80241808:
-/* 8ED628 80241808 44822000 */  mtc1      $v0, $f4
-/* 8ED62C 8024180C 00000000 */  nop
-/* 8ED630 80241810 46802120 */  cvt.s.w   $f4, $f4
-/* 8ED634 80241814 44062000 */  mfc1      $a2, $f4
-/* 8ED638 80241818 44872000 */  mtc1      $a3, $f4
-/* 8ED63C 8024181C 00000000 */  nop
-/* 8ED640 80241820 46802120 */  cvt.s.w   $f4, $f4
-/* 8ED644 80241824 44806000 */  mtc1      $zero, $f12
-/* 8ED648 80241828 44072000 */  mfc1      $a3, $f4
-/* 8ED64C 8024182C 0C00A720 */  jal       atan2
-/* 8ED650 80241830 46006386 */   mov.s    $f14, $f12
-/* 8ED654 80241834 3C014270 */  lui       $at, 0x4270
-/* 8ED658 80241838 44811000 */  mtc1      $at, $f2
-/* 8ED65C 8024183C 00000000 */  nop
-/* 8ED660 80241840 4602003C */  c.lt.s    $f0, $f2
-/* 8ED664 80241844 00000000 */  nop
-/* 8ED668 80241848 45000004 */  bc1f      .L8024185C
-/* 8ED66C 8024184C 24020001 */   addiu    $v0, $zero, 1
-/* 8ED670 80241850 AE020084 */  sw        $v0, 0x84($s0)
-/* 8ED674 80241854 08090618 */  j         .L80241860
-/* 8ED678 80241858 24020002 */   addiu    $v0, $zero, 2
-.L8024185C:
-/* 8ED67C 8024185C 0000102D */  daddu     $v0, $zero, $zero
-.L80241860:
-/* 8ED680 80241860 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8ED684 80241864 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8ED688 80241868 03E00008 */  jr        $ra
-/* 8ED68C 8024186C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s
deleted file mode 100644
index 7ad38ca70e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D84_8EDBA4
-/* 8EDBA4 80241D84 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8EDBA8 80241D88 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8EDBAC 80241D8C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8EDBB0 80241D90 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8EDBB4 80241D94 0080802D */  daddu     $s0, $a0, $zero
-/* 8EDBB8 80241D98 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8EDBBC 80241D9C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 8EDBC0 80241DA0 10620003 */  beq       $v1, $v0, .L80241DB0
-/* 8EDBC4 80241DA4 24020002 */   addiu    $v0, $zero, 2
-/* 8EDBC8 80241DA8 0809078C */  j         .L80241E30
-/* 8EDBCC 80241DAC AE000084 */   sw       $zero, 0x84($s0)
-.L80241DB0:
-/* 8EDBD0 80241DB0 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8EDBD4 80241DB4 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8EDBD8 80241DB8 80620040 */  lb        $v0, 0x40($v1)
-/* 8EDBDC 80241DBC 80670044 */  lb        $a3, 0x44($v1)
-/* 8EDBE0 80241DC0 04420001 */  bltzl     $v0, .L80241DC8
-/* 8EDBE4 80241DC4 00021023 */   negu     $v0, $v0
-.L80241DC8:
-/* 8EDBE8 80241DC8 14400003 */  bnez      $v0, .L80241DD8
-/* 8EDBEC 80241DCC 00000000 */   nop
-/* 8EDBF0 80241DD0 50E00017 */  beql      $a3, $zero, .L80241E30
-/* 8EDBF4 80241DD4 0000102D */   daddu    $v0, $zero, $zero
-.L80241DD8:
-/* 8EDBF8 80241DD8 44822000 */  mtc1      $v0, $f4
-/* 8EDBFC 80241DDC 00000000 */  nop
-/* 8EDC00 80241DE0 46802120 */  cvt.s.w   $f4, $f4
-/* 8EDC04 80241DE4 44062000 */  mfc1      $a2, $f4
-/* 8EDC08 80241DE8 44872000 */  mtc1      $a3, $f4
-/* 8EDC0C 80241DEC 00000000 */  nop
-/* 8EDC10 80241DF0 46802120 */  cvt.s.w   $f4, $f4
-/* 8EDC14 80241DF4 44806000 */  mtc1      $zero, $f12
-/* 8EDC18 80241DF8 44072000 */  mfc1      $a3, $f4
-/* 8EDC1C 80241DFC 0C00A720 */  jal       atan2
-/* 8EDC20 80241E00 46006386 */   mov.s    $f14, $f12
-/* 8EDC24 80241E04 3C014270 */  lui       $at, 0x4270
-/* 8EDC28 80241E08 44811000 */  mtc1      $at, $f2
-/* 8EDC2C 80241E0C 00000000 */  nop
-/* 8EDC30 80241E10 4602003C */  c.lt.s    $f0, $f2
-/* 8EDC34 80241E14 00000000 */  nop
-/* 8EDC38 80241E18 45000004 */  bc1f      .L80241E2C
-/* 8EDC3C 80241E1C 24020001 */   addiu    $v0, $zero, 1
-/* 8EDC40 80241E20 AE020084 */  sw        $v0, 0x84($s0)
-/* 8EDC44 80241E24 0809078C */  j         .L80241E30
-/* 8EDC48 80241E28 24020002 */   addiu    $v0, $zero, 2
-.L80241E2C:
-/* 8EDC4C 80241E2C 0000102D */  daddu     $v0, $zero, $zero
-.L80241E30:
-/* 8EDC50 80241E30 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8EDC54 80241E34 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8EDC58 80241E38 03E00008 */  jr        $ra
-/* 8EDC5C 80241E3C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s
index be7536dabd..e1ed653674 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s
@@ -15,8 +15,8 @@ glabel func_80240210_8FF090
 /* 8FF0B8 80240238 0040882D */   daddu    $s1, $v0, $zero
 /* 8FF0BC 8024023C 0220202D */  daddu     $a0, $s1, $zero
 /* 8FF0C0 80240240 0040282D */  daddu     $a1, $v0, $zero
-/* 8FF0C4 80240244 3C108024 */  lui       $s0, %hi(func_802407F0_87A3D0)
-/* 8FF0C8 80240248 261007F0 */  addiu     $s0, $s0, %lo(func_802407F0_87A3D0)
+/* 8FF0C4 80240244 3C108024 */  lui       $s0, %hi(tik_07_UnkFunc39)
+/* 8FF0C8 80240248 261007F0 */  addiu     $s0, $s0, %lo(tik_07_UnkFunc39)
 /* 8FF0CC 8024024C 0C01BB7C */  jal       decode_yay0
 /* 8FF0D0 80240250 AE050000 */   sw       $a1, ($s0)
 /* 8FF0D4 80240254 0C00AB1E */  jal       general_heap_free
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350_A54CA0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350_A54CA0.s
deleted file mode 100644
index cc98e251e7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350_A54CA0.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240350_A54CA0
-/* A54CA0 80240350 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A54CA4 80240354 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A54CA8 80240358 8C82000C */  lw        $v0, 0xc($a0)
-/* A54CAC 8024035C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x6)
-/* A54CB0 80240360 84C6A556 */  lh        $a2, %lo(gCollisionStatus+0x6)($a2)
-/* A54CB4 80240364 0C0B2026 */  jal       set_variable
-/* A54CB8 80240368 8C450000 */   lw       $a1, ($v0)
-/* A54CBC 8024036C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A54CC0 80240370 24020002 */  addiu     $v0, $zero, 2
-/* A54CC4 80240374 03E00008 */  jr        $ra
-/* A54CC8 80240378 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240350_A56270.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240350_A56270.s
deleted file mode 100644
index 50c959a2bb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240350_A56270.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240350_A56270
-/* A56270 80240350 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A56274 80240354 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A56278 80240358 8C82000C */  lw        $v0, 0xc($a0)
-/* A5627C 8024035C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x6)
-/* A56280 80240360 84C6A556 */  lh        $a2, %lo(gCollisionStatus+0x6)($a2)
-/* A56284 80240364 0C0B2026 */  jal       set_variable
-/* A56288 80240368 8C450000 */   lw       $a1, ($v0)
-/* A5628C 8024036C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A56290 80240370 24020002 */  addiu     $v0, $zero, 2
-/* A56294 80240374 03E00008 */  jr        $ra
-/* A56298 80240378 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240710_A57BC0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240710_A57BC0.s
deleted file mode 100644
index 372cd36236..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240710_A57BC0.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240710_A57BC0
-/* A57BC0 80240710 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A57BC4 80240714 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A57BC8 80240718 8C82000C */  lw        $v0, 0xc($a0)
-/* A57BCC 8024071C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x6)
-/* A57BD0 80240720 84C6A556 */  lh        $a2, %lo(gCollisionStatus+0x6)($a2)
-/* A57BD4 80240724 0C0B2026 */  jal       set_variable
-/* A57BD8 80240728 8C450000 */   lw       $a1, ($v0)
-/* A57BDC 8024072C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A57BE0 80240730 24020002 */  addiu     $v0, $zero, 2
-/* A57BE4 80240734 03E00008 */  jr        $ra
-/* A57BE8 80240738 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240370_A5A3A0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240370_A5A3A0.s
deleted file mode 100644
index fbb9a5e693..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_16/A5A340/func_80240370_A5A3A0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240370_A5A3A0
-/* A5A3A0 80240370 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A5A3A4 80240374 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A5A3A8 80240378 8C82000C */  lw        $v0, 0xc($a0)
-/* A5A3AC 8024037C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* A5A3B0 80240380 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* A5A3B4 80240384 0C0B2026 */  jal       set_variable
-/* A5A3B8 80240388 8C450000 */   lw       $a1, ($v0)
-/* A5A3BC 8024038C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A5A3C0 80240390 24020002 */  addiu     $v0, $zero, 2
-/* A5A3C4 80240394 03E00008 */  jr        $ra
-/* A5A3C8 80240398 27BD0018 */   addiu    $sp, $sp, 0x18
-/* A5A3CC 8024039C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s
deleted file mode 100644
index 4f22039b02..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241570_A87FC0.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241570_A87FC0
-/* A87FC0 80241570 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A87FC4 80241574 AFB10014 */  sw        $s1, 0x14($sp)
-/* A87FC8 80241578 0080882D */  daddu     $s1, $a0, $zero
-/* A87FCC 8024157C AFBF0018 */  sw        $ra, 0x18($sp)
-/* A87FD0 80241580 AFB00010 */  sw        $s0, 0x10($sp)
-/* A87FD4 80241584 8E30000C */  lw        $s0, 0xc($s1)
-/* A87FD8 80241588 8E050000 */  lw        $a1, ($s0)
-/* A87FDC 8024158C 0C0B1EAF */  jal       get_variable
-/* A87FE0 80241590 26100004 */   addiu    $s0, $s0, 4
-/* A87FE4 80241594 0220202D */  daddu     $a0, $s1, $zero
-/* A87FE8 80241598 8E050000 */  lw        $a1, ($s0)
-/* A87FEC 8024159C 0C0B1EAF */  jal       get_variable
-/* A87FF0 802415A0 0040882D */   daddu    $s1, $v0, $zero
-/* A87FF4 802415A4 0000202D */  daddu     $a0, $zero, $zero
-/* A87FF8 802415A8 0080282D */  daddu     $a1, $a0, $zero
-/* A87FFC 802415AC 0040802D */  daddu     $s0, $v0, $zero
-/* A88000 802415B0 240600BE */  addiu     $a2, $zero, 0xbe
-/* A88004 802415B4 0C04DF93 */  jal       set_transition_stencil_center
-/* A88008 802415B8 24070091 */   addiu    $a3, $zero, 0x91
-/* A8800C 802415BC 44900000 */  mtc1      $s0, $f0
-/* A88010 802415C0 00000000 */  nop
-/* A88014 802415C4 46800020 */  cvt.s.w   $f0, $f0
-/* A88018 802415C8 44050000 */  mfc1      $a1, $f0
-/* A8801C 802415CC 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* A88020 802415D0 322400FF */   andi     $a0, $s1, 0xff
-/* A88024 802415D4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A88028 802415D8 8FB10014 */  lw        $s1, 0x14($sp)
-/* A8802C 802415DC 8FB00010 */  lw        $s0, 0x10($sp)
-/* A88030 802415E0 24020002 */  addiu     $v0, $zero, 2
-/* A88034 802415E4 03E00008 */  jr        $ra
-/* A88038 802415E8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s
deleted file mode 100644
index b103add071..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802415EC_A8803C
-/* A8803C 802415EC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A88040 802415F0 AFB10014 */  sw        $s1, 0x14($sp)
-/* A88044 802415F4 0080882D */  daddu     $s1, $a0, $zero
-/* A88048 802415F8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A8804C 802415FC AFB00010 */  sw        $s0, 0x10($sp)
-/* A88050 80241600 8E30000C */  lw        $s0, 0xc($s1)
-/* A88054 80241604 8E050000 */  lw        $a1, ($s0)
-/* A88058 80241608 0C0B1EAF */  jal       get_variable
-/* A8805C 8024160C 26100004 */   addiu    $s0, $s0, 4
-/* A88060 80241610 0220202D */  daddu     $a0, $s1, $zero
-/* A88064 80241614 8E050000 */  lw        $a1, ($s0)
-/* A88068 80241618 0C0B1EAF */  jal       get_variable
-/* A8806C 8024161C 0040802D */   daddu    $s0, $v0, $zero
-/* A88070 80241620 44820000 */  mtc1      $v0, $f0
-/* A88074 80241624 00000000 */  nop
-/* A88078 80241628 46800020 */  cvt.s.w   $f0, $f0
-/* A8807C 8024162C 24020002 */  addiu     $v0, $zero, 2
-/* A88080 80241630 00501804 */  sllv      $v1, $s0, $v0
-/* A88084 80241634 00701821 */  addu      $v1, $v1, $s0
-/* A88088 80241638 00431804 */  sllv      $v1, $v1, $v0
-/* A8808C 8024163C 00701823 */  subu      $v1, $v1, $s0
-/* A88090 80241640 000320C0 */  sll       $a0, $v1, 3
-/* A88094 80241644 00641821 */  addu      $v1, $v1, $a0
-/* A88098 80241648 000318C0 */  sll       $v1, $v1, 3
-/* A8809C 8024164C 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* A880A0 80241650 00230821 */  addu      $at, $at, $v1
-/* A880A4 80241654 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* A880A8 80241658 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A880AC 8024165C 8FB10014 */  lw        $s1, 0x14($sp)
-/* A880B0 80241660 8FB00010 */  lw        $s0, 0x10($sp)
-/* A880B4 80241664 03E00008 */  jr        $ra
-/* A880B8 80241668 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s
deleted file mode 100644
index be55592e93..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416E8_A88138
-/* A88138 802416E8 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* A8813C 802416EC 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* A88140 802416F0 AC800088 */  sw        $zero, 0x88($a0)
-/* A88144 802416F4 80A30003 */  lb        $v1, 3($a1)
-/* A88148 802416F8 80A20002 */  lb        $v0, 2($a1)
-/* A8814C 802416FC 1462000B */  bne       $v1, $v0, .L8024172C
-/* A88150 80241700 00A0302D */   daddu    $a2, $a1, $zero
-/* A88154 80241704 80A30006 */  lb        $v1, 6($a1)
-/* A88158 80241708 80A20005 */  lb        $v0, 5($a1)
-/* A8815C 8024170C 14620007 */  bne       $v1, $v0, .L8024172C
-/* A88160 80241710 00000000 */   nop
-/* A88164 80241714 80C2028E */  lb        $v0, 0x28e($a2)
-/* A88168 80241718 84C30290 */  lh        $v1, 0x290($a2)
-/* A8816C 8024171C 00021200 */  sll       $v0, $v0, 8
-/* A88170 80241720 14620004 */  bne       $v1, $v0, .L80241734
-/* A88174 80241724 24020001 */   addiu    $v0, $zero, 1
-/* A88178 80241728 AC820088 */  sw        $v0, 0x88($a0)
-.L8024172C:
-/* A8817C 8024172C 03E00008 */  jr        $ra
-/* A88180 80241730 24020002 */   addiu    $v0, $zero, 2
-.L80241734:
-/* A88184 80241734 03E00008 */  jr        $ra
-/* A88188 80241738 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024173C_A8818C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024173C_A8818C.s
deleted file mode 100644
index 7a83096d1d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024173C_A8818C.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024173C_A8818C
-/* A8818C 8024173C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A88190 80241740 AFB10014 */  sw        $s1, 0x14($sp)
-/* A88194 80241744 0080882D */  daddu     $s1, $a0, $zero
-/* A88198 80241748 AFBF001C */  sw        $ra, 0x1c($sp)
-/* A8819C 8024174C AFB20018 */  sw        $s2, 0x18($sp)
-/* A881A0 80241750 AFB00010 */  sw        $s0, 0x10($sp)
-/* A881A4 80241754 8E30000C */  lw        $s0, 0xc($s1)
-/* A881A8 80241758 8E050000 */  lw        $a1, ($s0)
-/* A881AC 8024175C 0C0B1EAF */  jal       get_variable
-/* A881B0 80241760 26100004 */   addiu    $s0, $s0, 4
-/* A881B4 80241764 8E050000 */  lw        $a1, ($s0)
-/* A881B8 80241768 26100004 */  addiu     $s0, $s0, 4
-/* A881BC 8024176C 0220202D */  daddu     $a0, $s1, $zero
-/* A881C0 80241770 0C0B1EAF */  jal       get_variable
-/* A881C4 80241774 0040902D */   daddu    $s2, $v0, $zero
-/* A881C8 80241778 0220202D */  daddu     $a0, $s1, $zero
-/* A881CC 8024177C 8E050000 */  lw        $a1, ($s0)
-/* A881D0 80241780 0C0B1EAF */  jal       get_variable
-/* A881D4 80241784 0040802D */   daddu    $s0, $v0, $zero
-/* A881D8 80241788 0000202D */  daddu     $a0, $zero, $zero
-/* A881DC 8024178C 324500FF */  andi      $a1, $s2, 0xff
-/* A881E0 80241790 320600FF */  andi      $a2, $s0, 0xff
-/* A881E4 80241794 0C04DF84 */  jal       set_transition_stencil_color
-/* A881E8 80241798 304700FF */   andi     $a3, $v0, 0xff
-/* A881EC 8024179C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* A881F0 802417A0 8FB20018 */  lw        $s2, 0x18($sp)
-/* A881F4 802417A4 8FB10014 */  lw        $s1, 0x14($sp)
-/* A881F8 802417A8 8FB00010 */  lw        $s0, 0x10($sp)
-/* A881FC 802417AC 24020002 */  addiu     $v0, $zero, 2
-/* A88200 802417B0 03E00008 */  jr        $ra
-/* A88204 802417B4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024181C_A8826C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024181C_A8826C.s
deleted file mode 100644
index 26a499d3db..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024181C_A8826C.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024181C_A8826C
-/* A8826C 8024181C 03E00008 */  jr        $ra
-/* A88270 80241820 24020002 */   addiu    $v0, $zero, 2
-/* A88274 80241824 00000000 */  nop
-/* A88278 80241828 00000000 */  nop
-/* A8827C 8024182C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s
deleted file mode 100644
index 0808add511..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241650_A8E0D0
-/* A8E0D0 80241650 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A8E0D4 80241654 AFB10014 */  sw        $s1, 0x14($sp)
-/* A8E0D8 80241658 0080882D */  daddu     $s1, $a0, $zero
-/* A8E0DC 8024165C AFBF0018 */  sw        $ra, 0x18($sp)
-/* A8E0E0 80241660 AFB00010 */  sw        $s0, 0x10($sp)
-/* A8E0E4 80241664 8E30000C */  lw        $s0, 0xc($s1)
-/* A8E0E8 80241668 8E050000 */  lw        $a1, ($s0)
-/* A8E0EC 8024166C 0C0B1EAF */  jal       get_variable
-/* A8E0F0 80241670 26100004 */   addiu    $s0, $s0, 4
-/* A8E0F4 80241674 0220202D */  daddu     $a0, $s1, $zero
-/* A8E0F8 80241678 8E050000 */  lw        $a1, ($s0)
-/* A8E0FC 8024167C 0C0B1EAF */  jal       get_variable
-/* A8E100 80241680 0040882D */   daddu    $s1, $v0, $zero
-/* A8E104 80241684 0000202D */  daddu     $a0, $zero, $zero
-/* A8E108 80241688 0080282D */  daddu     $a1, $a0, $zero
-/* A8E10C 8024168C 0040802D */  daddu     $s0, $v0, $zero
-/* A8E110 80241690 240600BE */  addiu     $a2, $zero, 0xbe
-/* A8E114 80241694 0C04DF93 */  jal       set_transition_stencil_center
-/* A8E118 80241698 24070091 */   addiu    $a3, $zero, 0x91
-/* A8E11C 8024169C 44900000 */  mtc1      $s0, $f0
-/* A8E120 802416A0 00000000 */  nop
-/* A8E124 802416A4 46800020 */  cvt.s.w   $f0, $f0
-/* A8E128 802416A8 44050000 */  mfc1      $a1, $f0
-/* A8E12C 802416AC 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* A8E130 802416B0 322400FF */   andi     $a0, $s1, 0xff
-/* A8E134 802416B4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A8E138 802416B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* A8E13C 802416BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* A8E140 802416C0 24020002 */  addiu     $v0, $zero, 2
-/* A8E144 802416C4 03E00008 */  jr        $ra
-/* A8E148 802416C8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s
deleted file mode 100644
index d69b8e6cd0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416CC_A8E14C
-/* A8E14C 802416CC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A8E150 802416D0 AFB10014 */  sw        $s1, 0x14($sp)
-/* A8E154 802416D4 0080882D */  daddu     $s1, $a0, $zero
-/* A8E158 802416D8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A8E15C 802416DC AFB00010 */  sw        $s0, 0x10($sp)
-/* A8E160 802416E0 8E30000C */  lw        $s0, 0xc($s1)
-/* A8E164 802416E4 8E050000 */  lw        $a1, ($s0)
-/* A8E168 802416E8 0C0B1EAF */  jal       get_variable
-/* A8E16C 802416EC 26100004 */   addiu    $s0, $s0, 4
-/* A8E170 802416F0 0220202D */  daddu     $a0, $s1, $zero
-/* A8E174 802416F4 8E050000 */  lw        $a1, ($s0)
-/* A8E178 802416F8 0C0B1EAF */  jal       get_variable
-/* A8E17C 802416FC 0040802D */   daddu    $s0, $v0, $zero
-/* A8E180 80241700 44820000 */  mtc1      $v0, $f0
-/* A8E184 80241704 00000000 */  nop
-/* A8E188 80241708 46800020 */  cvt.s.w   $f0, $f0
-/* A8E18C 8024170C 24020002 */  addiu     $v0, $zero, 2
-/* A8E190 80241710 00501804 */  sllv      $v1, $s0, $v0
-/* A8E194 80241714 00701821 */  addu      $v1, $v1, $s0
-/* A8E198 80241718 00431804 */  sllv      $v1, $v1, $v0
-/* A8E19C 8024171C 00701823 */  subu      $v1, $v1, $s0
-/* A8E1A0 80241720 000320C0 */  sll       $a0, $v1, 3
-/* A8E1A4 80241724 00641821 */  addu      $v1, $v1, $a0
-/* A8E1A8 80241728 000318C0 */  sll       $v1, $v1, 3
-/* A8E1AC 8024172C 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* A8E1B0 80241730 00230821 */  addu      $at, $at, $v1
-/* A8E1B4 80241734 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* A8E1B8 80241738 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A8E1BC 8024173C 8FB10014 */  lw        $s1, 0x14($sp)
-/* A8E1C0 80241740 8FB00010 */  lw        $s0, 0x10($sp)
-/* A8E1C4 80241744 03E00008 */  jr        $ra
-/* A8E1C8 80241748 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417C8_A8E248.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417C8_A8E248.s
deleted file mode 100644
index ed0c0d55d9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417C8_A8E248.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417C8_A8E248
-/* A8E248 802417C8 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* A8E24C 802417CC 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* A8E250 802417D0 AC800088 */  sw        $zero, 0x88($a0)
-/* A8E254 802417D4 80A30003 */  lb        $v1, 3($a1)
-/* A8E258 802417D8 80A20002 */  lb        $v0, 2($a1)
-/* A8E25C 802417DC 1462000B */  bne       $v1, $v0, .L8024180C
-/* A8E260 802417E0 00A0302D */   daddu    $a2, $a1, $zero
-/* A8E264 802417E4 80A30006 */  lb        $v1, 6($a1)
-/* A8E268 802417E8 80A20005 */  lb        $v0, 5($a1)
-/* A8E26C 802417EC 14620007 */  bne       $v1, $v0, .L8024180C
-/* A8E270 802417F0 00000000 */   nop
-/* A8E274 802417F4 80C2028E */  lb        $v0, 0x28e($a2)
-/* A8E278 802417F8 84C30290 */  lh        $v1, 0x290($a2)
-/* A8E27C 802417FC 00021200 */  sll       $v0, $v0, 8
-/* A8E280 80241800 14620004 */  bne       $v1, $v0, .L80241814
-/* A8E284 80241804 24020001 */   addiu    $v0, $zero, 1
-/* A8E288 80241808 AC820088 */  sw        $v0, 0x88($a0)
-.L8024180C:
-/* A8E28C 8024180C 03E00008 */  jr        $ra
-/* A8E290 80241810 24020002 */   addiu    $v0, $zero, 2
-.L80241814:
-/* A8E294 80241814 03E00008 */  jr        $ra
-/* A8E298 80241818 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024181C_A8E29C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024181C_A8E29C.s
deleted file mode 100644
index 2aa8710454..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024181C_A8E29C.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024181C_A8E29C
-/* A8E29C 8024181C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A8E2A0 80241820 AFB10014 */  sw        $s1, 0x14($sp)
-/* A8E2A4 80241824 0080882D */  daddu     $s1, $a0, $zero
-/* A8E2A8 80241828 AFBF001C */  sw        $ra, 0x1c($sp)
-/* A8E2AC 8024182C AFB20018 */  sw        $s2, 0x18($sp)
-/* A8E2B0 80241830 AFB00010 */  sw        $s0, 0x10($sp)
-/* A8E2B4 80241834 8E30000C */  lw        $s0, 0xc($s1)
-/* A8E2B8 80241838 8E050000 */  lw        $a1, ($s0)
-/* A8E2BC 8024183C 0C0B1EAF */  jal       get_variable
-/* A8E2C0 80241840 26100004 */   addiu    $s0, $s0, 4
-/* A8E2C4 80241844 8E050000 */  lw        $a1, ($s0)
-/* A8E2C8 80241848 26100004 */  addiu     $s0, $s0, 4
-/* A8E2CC 8024184C 0220202D */  daddu     $a0, $s1, $zero
-/* A8E2D0 80241850 0C0B1EAF */  jal       get_variable
-/* A8E2D4 80241854 0040902D */   daddu    $s2, $v0, $zero
-/* A8E2D8 80241858 0220202D */  daddu     $a0, $s1, $zero
-/* A8E2DC 8024185C 8E050000 */  lw        $a1, ($s0)
-/* A8E2E0 80241860 0C0B1EAF */  jal       get_variable
-/* A8E2E4 80241864 0040802D */   daddu    $s0, $v0, $zero
-/* A8E2E8 80241868 0000202D */  daddu     $a0, $zero, $zero
-/* A8E2EC 8024186C 324500FF */  andi      $a1, $s2, 0xff
-/* A8E2F0 80241870 320600FF */  andi      $a2, $s0, 0xff
-/* A8E2F4 80241874 0C04DF84 */  jal       set_transition_stencil_color
-/* A8E2F8 80241878 304700FF */   andi     $a3, $v0, 0xff
-/* A8E2FC 8024187C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* A8E300 80241880 8FB20018 */  lw        $s2, 0x18($sp)
-/* A8E304 80241884 8FB10014 */  lw        $s1, 0x14($sp)
-/* A8E308 80241888 8FB00010 */  lw        $s0, 0x10($sp)
-/* A8E30C 8024188C 24020002 */  addiu     $v0, $zero, 2
-/* A8E310 80241890 03E00008 */  jr        $ra
-/* A8E314 80241894 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418FC_A8E37C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418FC_A8E37C.s
deleted file mode 100644
index edd495d882..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418FC_A8E37C.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802418FC_A8E37C
-/* A8E37C 802418FC 03E00008 */  jr        $ra
-/* A8E380 80241900 24020002 */   addiu    $v0, $zero, 2
-/* A8E384 80241904 00000000 */  nop
-/* A8E388 80241908 00000000 */  nop
-/* A8E38C 8024190C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_80240384_C5AAC4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_80240384_C5AAC4.s
deleted file mode 100644
index 15ab5c8513..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_80240384_C5AAC4.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240384_C5AAC4
-/* C5AAC4 80240384 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C5AAC8 80240388 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C5AACC 8024038C 8C82000C */  lw        $v0, 0xc($a0)
-/* C5AAD0 80240390 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* C5AAD4 80240394 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* C5AAD8 80240398 0C0B2026 */  jal       set_variable
-/* C5AADC 8024039C 8C450000 */   lw       $a1, ($v0)
-/* C5AAE0 802403A0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C5AAE4 802403A4 24020002 */  addiu     $v0, $zero, 2
-/* C5AAE8 802403A8 03E00008 */  jr        $ra
-/* C5AAEC 802403AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s
deleted file mode 100644
index cb04afde37..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D88_C5C4C8
-/* C5C4C8 80241D88 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* C5C4CC 80241D8C AFB10014 */  sw        $s1, 0x14($sp)
-/* C5C4D0 80241D90 0080882D */  daddu     $s1, $a0, $zero
-/* C5C4D4 80241D94 AFBF0018 */  sw        $ra, 0x18($sp)
-/* C5C4D8 80241D98 AFB00010 */  sw        $s0, 0x10($sp)
-/* C5C4DC 80241D9C 8E300148 */  lw        $s0, 0x148($s1)
-/* C5C4E0 80241DA0 0C00EABB */  jal       get_npc_unsafe
-/* C5C4E4 80241DA4 86040008 */   lh       $a0, 8($s0)
-/* C5C4E8 80241DA8 0040182D */  daddu     $v1, $v0, $zero
-/* C5C4EC 80241DAC 9462008E */  lhu       $v0, 0x8e($v1)
-/* C5C4F0 80241DB0 2442FFFF */  addiu     $v0, $v0, -1
-/* C5C4F4 80241DB4 A462008E */  sh        $v0, 0x8e($v1)
-/* C5C4F8 80241DB8 00021400 */  sll       $v0, $v0, 0x10
-/* C5C4FC 80241DBC 1C400004 */  bgtz      $v0, .L80241DD0
-/* C5C500 80241DC0 00000000 */   nop
-/* C5C504 80241DC4 AE000074 */  sw        $zero, 0x74($s0)
-/* C5C508 80241DC8 A460008E */  sh        $zero, 0x8e($v1)
-/* C5C50C 80241DCC AE200070 */  sw        $zero, 0x70($s1)
-.L80241DD0:
-/* C5C510 80241DD0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* C5C514 80241DD4 8FB10014 */  lw        $s1, 0x14($sp)
-/* C5C518 80241DD8 8FB00010 */  lw        $s0, 0x10($sp)
-/* C5C51C 80241DDC 03E00008 */  jr        $ra
-/* C5C520 80241DE0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
index d9ff0590c7..60f9f3473c 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
@@ -123,7 +123,7 @@ glabel L80241F7C_C5C6BC
 glabel L80241F94_C5C6D4
 /* C5C6D4 80241F94 0280202D */  daddu     $a0, $s4, $zero
 /* C5C6D8 80241F98 0200282D */  daddu     $a1, $s0, $zero
-/* C5C6DC 80241F9C 0C090762 */  jal       func_80241D88_C5C4C8
+/* C5C6DC 80241F9C 0C090762 */  jal       kzn_02_UnkFunc45
 /* C5C6E0 80241FA0 0260302D */   daddu    $a2, $s3, $zero
 glabel L80241FA4_C5C6E4
 /* C5C6E4 80241FA4 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s
index 9c1034f849..00ff2b2dde 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s
@@ -15,7 +15,7 @@ glabel func_80242C84_C63994
 /* C639BC 80242CAC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C639C0 80242CB0 8FB00010 */  lw        $s0, 0x10($sp)
 /* C639C4 80242CB4 24020002 */  addiu     $v0, $zero, 2
-/* C639C8 80242CB8 3C018024 */  lui       $at, %hi(D_802475E4)
-/* C639CC 80242CBC AC2375E4 */  sw        $v1, %lo(D_802475E4)($at)
+/* C639C8 80242CB8 3C018024 */  lui       $at, %hi(dro_02_pad_XX111)
+/* C639CC 80242CBC AC2375E4 */  sw        $v1, %lo(dro_02_pad_XX111)($at)
 /* C639D0 80242CC0 03E00008 */  jr        $ra
 /* C639D4 80242CC4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s
index 1400c50727..ad5f4d9394 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s
@@ -6,8 +6,8 @@ glabel func_80242CC8_C639D8
 /* C639DC 80242CCC AFBF0010 */  sw        $ra, 0x10($sp)
 /* C639E0 80242CD0 0C00EABB */  jal       get_npc_unsafe
 /* C639E4 80242CD4 8C84008C */   lw       $a0, 0x8c($a0)
-/* C639E8 80242CD8 3C038024 */  lui       $v1, %hi(D_802475E4)
-/* C639EC 80242CDC 8C6375E4 */  lw        $v1, %lo(D_802475E4)($v1)
+/* C639E8 80242CD8 3C038024 */  lui       $v1, %hi(dro_02_pad_XX111)
+/* C639EC 80242CDC 8C6375E4 */  lw        $v1, %lo(dro_02_pad_XX111)($v1)
 /* C639F0 80242CE0 AC430028 */  sw        $v1, 0x28($v0)
 /* C639F4 80242CE4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C639F8 80242CE8 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s
deleted file mode 100644
index 834f62719f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403E4_C68514
-/* C68514 802403E4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* C68518 802403E8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* C6851C 802403EC 000420C0 */  sll       $a0, $a0, 3
-/* C68520 802403F0 00822021 */  addu      $a0, $a0, $v0
-/* C68524 802403F4 90820014 */  lbu       $v0, 0x14($a0)
-/* C68528 802403F8 10400009 */  beqz      $v0, .L80240420
-/* C6852C 802403FC 00000000 */   nop
-/* C68530 80240400 90820015 */  lbu       $v0, 0x15($a0)
-/* C68534 80240404 00022600 */  sll       $a0, $v0, 0x18
-/* C68538 80240408 00041E03 */  sra       $v1, $a0, 0x18
-/* C6853C 8024040C 00051400 */  sll       $v0, $a1, 0x10
-/* C68540 80240410 00021403 */  sra       $v0, $v0, 0x10
-/* C68544 80240414 0043102A */  slt       $v0, $v0, $v1
-/* C68548 80240418 10400003 */  beqz      $v0, .L80240428
-/* C6854C 8024041C 00000000 */   nop
-.L80240420:
-/* C68550 80240420 03E00008 */  jr        $ra
-/* C68554 80240424 2402FFFF */   addiu    $v0, $zero, -1
-.L80240428:
-/* C68558 80240428 03E00008 */  jr        $ra
-/* C6855C 8024042C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s
deleted file mode 100644
index 91f5ce6c99..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240430_C68560
-/* C68560 80240430 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* C68564 80240434 AFB3001C */  sw        $s3, 0x1c($sp)
-/* C68568 80240438 0080982D */  daddu     $s3, $a0, $zero
-/* C6856C 8024043C AFB00010 */  sw        $s0, 0x10($sp)
-/* C68570 80240440 24100001 */  addiu     $s0, $zero, 1
-/* C68574 80240444 AFB40020 */  sw        $s4, 0x20($sp)
-/* C68578 80240448 2414FFFF */  addiu     $s4, $zero, -1
-/* C6857C 8024044C AFB50024 */  sw        $s5, 0x24($sp)
-/* C68580 80240450 0200A82D */  daddu     $s5, $s0, $zero
-/* C68584 80240454 AFB10014 */  sw        $s1, 0x14($sp)
-/* C68588 80240458 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* C6858C 8024045C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* C68590 80240460 AFBF0028 */  sw        $ra, 0x28($sp)
-/* C68594 80240464 AFB20018 */  sw        $s2, 0x18($sp)
-/* C68598 80240468 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* C6859C 8024046C 0280182D */  daddu     $v1, $s4, $zero
-/* C685A0 80240470 AE630084 */  sw        $v1, 0x84($s3)
-/* C685A4 80240474 00021027 */  nor       $v0, $zero, $v0
-/* C685A8 80240478 000217C2 */  srl       $v0, $v0, 0x1f
-/* C685AC 8024047C 00029400 */  sll       $s2, $v0, 0x10
-.L80240480:
-/* C685B0 80240480 92220014 */  lbu       $v0, 0x14($s1)
-/* C685B4 80240484 50400008 */  beql      $v0, $zero, .L802404A8
-/* C685B8 80240488 26100001 */   addiu    $s0, $s0, 1
-/* C685BC 8024048C 0200202D */  daddu     $a0, $s0, $zero
-/* C685C0 80240490 0C0900F9 */  jal       func_802403E4_C68514
-/* C685C4 80240494 00122C03 */   sra      $a1, $s2, 0x10
-/* C685C8 80240498 10540003 */  beq       $v0, $s4, .L802404A8
-/* C685CC 8024049C 26100001 */   addiu    $s0, $s0, 1
-/* C685D0 802404A0 0809012D */  j         .L802404B4
-/* C685D4 802404A4 AE750084 */   sw       $s5, 0x84($s3)
-.L802404A8:
-/* C685D8 802404A8 2A02000C */  slti      $v0, $s0, 0xc
-/* C685DC 802404AC 1440FFF4 */  bnez      $v0, .L80240480
-/* C685E0 802404B0 26310008 */   addiu    $s1, $s1, 8
-.L802404B4:
-/* C685E4 802404B4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* C685E8 802404B8 8FB50024 */  lw        $s5, 0x24($sp)
-/* C685EC 802404BC 8FB40020 */  lw        $s4, 0x20($sp)
-/* C685F0 802404C0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* C685F4 802404C4 8FB20018 */  lw        $s2, 0x18($sp)
-/* C685F8 802404C8 8FB10014 */  lw        $s1, 0x14($sp)
-/* C685FC 802404CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* C68600 802404D0 24020002 */  addiu     $v0, $zero, 2
-/* C68604 802404D4 03E00008 */  jr        $ra
-/* C68608 802404D8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s
index 39466e1108..91b1331eb6 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s
@@ -49,7 +49,7 @@ glabel func_802404DC_C6860C
 /* C686B8 80240588 AE300108 */  sw        $s0, 0x108($s1)
 /* C686BC 8024058C 8C420000 */  lw        $v0, ($v0)
 /* C686C0 80240590 02E0282D */  daddu     $a1, $s7, $zero
-/* C686C4 80240594 0C0900F9 */  jal       func_802403E4_C68514
+/* C686C4 80240594 0C0900F9 */  jal       kzn_04_UnkFunc37
 /* C686C8 80240598 AE220084 */   sw       $v0, 0x84($s1)
 /* C686CC 8024059C 0040202D */  daddu     $a0, $v0, $zero
 /* C686D0 802405A0 04800011 */  bltz      $a0, .L802405E8
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240820_C68950.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240820_C68950.s
deleted file mode 100644
index 9bd6c50a0a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240820_C68950.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240820_C68950
-/* C68950 80240820 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C68954 80240824 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C68958 80240828 8C82000C */  lw        $v0, 0xc($a0)
-/* C6895C 8024082C 0C0B1EAF */  jal       get_variable
-/* C68960 80240830 8C450000 */   lw       $a1, ($v0)
-/* C68964 80240834 0040202D */  daddu     $a0, $v0, $zero
-/* C68968 80240838 8C830000 */  lw        $v1, ($a0)
-/* C6896C 8024083C 34630010 */  ori       $v1, $v1, 0x10
-/* C68970 80240840 AC830000 */  sw        $v1, ($a0)
-/* C68974 80240844 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C68978 80240848 24020002 */  addiu     $v0, $zero, 2
-/* C6897C 8024084C 03E00008 */  jr        $ra
-/* C68980 80240850 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s
deleted file mode 100644
index 7c4c1f996c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241018_C69148
-/* C69148 80241018 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* C6914C 8024101C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* C69150 80241020 AC800084 */  sw        $zero, 0x84($a0)
-/* C69154 80241024 80620000 */  lb        $v0, ($v1)
-/* C69158 80241028 10400005 */  beqz      $v0, .L80241040
-/* C6915C 8024102C 24020003 */   addiu    $v0, $zero, 3
-/* C69160 80241030 80630003 */  lb        $v1, 3($v1)
-/* C69164 80241034 14620002 */  bne       $v1, $v0, .L80241040
-/* C69168 80241038 24020001 */   addiu    $v0, $zero, 1
-/* C6916C 8024103C AC820084 */  sw        $v0, 0x84($a0)
-.L80241040:
-/* C69170 80241040 03E00008 */  jr        $ra
-/* C69174 80241044 24020002 */   addiu    $v0, $zero, 2
-/* C69178 80241048 00000000 */  nop
-/* C6917C 8024104C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802420C8_C703F8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802420C8_C703F8.s
deleted file mode 100644
index a70bacb5bb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802420C8_C703F8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802420C8_C703F8
-/* C703F8 802420C8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* C703FC 802420CC AFB10014 */  sw        $s1, 0x14($sp)
-/* C70400 802420D0 0080882D */  daddu     $s1, $a0, $zero
-/* C70404 802420D4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* C70408 802420D8 AFB00010 */  sw        $s0, 0x10($sp)
-/* C7040C 802420DC 8E300148 */  lw        $s0, 0x148($s1)
-/* C70410 802420E0 0C00EABB */  jal       get_npc_unsafe
-/* C70414 802420E4 86040008 */   lh       $a0, 8($s0)
-/* C70418 802420E8 0040182D */  daddu     $v1, $v0, $zero
-/* C7041C 802420EC 9462008E */  lhu       $v0, 0x8e($v1)
-/* C70420 802420F0 2442FFFF */  addiu     $v0, $v0, -1
-/* C70424 802420F4 A462008E */  sh        $v0, 0x8e($v1)
-/* C70428 802420F8 00021400 */  sll       $v0, $v0, 0x10
-/* C7042C 802420FC 1C400004 */  bgtz      $v0, .L80242110
-/* C70430 80242100 00000000 */   nop
-/* C70434 80242104 AE000074 */  sw        $zero, 0x74($s0)
-/* C70438 80242108 A460008E */  sh        $zero, 0x8e($v1)
-/* C7043C 8024210C AE200070 */  sw        $zero, 0x70($s1)
-.L80242110:
-/* C70440 80242110 8FBF0018 */  lw        $ra, 0x18($sp)
-/* C70444 80242114 8FB10014 */  lw        $s1, 0x14($sp)
-/* C70448 80242118 8FB00010 */  lw        $s0, 0x10($sp)
-/* C7044C 8024211C 03E00008 */  jr        $ra
-/* C70450 80242120 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s
index 50d87fe088..61be555b81 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s
@@ -123,7 +123,7 @@ glabel L802422BC_C705EC
 glabel L802422D4_C70604
 /* C70604 802422D4 0280202D */  daddu     $a0, $s4, $zero
 /* C70608 802422D8 0200282D */  daddu     $a1, $s0, $zero
-/* C7060C 802422DC 0C090832 */  jal       func_802420C8_C703F8
+/* C7060C 802422DC 0C090832 */  jal       kzn_07_UnkFunc45
 /* C70610 802422E0 0260302D */   daddu    $a2, $s3, $zero
 glabel L802422E4_C70614
 /* C70614 802422E4 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802422F8_C73778.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802422F8_C73778.s
deleted file mode 100644
index e8341cd2aa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802422F8_C73778.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422F8_C73778
-/* C73778 802422F8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* C7377C 802422FC AFB10014 */  sw        $s1, 0x14($sp)
-/* C73780 80242300 0080882D */  daddu     $s1, $a0, $zero
-/* C73784 80242304 AFBF0018 */  sw        $ra, 0x18($sp)
-/* C73788 80242308 AFB00010 */  sw        $s0, 0x10($sp)
-/* C7378C 8024230C 8E300148 */  lw        $s0, 0x148($s1)
-/* C73790 80242310 0C00EABB */  jal       get_npc_unsafe
-/* C73794 80242314 86040008 */   lh       $a0, 8($s0)
-/* C73798 80242318 0040182D */  daddu     $v1, $v0, $zero
-/* C7379C 8024231C 9462008E */  lhu       $v0, 0x8e($v1)
-/* C737A0 80242320 2442FFFF */  addiu     $v0, $v0, -1
-/* C737A4 80242324 A462008E */  sh        $v0, 0x8e($v1)
-/* C737A8 80242328 00021400 */  sll       $v0, $v0, 0x10
-/* C737AC 8024232C 1C400004 */  bgtz      $v0, .L80242340
-/* C737B0 80242330 00000000 */   nop
-/* C737B4 80242334 AE000074 */  sw        $zero, 0x74($s0)
-/* C737B8 80242338 A460008E */  sh        $zero, 0x8e($v1)
-/* C737BC 8024233C AE200070 */  sw        $zero, 0x70($s1)
-.L80242340:
-/* C737C0 80242340 8FBF0018 */  lw        $ra, 0x18($sp)
-/* C737C4 80242344 8FB10014 */  lw        $s1, 0x14($sp)
-/* C737C8 80242348 8FB00010 */  lw        $s0, 0x10($sp)
-/* C737CC 8024234C 03E00008 */  jr        $ra
-/* C737D0 80242350 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s
index 59d1bd8f40..e1af928423 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s
@@ -123,7 +123,7 @@ glabel L802424EC_C7396C
 glabel L80242504_C73984
 /* C73984 80242504 0280202D */  daddu     $a0, $s4, $zero
 /* C73988 80242508 0200282D */  daddu     $a1, $s0, $zero
-/* C7398C 8024250C 0C0908BE */  jal       func_802422F8_C73778
+/* C7398C 8024250C 0C0908BE */  jal       kzn_08_UnkFunc45
 /* C73990 80242510 0260302D */   daddu    $a2, $s3, $zero
 glabel L80242514_C73994
 /* C73994 80242514 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802400D4_C76DB4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802400D4_C76DB4.s
deleted file mode 100644
index 9254b54971..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802400D4_C76DB4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400D4_C76DB4
-/* C76DB4 802400D4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* C76DB8 802400D8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* C76DBC 802400DC 000420C0 */  sll       $a0, $a0, 3
-/* C76DC0 802400E0 00822021 */  addu      $a0, $a0, $v0
-/* C76DC4 802400E4 90820014 */  lbu       $v0, 0x14($a0)
-/* C76DC8 802400E8 10400009 */  beqz      $v0, .L80240110
-/* C76DCC 802400EC 00000000 */   nop
-/* C76DD0 802400F0 90820015 */  lbu       $v0, 0x15($a0)
-/* C76DD4 802400F4 00022600 */  sll       $a0, $v0, 0x18
-/* C76DD8 802400F8 00041E03 */  sra       $v1, $a0, 0x18
-/* C76DDC 802400FC 00051400 */  sll       $v0, $a1, 0x10
-/* C76DE0 80240100 00021403 */  sra       $v0, $v0, 0x10
-/* C76DE4 80240104 0043102A */  slt       $v0, $v0, $v1
-/* C76DE8 80240108 10400003 */  beqz      $v0, .L80240118
-/* C76DEC 8024010C 00000000 */   nop
-.L80240110:
-/* C76DF0 80240110 03E00008 */  jr        $ra
-/* C76DF4 80240114 2402FFFF */   addiu    $v0, $zero, -1
-.L80240118:
-/* C76DF8 80240118 03E00008 */  jr        $ra
-/* C76DFC 8024011C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s
deleted file mode 100644
index 595e9bc7eb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240120_C76E00
-/* C76E00 80240120 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* C76E04 80240124 AFB3001C */  sw        $s3, 0x1c($sp)
-/* C76E08 80240128 0080982D */  daddu     $s3, $a0, $zero
-/* C76E0C 8024012C AFB00010 */  sw        $s0, 0x10($sp)
-/* C76E10 80240130 24100001 */  addiu     $s0, $zero, 1
-/* C76E14 80240134 AFB40020 */  sw        $s4, 0x20($sp)
-/* C76E18 80240138 2414FFFF */  addiu     $s4, $zero, -1
-/* C76E1C 8024013C AFB50024 */  sw        $s5, 0x24($sp)
-/* C76E20 80240140 0200A82D */  daddu     $s5, $s0, $zero
-/* C76E24 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* C76E28 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* C76E2C 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* C76E30 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
-/* C76E34 80240154 AFB20018 */  sw        $s2, 0x18($sp)
-/* C76E38 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* C76E3C 8024015C 0280182D */  daddu     $v1, $s4, $zero
-/* C76E40 80240160 AE630084 */  sw        $v1, 0x84($s3)
-/* C76E44 80240164 00021027 */  nor       $v0, $zero, $v0
-/* C76E48 80240168 000217C2 */  srl       $v0, $v0, 0x1f
-/* C76E4C 8024016C 00029400 */  sll       $s2, $v0, 0x10
-.L80240170:
-/* C76E50 80240170 92220014 */  lbu       $v0, 0x14($s1)
-/* C76E54 80240174 50400008 */  beql      $v0, $zero, .L80240198
-/* C76E58 80240178 26100001 */   addiu    $s0, $s0, 1
-/* C76E5C 8024017C 0200202D */  daddu     $a0, $s0, $zero
-/* C76E60 80240180 0C090035 */  jal       func_802400D4_C76DB4
-/* C76E64 80240184 00122C03 */   sra      $a1, $s2, 0x10
-/* C76E68 80240188 10540003 */  beq       $v0, $s4, .L80240198
-/* C76E6C 8024018C 26100001 */   addiu    $s0, $s0, 1
-/* C76E70 80240190 08090069 */  j         .L802401A4
-/* C76E74 80240194 AE750084 */   sw       $s5, 0x84($s3)
-.L80240198:
-/* C76E78 80240198 2A02000C */  slti      $v0, $s0, 0xc
-/* C76E7C 8024019C 1440FFF4 */  bnez      $v0, .L80240170
-/* C76E80 802401A0 26310008 */   addiu    $s1, $s1, 8
-.L802401A4:
-/* C76E84 802401A4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* C76E88 802401A8 8FB50024 */  lw        $s5, 0x24($sp)
-/* C76E8C 802401AC 8FB40020 */  lw        $s4, 0x20($sp)
-/* C76E90 802401B0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* C76E94 802401B4 8FB20018 */  lw        $s2, 0x18($sp)
-/* C76E98 802401B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* C76E9C 802401BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* C76EA0 802401C0 24020002 */  addiu     $v0, $zero, 2
-/* C76EA4 802401C4 03E00008 */  jr        $ra
-/* C76EA8 802401C8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s
index ec7dce8de3..927bf558d5 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s
@@ -49,7 +49,7 @@ glabel func_802401CC_C76EAC
 /* C76F58 80240278 AE300108 */  sw        $s0, 0x108($s1)
 /* C76F5C 8024027C 8C420000 */  lw        $v0, ($v0)
 /* C76F60 80240280 02E0282D */  daddu     $a1, $s7, $zero
-/* C76F64 80240284 0C090035 */  jal       func_802400D4_C76DB4
+/* C76F64 80240284 0C090035 */  jal       kzn_09_UnkFunc37
 /* C76F68 80240288 AE220084 */   sw       $v0, 0x84($s1)
 /* C76F6C 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* C76F70 80240290 04800011 */  bltz      $a0, .L802402D8
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240510_C771F0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240510_C771F0.s
deleted file mode 100644
index 335f058451..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240510_C771F0.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240510_C771F0
-/* C771F0 80240510 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C771F4 80240514 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C771F8 80240518 8C82000C */  lw        $v0, 0xc($a0)
-/* C771FC 8024051C 0C0B1EAF */  jal       get_variable
-/* C77200 80240520 8C450000 */   lw       $a1, ($v0)
-/* C77204 80240524 0040202D */  daddu     $a0, $v0, $zero
-/* C77208 80240528 8C830000 */  lw        $v1, ($a0)
-/* C7720C 8024052C 34630010 */  ori       $v1, $v1, 0x10
-/* C77210 80240530 AC830000 */  sw        $v1, ($a0)
-/* C77214 80240534 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C77218 80240538 24020002 */  addiu     $v0, $zero, 2
-/* C7721C 8024053C 03E00008 */  jr        $ra
-/* C77220 80240540 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240D08_C779E8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240D08_C779E8.s
deleted file mode 100644
index 75d67d234d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240D08_C779E8.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D08_C779E8
-/* C779E8 80240D08 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* C779EC 80240D0C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* C779F0 80240D10 AC800084 */  sw        $zero, 0x84($a0)
-/* C779F4 80240D14 80620000 */  lb        $v0, ($v1)
-/* C779F8 80240D18 10400005 */  beqz      $v0, .L80240D30
-/* C779FC 80240D1C 24020003 */   addiu    $v0, $zero, 3
-/* C77A00 80240D20 80630003 */  lb        $v1, 3($v1)
-/* C77A04 80240D24 14620002 */  bne       $v1, $v0, .L80240D30
-/* C77A08 80240D28 24020001 */   addiu    $v0, $zero, 1
-/* C77A0C 80240D2C AC820084 */  sw        $v0, 0x84($a0)
-.L80240D30:
-/* C77A10 80240D30 03E00008 */  jr        $ra
-/* C77A14 80240D34 24020002 */   addiu    $v0, $zero, 2
-/* C77A18 80240D38 00000000 */  nop
-/* C77A1C 80240D3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240408_C805A8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240408_C805A8.s
deleted file mode 100644
index d795d5ebb3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240408_C805A8.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240408_C805A8
-/* C805A8 80240408 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C805AC 8024040C AFBF0010 */  sw        $ra, 0x10($sp)
-/* C805B0 80240410 8C82000C */  lw        $v0, 0xc($a0)
-/* C805B4 80240414 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* C805B8 80240418 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* C805BC 8024041C 0C0B2026 */  jal       set_variable
-/* C805C0 80240420 8C450000 */   lw       $a1, ($v0)
-/* C805C4 80240424 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C805C8 80240428 24020002 */  addiu     $v0, $zero, 2
-/* C805CC 8024042C 03E00008 */  jr        $ra
-/* C805D0 80240430 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D08_C81EA8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D08_C81EA8.s
deleted file mode 100644
index 9dd5fd54b5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D08_C81EA8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D08_C81EA8
-/* C81EA8 80241D08 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* C81EAC 80241D0C AFB10014 */  sw        $s1, 0x14($sp)
-/* C81EB0 80241D10 0080882D */  daddu     $s1, $a0, $zero
-/* C81EB4 80241D14 AFBF0018 */  sw        $ra, 0x18($sp)
-/* C81EB8 80241D18 AFB00010 */  sw        $s0, 0x10($sp)
-/* C81EBC 80241D1C 8E300148 */  lw        $s0, 0x148($s1)
-/* C81EC0 80241D20 0C00EABB */  jal       get_npc_unsafe
-/* C81EC4 80241D24 86040008 */   lh       $a0, 8($s0)
-/* C81EC8 80241D28 0040182D */  daddu     $v1, $v0, $zero
-/* C81ECC 80241D2C 9462008E */  lhu       $v0, 0x8e($v1)
-/* C81ED0 80241D30 2442FFFF */  addiu     $v0, $v0, -1
-/* C81ED4 80241D34 A462008E */  sh        $v0, 0x8e($v1)
-/* C81ED8 80241D38 00021400 */  sll       $v0, $v0, 0x10
-/* C81EDC 80241D3C 1C400004 */  bgtz      $v0, .L80241D50
-/* C81EE0 80241D40 00000000 */   nop
-/* C81EE4 80241D44 AE000074 */  sw        $zero, 0x74($s0)
-/* C81EE8 80241D48 A460008E */  sh        $zero, 0x8e($v1)
-/* C81EEC 80241D4C AE200070 */  sw        $zero, 0x70($s1)
-.L80241D50:
-/* C81EF0 80241D50 8FBF0018 */  lw        $ra, 0x18($sp)
-/* C81EF4 80241D54 8FB10014 */  lw        $s1, 0x14($sp)
-/* C81EF8 80241D58 8FB00010 */  lw        $s0, 0x10($sp)
-/* C81EFC 80241D5C 03E00008 */  jr        $ra
-/* C81F00 80241D60 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s
index 0b9c2768c6..2cf4ad34ff 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s
@@ -123,7 +123,7 @@ glabel L80241EFC_C8209C
 glabel L80241F14_C820B4
 /* C820B4 80241F14 0280202D */  daddu     $a0, $s4, $zero
 /* C820B8 80241F18 0200282D */  daddu     $a1, $s0, $zero
-/* C820BC 80241F1C 0C090742 */  jal       func_80241D08_C81EA8
+/* C820BC 80241F1C 0C090742 */  jal       kzn_11_UnkFunc45
 /* C820C0 80241F20 0260302D */   daddu    $a2, $s3, $zero
 glabel L80241F24_C820C4
 /* C820C4 80241F24 0000102D */  daddu     $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_80240388_C8C428.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_80240388_C8C428.s
deleted file mode 100644
index fad75f8712..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_18/C8C3F0/func_80240388_C8C428.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240388_C8C428
-/* C8C428 80240388 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C8C42C 8024038C AFBF0010 */  sw        $ra, 0x10($sp)
-/* C8C430 80240390 8C82000C */  lw        $v0, 0xc($a0)
-/* C8C434 80240394 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* C8C438 80240398 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* C8C43C 8024039C 0C0B2026 */  jal       set_variable
-/* C8C440 802403A0 8C450000 */   lw       $a1, ($v0)
-/* C8C444 802403A4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C8C448 802403A8 24020002 */  addiu     $v0, $zero, 2
-/* C8C44C 802403AC 03E00008 */  jr        $ra
-/* C8C450 802403B0 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C8C454 802403B4 00000000 */  nop
-/* C8C458 802403B8 00000000 */  nop
-/* C8C45C 802403BC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A8C_C969BC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A8C_C969BC.s
deleted file mode 100644
index cd7eb104bf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A8C_C969BC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A8C_C969BC
-/* C969BC 80240A8C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C969C0 80240A90 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C969C4 80240A94 8C82000C */  lw        $v0, 0xc($a0)
-/* C969C8 80240A98 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* C969CC 80240A9C 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* C969D0 80240AA0 0C0B2026 */  jal       set_variable
-/* C969D4 80240AA4 8C450000 */   lw       $a1, ($v0)
-/* C969D8 80240AA8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C969DC 80240AAC 24020002 */  addiu     $v0, $zero, 2
-/* C969E0 80240AB0 03E00008 */  jr        $ra
-/* C969E4 80240AB4 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C969E8 80240AB8 00000000 */  nop
-/* C969EC 80240ABC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_8024030C_C9A50C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_8024030C_C9A50C.s
deleted file mode 100644
index af8f7233d1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_22/C9A200/func_8024030C_C9A50C.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024030C_C9A50C
-/* C9A50C 8024030C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C9A510 80240310 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C9A514 80240314 8C82000C */  lw        $v0, 0xc($a0)
-/* C9A518 80240318 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* C9A51C 8024031C 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* C9A520 80240320 0C0B2026 */  jal       set_variable
-/* C9A524 80240324 8C450000 */   lw       $a1, ($v0)
-/* C9A528 80240328 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C9A52C 8024032C 24020002 */  addiu     $v0, $zero, 2
-/* C9A530 80240330 03E00008 */  jr        $ra
-/* C9A534 80240334 27BD0018 */   addiu    $sp, $sp, 0x18
-/* C9A538 80240338 00000000 */  nop
-/* C9A53C 8024033C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_22/C9A540/func_80240340_C9A540.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_22/C9A540/func_80240340_C9A540.s
deleted file mode 100644
index 610fd1f89f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_22/C9A540/func_80240340_C9A540.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_C9A540
-/* C9A540 80240340 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* C9A544 80240344 AFBF0010 */  sw        $ra, 0x10($sp)
-/* C9A548 80240348 8C82000C */  lw        $v0, 0xc($a0)
-/* C9A54C 8024034C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* C9A550 80240350 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* C9A554 80240354 0C0B2026 */  jal       set_variable
-/* C9A558 80240358 8C450000 */   lw       $a1, ($v0)
-/* C9A55C 8024035C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* C9A560 80240360 24020002 */  addiu     $v0, $zero, 2
-/* C9A564 80240364 03E00008 */  jr        $ra
-/* C9A568 80240368 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s
deleted file mode 100644
index d02750dfc8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240990_7EB6A0
-/* 7EB6A0 80240990 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EB6A4 80240994 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 7EB6A8 80240998 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EB6AC 8024099C 0C00EABB */  jal       get_npc_unsafe
-/* 7EB6B0 802409A0 8C84014C */   lw       $a0, 0x14c($a0)
-/* 7EB6B4 802409A4 24040008 */  addiu     $a0, $zero, 8
-/* 7EB6B8 802409A8 0040802D */  daddu     $s0, $v0, $zero
-/* 7EB6BC 802409AC 3C028024 */  lui       $v0, %hi(func_802409FC_7EB70C)
-/* 7EB6C0 802409B0 244209FC */  addiu     $v0, $v0, %lo(func_802409FC_7EB70C)
-/* 7EB6C4 802409B4 0C00AB39 */  jal       heap_malloc
-/* 7EB6C8 802409B8 AE020008 */   sw       $v0, 8($s0)
-/* 7EB6CC 802409BC 0040182D */  daddu     $v1, $v0, $zero
-/* 7EB6D0 802409C0 AE030020 */  sw        $v1, 0x20($s0)
-/* 7EB6D4 802409C4 AC600000 */  sw        $zero, ($v1)
-/* 7EB6D8 802409C8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 7EB6DC 802409CC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EB6E0 802409D0 24020001 */  addiu     $v0, $zero, 1
-/* 7EB6E4 802409D4 03E00008 */  jr        $ra
-/* 7EB6E8 802409D8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s
deleted file mode 100644
index b9ee8e1baf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409FC_7EB70C
-/* 7EB70C 802409FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EB710 80240A00 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 7EB714 80240A04 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 7EB718 80240A08 3C05800B */  lui       $a1, %hi(gCameras)
-/* 7EB71C 80240A0C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 7EB720 80240A10 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7EB724 80240A14 00031080 */  sll       $v0, $v1, 2
-/* 7EB728 80240A18 00431021 */  addu      $v0, $v0, $v1
-/* 7EB72C 80240A1C 00021080 */  sll       $v0, $v0, 2
-/* 7EB730 80240A20 00431023 */  subu      $v0, $v0, $v1
-/* 7EB734 80240A24 000218C0 */  sll       $v1, $v0, 3
-/* 7EB738 80240A28 00431021 */  addu      $v0, $v0, $v1
-/* 7EB73C 80240A2C 8C830020 */  lw        $v1, 0x20($a0)
-/* 7EB740 80240A30 000210C0 */  sll       $v0, $v0, 3
-/* 7EB744 80240A34 8C630000 */  lw        $v1, ($v1)
-/* 7EB748 80240A38 30630001 */  andi      $v1, $v1, 1
-/* 7EB74C 80240A3C 10600004 */  beqz      $v1, .L80240A50
-/* 7EB750 80240A40 00451021 */   addu     $v0, $v0, $a1
-/* 7EB754 80240A44 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 7EB758 80240A48 0C00A6C9 */  jal       clamp_angle
-/* 7EB75C 80240A4C 46006307 */   neg.s    $f12, $f12
-.L80240A50:
-/* 7EB760 80240A50 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7EB764 80240A54 03E00008 */  jr        $ra
-/* 7EB768 80240A58 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s
deleted file mode 100644
index 9635405bec..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BA8_7EB8B8
-/* 7EB8B8 80240BA8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7EB8BC 80240BAC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EB8C0 80240BB0 0080802D */  daddu     $s0, $a0, $zero
-/* 7EB8C4 80240BB4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7EB8C8 80240BB8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7EB8CC 80240BBC AFB20018 */  sw        $s2, 0x18($sp)
-/* 7EB8D0 80240BC0 10A00009 */  beqz      $a1, .L80240BE8
-/* 7EB8D4 80240BC4 AFB10014 */   sw       $s1, 0x14($sp)
-/* 7EB8D8 80240BC8 0000202D */  daddu     $a0, $zero, $zero
-/* 7EB8DC 80240BCC 0080282D */  daddu     $a1, $a0, $zero
-/* 7EB8E0 80240BD0 0080302D */  daddu     $a2, $a0, $zero
-/* 7EB8E4 80240BD4 0C046F97 */  jal       set_background_color_blend
-/* 7EB8E8 80240BD8 240700FF */   addiu    $a3, $zero, 0xff
-/* 7EB8EC 80240BDC 240200FF */  addiu     $v0, $zero, 0xff
-/* 7EB8F0 80240BE0 AE020070 */  sw        $v0, 0x70($s0)
-/* 7EB8F4 80240BE4 AE000074 */  sw        $zero, 0x74($s0)
-.L80240BE8:
-/* 7EB8F8 80240BE8 8E020070 */  lw        $v0, 0x70($s0)
-/* 7EB8FC 80240BEC 2442FFF8 */  addiu     $v0, $v0, -8
-/* 7EB900 80240BF0 04410002 */  bgez      $v0, .L80240BFC
-/* 7EB904 80240BF4 AE020070 */   sw       $v0, 0x70($s0)
-/* 7EB908 80240BF8 AE000070 */  sw        $zero, 0x70($s0)
-.L80240BFC:
-/* 7EB90C 80240BFC 0000202D */  daddu     $a0, $zero, $zero
-/* 7EB910 80240C00 0080282D */  daddu     $a1, $a0, $zero
-/* 7EB914 80240C04 92070073 */  lbu       $a3, 0x73($s0)
-/* 7EB918 80240C08 0C046F97 */  jal       set_background_color_blend
-/* 7EB91C 80240C0C 0080302D */   daddu    $a2, $a0, $zero
-/* 7EB920 80240C10 8E020070 */  lw        $v0, 0x70($s0)
-/* 7EB924 80240C14 14400006 */  bnez      $v0, .L80240C30
-/* 7EB928 80240C18 00000000 */   nop
-/* 7EB92C 80240C1C 8E020074 */  lw        $v0, 0x74($s0)
-/* 7EB930 80240C20 14400003 */  bnez      $v0, .L80240C30
-/* 7EB934 80240C24 24020001 */   addiu    $v0, $zero, 1
-/* 7EB938 80240C28 0809033F */  j         .L80240CFC
-/* 7EB93C 80240C2C AE020074 */   sw       $v0, 0x74($s0)
-.L80240C30:
-/* 7EB940 80240C30 8E030074 */  lw        $v1, 0x74($s0)
-/* 7EB944 80240C34 24020001 */  addiu     $v0, $zero, 1
-/* 7EB948 80240C38 14620031 */  bne       $v1, $v0, .L80240D00
-/* 7EB94C 80240C3C 0000102D */   daddu    $v0, $zero, $zero
-/* 7EB950 80240C40 0C04760B */  jal       func_8011D82C
-/* 7EB954 80240C44 0000202D */   daddu    $a0, $zero, $zero
-/* 7EB958 80240C48 0000802D */  daddu     $s0, $zero, $zero
-/* 7EB95C 80240C4C 2413FFFC */  addiu     $s3, $zero, -4
-/* 7EB960 80240C50 24120006 */  addiu     $s2, $zero, 6
-/* 7EB964 80240C54 3C11FF7F */  lui       $s1, 0xff7f
-/* 7EB968 80240C58 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 7EB96C 80240C5C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 7EB970 80240C60 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 7EB974 80240C64 A0400000 */  sb        $zero, ($v0)
-.L80240C68:
-/* 7EB978 80240C68 0C00E2B7 */  jal       get_npc_by_index
-/* 7EB97C 80240C6C 0200202D */   daddu    $a0, $s0, $zero
-/* 7EB980 80240C70 0040202D */  daddu     $a0, $v0, $zero
-/* 7EB984 80240C74 5080000B */  beql      $a0, $zero, .L80240CA4
-/* 7EB988 80240C78 26100001 */   addiu    $s0, $s0, 1
-/* 7EB98C 80240C7C 8C820000 */  lw        $v0, ($a0)
-/* 7EB990 80240C80 50400008 */  beql      $v0, $zero, .L80240CA4
-/* 7EB994 80240C84 26100001 */   addiu    $s0, $s0, 1
-/* 7EB998 80240C88 808300A4 */  lb        $v1, 0xa4($a0)
-/* 7EB99C 80240C8C 10730005 */  beq       $v1, $s3, .L80240CA4
-/* 7EB9A0 80240C90 26100001 */   addiu    $s0, $s0, 1
-/* 7EB9A4 80240C94 10720003 */  beq       $v1, $s2, .L80240CA4
-/* 7EB9A8 80240C98 00000000 */   nop
-/* 7EB9AC 80240C9C 00511024 */  and       $v0, $v0, $s1
-/* 7EB9B0 80240CA0 AC820000 */  sw        $v0, ($a0)
-.L80240CA4:
-/* 7EB9B4 80240CA4 2A020040 */  slti      $v0, $s0, 0x40
-/* 7EB9B8 80240CA8 1440FFEF */  bnez      $v0, .L80240C68
-/* 7EB9BC 80240CAC 00000000 */   nop
-/* 7EB9C0 80240CB0 0000802D */  daddu     $s0, $zero, $zero
-/* 7EB9C4 80240CB4 3C11F7FF */  lui       $s1, 0xf7ff
-/* 7EB9C8 80240CB8 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80240CBC:
-/* 7EB9CC 80240CBC 0C04C3D6 */  jal       get_item_entity
-/* 7EB9D0 80240CC0 0200202D */   daddu    $a0, $s0, $zero
-/* 7EB9D4 80240CC4 0040182D */  daddu     $v1, $v0, $zero
-/* 7EB9D8 80240CC8 10600007 */  beqz      $v1, .L80240CE8
-/* 7EB9DC 80240CCC 26100001 */   addiu    $s0, $s0, 1
-/* 7EB9E0 80240CD0 8C640000 */  lw        $a0, ($v1)
-/* 7EB9E4 80240CD4 30820010 */  andi      $v0, $a0, 0x10
-/* 7EB9E8 80240CD8 10400003 */  beqz      $v0, .L80240CE8
-/* 7EB9EC 80240CDC 00000000 */   nop
-/* 7EB9F0 80240CE0 00911024 */  and       $v0, $a0, $s1
-/* 7EB9F4 80240CE4 AC620000 */  sw        $v0, ($v1)
-.L80240CE8:
-/* 7EB9F8 80240CE8 2A020100 */  slti      $v0, $s0, 0x100
-/* 7EB9FC 80240CEC 1440FFF3 */  bnez      $v0, .L80240CBC
-/* 7EBA00 80240CF0 24020002 */   addiu    $v0, $zero, 2
-/* 7EBA04 80240CF4 08090340 */  j         .L80240D00
-/* 7EBA08 80240CF8 00000000 */   nop
-.L80240CFC:
-/* 7EBA0C 80240CFC 0000102D */  daddu     $v0, $zero, $zero
-.L80240D00:
-/* 7EBA10 80240D00 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7EBA14 80240D04 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7EBA18 80240D08 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7EBA1C 80240D0C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7EBA20 80240D10 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7EBA24 80240D14 03E00008 */  jr        $ra
-/* 7EBA28 80240D18 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s
deleted file mode 100644
index 35cd639e26..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242270_802AF0
-/* 802AF0 80242270 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 802AF4 80242274 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 802AF8 80242278 AFB00010 */  sw        $s0, 0x10($sp)
-/* 802AFC 8024227C 0C00EABB */  jal       get_npc_unsafe
-/* 802B00 80242280 8C84014C */   lw       $a0, 0x14c($a0)
-/* 802B04 80242284 24040008 */  addiu     $a0, $zero, 8
-/* 802B08 80242288 0040802D */  daddu     $s0, $v0, $zero
-/* 802B0C 8024228C 3C028024 */  lui       $v0, %hi(func_802422DC_802B5C)
-/* 802B10 80242290 244222DC */  addiu     $v0, $v0, %lo(func_802422DC_802B5C)
-/* 802B14 80242294 0C00AB39 */  jal       heap_malloc
-/* 802B18 80242298 AE020008 */   sw       $v0, 8($s0)
-/* 802B1C 8024229C 0040182D */  daddu     $v1, $v0, $zero
-/* 802B20 802422A0 AE030020 */  sw        $v1, 0x20($s0)
-/* 802B24 802422A4 AC600000 */  sw        $zero, ($v1)
-/* 802B28 802422A8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 802B2C 802422AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 802B30 802422B0 24020001 */  addiu     $v0, $zero, 1
-/* 802B34 802422B4 03E00008 */  jr        $ra
-/* 802B38 802422B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s
deleted file mode 100644
index 49618b3cb3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422DC_802B5C
-/* 802B5C 802422DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 802B60 802422E0 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 802B64 802422E4 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 802B68 802422E8 3C05800B */  lui       $a1, %hi(gCameras)
-/* 802B6C 802422EC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 802B70 802422F0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 802B74 802422F4 00031080 */  sll       $v0, $v1, 2
-/* 802B78 802422F8 00431021 */  addu      $v0, $v0, $v1
-/* 802B7C 802422FC 00021080 */  sll       $v0, $v0, 2
-/* 802B80 80242300 00431023 */  subu      $v0, $v0, $v1
-/* 802B84 80242304 000218C0 */  sll       $v1, $v0, 3
-/* 802B88 80242308 00431021 */  addu      $v0, $v0, $v1
-/* 802B8C 8024230C 8C830020 */  lw        $v1, 0x20($a0)
-/* 802B90 80242310 000210C0 */  sll       $v0, $v0, 3
-/* 802B94 80242314 8C630000 */  lw        $v1, ($v1)
-/* 802B98 80242318 30630001 */  andi      $v1, $v1, 1
-/* 802B9C 8024231C 10600004 */  beqz      $v1, .L80242330
-/* 802BA0 80242320 00451021 */   addu     $v0, $v0, $a1
-/* 802BA4 80242324 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 802BA8 80242328 0C00A6C9 */  jal       clamp_angle
-/* 802BAC 8024232C 46006307 */   neg.s    $f12, $f12
-.L80242330:
-/* 802BB0 80242330 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 802BB4 80242334 03E00008 */  jr        $ra
-/* 802BB8 80242338 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s
deleted file mode 100644
index 3c8be3c3e8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242488_802D08
-/* 802D08 80242488 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 802D0C 8024248C AFB00010 */  sw        $s0, 0x10($sp)
-/* 802D10 80242490 0080802D */  daddu     $s0, $a0, $zero
-/* 802D14 80242494 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 802D18 80242498 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 802D1C 8024249C AFB20018 */  sw        $s2, 0x18($sp)
-/* 802D20 802424A0 10A00009 */  beqz      $a1, .L802424C8
-/* 802D24 802424A4 AFB10014 */   sw       $s1, 0x14($sp)
-/* 802D28 802424A8 0000202D */  daddu     $a0, $zero, $zero
-/* 802D2C 802424AC 0080282D */  daddu     $a1, $a0, $zero
-/* 802D30 802424B0 0080302D */  daddu     $a2, $a0, $zero
-/* 802D34 802424B4 0C046F97 */  jal       set_background_color_blend
-/* 802D38 802424B8 240700FF */   addiu    $a3, $zero, 0xff
-/* 802D3C 802424BC 240200FF */  addiu     $v0, $zero, 0xff
-/* 802D40 802424C0 AE020070 */  sw        $v0, 0x70($s0)
-/* 802D44 802424C4 AE000074 */  sw        $zero, 0x74($s0)
-.L802424C8:
-/* 802D48 802424C8 8E020070 */  lw        $v0, 0x70($s0)
-/* 802D4C 802424CC 2442FFF8 */  addiu     $v0, $v0, -8
-/* 802D50 802424D0 04410002 */  bgez      $v0, .L802424DC
-/* 802D54 802424D4 AE020070 */   sw       $v0, 0x70($s0)
-/* 802D58 802424D8 AE000070 */  sw        $zero, 0x70($s0)
-.L802424DC:
-/* 802D5C 802424DC 0000202D */  daddu     $a0, $zero, $zero
-/* 802D60 802424E0 0080282D */  daddu     $a1, $a0, $zero
-/* 802D64 802424E4 92070073 */  lbu       $a3, 0x73($s0)
-/* 802D68 802424E8 0C046F97 */  jal       set_background_color_blend
-/* 802D6C 802424EC 0080302D */   daddu    $a2, $a0, $zero
-/* 802D70 802424F0 8E020070 */  lw        $v0, 0x70($s0)
-/* 802D74 802424F4 14400006 */  bnez      $v0, .L80242510
-/* 802D78 802424F8 00000000 */   nop
-/* 802D7C 802424FC 8E020074 */  lw        $v0, 0x74($s0)
-/* 802D80 80242500 14400003 */  bnez      $v0, .L80242510
-/* 802D84 80242504 24020001 */   addiu    $v0, $zero, 1
-/* 802D88 80242508 08090977 */  j         .L802425DC
-/* 802D8C 8024250C AE020074 */   sw       $v0, 0x74($s0)
-.L80242510:
-/* 802D90 80242510 8E030074 */  lw        $v1, 0x74($s0)
-/* 802D94 80242514 24020001 */  addiu     $v0, $zero, 1
-/* 802D98 80242518 14620031 */  bne       $v1, $v0, .L802425E0
-/* 802D9C 8024251C 0000102D */   daddu    $v0, $zero, $zero
-/* 802DA0 80242520 0C04760B */  jal       func_8011D82C
-/* 802DA4 80242524 0000202D */   daddu    $a0, $zero, $zero
-/* 802DA8 80242528 0000802D */  daddu     $s0, $zero, $zero
-/* 802DAC 8024252C 2413FFFC */  addiu     $s3, $zero, -4
-/* 802DB0 80242530 24120005 */  addiu     $s2, $zero, 5
-/* 802DB4 80242534 3C11FF7F */  lui       $s1, 0xff7f
-/* 802DB8 80242538 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 802DBC 8024253C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 802DC0 80242540 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 802DC4 80242544 A0400000 */  sb        $zero, ($v0)
-.L80242548:
-/* 802DC8 80242548 0C00E2B7 */  jal       get_npc_by_index
-/* 802DCC 8024254C 0200202D */   daddu    $a0, $s0, $zero
-/* 802DD0 80242550 0040202D */  daddu     $a0, $v0, $zero
-/* 802DD4 80242554 5080000B */  beql      $a0, $zero, .L80242584
-/* 802DD8 80242558 26100001 */   addiu    $s0, $s0, 1
-/* 802DDC 8024255C 8C820000 */  lw        $v0, ($a0)
-/* 802DE0 80242560 50400008 */  beql      $v0, $zero, .L80242584
-/* 802DE4 80242564 26100001 */   addiu    $s0, $s0, 1
-/* 802DE8 80242568 808300A4 */  lb        $v1, 0xa4($a0)
-/* 802DEC 8024256C 10730005 */  beq       $v1, $s3, .L80242584
-/* 802DF0 80242570 26100001 */   addiu    $s0, $s0, 1
-/* 802DF4 80242574 10720003 */  beq       $v1, $s2, .L80242584
-/* 802DF8 80242578 00000000 */   nop
-/* 802DFC 8024257C 00511024 */  and       $v0, $v0, $s1
-/* 802E00 80242580 AC820000 */  sw        $v0, ($a0)
-.L80242584:
-/* 802E04 80242584 2A020040 */  slti      $v0, $s0, 0x40
-/* 802E08 80242588 1440FFEF */  bnez      $v0, .L80242548
-/* 802E0C 8024258C 00000000 */   nop
-/* 802E10 80242590 0000802D */  daddu     $s0, $zero, $zero
-/* 802E14 80242594 3C11F7FF */  lui       $s1, 0xf7ff
-/* 802E18 80242598 3631FFFF */  ori       $s1, $s1, 0xffff
-.L8024259C:
-/* 802E1C 8024259C 0C04C3D6 */  jal       get_item_entity
-/* 802E20 802425A0 0200202D */   daddu    $a0, $s0, $zero
-/* 802E24 802425A4 0040182D */  daddu     $v1, $v0, $zero
-/* 802E28 802425A8 10600007 */  beqz      $v1, .L802425C8
-/* 802E2C 802425AC 26100001 */   addiu    $s0, $s0, 1
-/* 802E30 802425B0 8C640000 */  lw        $a0, ($v1)
-/* 802E34 802425B4 30820010 */  andi      $v0, $a0, 0x10
-/* 802E38 802425B8 10400003 */  beqz      $v0, .L802425C8
-/* 802E3C 802425BC 00000000 */   nop
-/* 802E40 802425C0 00911024 */  and       $v0, $a0, $s1
-/* 802E44 802425C4 AC620000 */  sw        $v0, ($v1)
-.L802425C8:
-/* 802E48 802425C8 2A020100 */  slti      $v0, $s0, 0x100
-/* 802E4C 802425CC 1440FFF3 */  bnez      $v0, .L8024259C
-/* 802E50 802425D0 24020002 */   addiu    $v0, $zero, 2
-/* 802E54 802425D4 08090978 */  j         .L802425E0
-/* 802E58 802425D8 00000000 */   nop
-.L802425DC:
-/* 802E5C 802425DC 0000102D */  daddu     $v0, $zero, $zero
-.L802425E0:
-/* 802E60 802425E0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 802E64 802425E4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 802E68 802425E8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 802E6C 802425EC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 802E70 802425F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 802E74 802425F4 03E00008 */  jr        $ra
-/* 802E78 802425F8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s
deleted file mode 100644
index 67408f5f68..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243870_8040F0
-/* 8040F0 80243870 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 8040F4 80243874 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8040F8 80243878 0080882D */  daddu     $s1, $a0, $zero
-/* 8040FC 8024387C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 804100 80243880 AFB00010 */  sw        $s0, 0x10($sp)
-/* 804104 80243884 8E30000C */  lw        $s0, 0xc($s1)
-/* 804108 80243888 8E050000 */  lw        $a1, ($s0)
-/* 80410C 8024388C 0C0B1EAF */  jal       get_variable
-/* 804110 80243890 26100004 */   addiu    $s0, $s0, 4
-/* 804114 80243894 0220202D */  daddu     $a0, $s1, $zero
-/* 804118 80243898 8E050000 */  lw        $a1, ($s0)
-/* 80411C 8024389C 0C0B1EAF */  jal       get_variable
-/* 804120 802438A0 0040802D */   daddu    $s0, $v0, $zero
-/* 804124 802438A4 44820000 */  mtc1      $v0, $f0
-/* 804128 802438A8 00000000 */  nop
-/* 80412C 802438AC 46800020 */  cvt.s.w   $f0, $f0
-/* 804130 802438B0 24020002 */  addiu     $v0, $zero, 2
-/* 804134 802438B4 00501804 */  sllv      $v1, $s0, $v0
-/* 804138 802438B8 00701821 */  addu      $v1, $v1, $s0
-/* 80413C 802438BC 00431804 */  sllv      $v1, $v1, $v0
-/* 804140 802438C0 00701823 */  subu      $v1, $v1, $s0
-/* 804144 802438C4 000320C0 */  sll       $a0, $v1, 3
-/* 804148 802438C8 00641821 */  addu      $v1, $v1, $a0
-/* 80414C 802438CC 000318C0 */  sll       $v1, $v1, 3
-/* 804150 802438D0 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* 804154 802438D4 00230821 */  addu      $at, $at, $v1
-/* 804158 802438D8 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* 80415C 802438DC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 804160 802438E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 804164 802438E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 804168 802438E8 03E00008 */  jr        $ra
-/* 80416C 802438EC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s
deleted file mode 100644
index 9a60461fac..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024396C_8041EC
-/* 8041EC 8024396C 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* 8041F0 80243970 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* 8041F4 80243974 AC800088 */  sw        $zero, 0x88($a0)
-/* 8041F8 80243978 80A30003 */  lb        $v1, 3($a1)
-/* 8041FC 8024397C 80A20002 */  lb        $v0, 2($a1)
-/* 804200 80243980 1462000B */  bne       $v1, $v0, .L802439B0
-/* 804204 80243984 00A0302D */   daddu    $a2, $a1, $zero
-/* 804208 80243988 80A30006 */  lb        $v1, 6($a1)
-/* 80420C 8024398C 80A20005 */  lb        $v0, 5($a1)
-/* 804210 80243990 14620007 */  bne       $v1, $v0, .L802439B0
-/* 804214 80243994 00000000 */   nop
-/* 804218 80243998 80C2028E */  lb        $v0, 0x28e($a2)
-/* 80421C 8024399C 84C30290 */  lh        $v1, 0x290($a2)
-/* 804220 802439A0 00021200 */  sll       $v0, $v0, 8
-/* 804224 802439A4 14620004 */  bne       $v1, $v0, .L802439B8
-/* 804228 802439A8 24020001 */   addiu    $v0, $zero, 1
-/* 80422C 802439AC AC820088 */  sw        $v0, 0x88($a0)
-.L802439B0:
-/* 804230 802439B0 03E00008 */  jr        $ra
-/* 804234 802439B4 24020002 */   addiu    $v0, $zero, 2
-.L802439B8:
-/* 804238 802439B8 03E00008 */  jr        $ra
-/* 80423C 802439BC 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s
deleted file mode 100644
index 5bbf56af1a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802439C0_804240
-/* 804240 802439C0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 804244 802439C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 804248 802439C8 0080882D */  daddu     $s1, $a0, $zero
-/* 80424C 802439CC AFBF001C */  sw        $ra, 0x1c($sp)
-/* 804250 802439D0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 804254 802439D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 804258 802439D8 8E30000C */  lw        $s0, 0xc($s1)
-/* 80425C 802439DC 8E050000 */  lw        $a1, ($s0)
-/* 804260 802439E0 0C0B1EAF */  jal       get_variable
-/* 804264 802439E4 26100004 */   addiu    $s0, $s0, 4
-/* 804268 802439E8 8E050000 */  lw        $a1, ($s0)
-/* 80426C 802439EC 26100004 */  addiu     $s0, $s0, 4
-/* 804270 802439F0 0220202D */  daddu     $a0, $s1, $zero
-/* 804274 802439F4 0C0B1EAF */  jal       get_variable
-/* 804278 802439F8 0040902D */   daddu    $s2, $v0, $zero
-/* 80427C 802439FC 0220202D */  daddu     $a0, $s1, $zero
-/* 804280 80243A00 8E050000 */  lw        $a1, ($s0)
-/* 804284 80243A04 0C0B1EAF */  jal       get_variable
-/* 804288 80243A08 0040802D */   daddu    $s0, $v0, $zero
-/* 80428C 80243A0C 0000202D */  daddu     $a0, $zero, $zero
-/* 804290 80243A10 324500FF */  andi      $a1, $s2, 0xff
-/* 804294 80243A14 320600FF */  andi      $a2, $s0, 0xff
-/* 804298 80243A18 0C04DF84 */  jal       set_transition_stencil_color
-/* 80429C 80243A1C 304700FF */   andi     $a3, $v0, 0xff
-/* 8042A0 80243A20 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 8042A4 80243A24 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8042A8 80243A28 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8042AC 80243A2C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8042B0 80243A30 24020002 */  addiu     $v0, $zero, 2
-/* 8042B4 80243A34 03E00008 */  jr        $ra
-/* 8042B8 80243A38 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s
deleted file mode 100644
index d8a6b0dcde..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tutorial_draw_contents_804074.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel pause_tutorial_draw_contents_804074
-/* 804074 802437F4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 804078 802437F8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 80407C 802437FC 0080882D */  daddu     $s1, $a0, $zero
-/* 804080 80243800 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 804084 80243804 AFB00010 */  sw        $s0, 0x10($sp)
-/* 804088 80243808 8E30000C */  lw        $s0, 0xc($s1)
-/* 80408C 8024380C 8E050000 */  lw        $a1, ($s0)
-/* 804090 80243810 0C0B1EAF */  jal       get_variable
-/* 804094 80243814 26100004 */   addiu    $s0, $s0, 4
-/* 804098 80243818 0220202D */  daddu     $a0, $s1, $zero
-/* 80409C 8024381C 8E050000 */  lw        $a1, ($s0)
-/* 8040A0 80243820 0C0B1EAF */  jal       get_variable
-/* 8040A4 80243824 0040882D */   daddu    $s1, $v0, $zero
-/* 8040A8 80243828 0000202D */  daddu     $a0, $zero, $zero
-/* 8040AC 8024382C 0080282D */  daddu     $a1, $a0, $zero
-/* 8040B0 80243830 0040802D */  daddu     $s0, $v0, $zero
-/* 8040B4 80243834 240600BE */  addiu     $a2, $zero, 0xbe
-/* 8040B8 80243838 0C04DF93 */  jal       set_transition_stencil_center
-/* 8040BC 8024383C 24070091 */   addiu    $a3, $zero, 0x91
-/* 8040C0 80243840 44900000 */  mtc1      $s0, $f0
-/* 8040C4 80243844 00000000 */  nop
-/* 8040C8 80243848 46800020 */  cvt.s.w   $f0, $f0
-/* 8040CC 8024384C 44050000 */  mfc1      $a1, $f0
-/* 8040D0 80243850 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* 8040D4 80243854 322400FF */   andi     $a0, $s1, 0xff
-/* 8040D8 80243858 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 8040DC 8024385C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8040E0 80243860 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8040E4 80243864 24020002 */  addiu     $v0, $zero, 2
-/* 8040E8 80243868 03E00008 */  jr        $ra
-/* 8040EC 8024386C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240034_8232F4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240034_8232F4.s
deleted file mode 100644
index 3784af4539..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240034_8232F4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_8232F4
-/* 8232F4 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8232F8 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8232FC 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 823300 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 823304 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 823308 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 82330C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 823310 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 823314 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 823318 80240058 08090038 */  j         .L802400E0
-/* 82331C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 823320 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 823324 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 823328 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 82332C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 823330 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 823334 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 823338 80240078 14400003 */  bnez      $v0, .L80240088
-/* 82333C 8024007C 00000000 */   nop
-/* 823340 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 823344 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 823348 80240088 44822000 */  mtc1      $v0, $f4
-/* 82334C 8024008C 00000000 */  nop
-/* 823350 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 823354 80240094 44062000 */  mfc1      $a2, $f4
-/* 823358 80240098 44872000 */  mtc1      $a3, $f4
-/* 82335C 8024009C 00000000 */  nop
-/* 823360 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 823364 802400A4 44806000 */  mtc1      $zero, $f12
-/* 823368 802400A8 44072000 */  mfc1      $a3, $f4
-/* 82336C 802400AC 0C00A720 */  jal       atan2
-/* 823370 802400B0 46006386 */   mov.s    $f14, $f12
-/* 823374 802400B4 3C014270 */  lui       $at, 0x4270
-/* 823378 802400B8 44811000 */  mtc1      $at, $f2
-/* 82337C 802400BC 00000000 */  nop
-/* 823380 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 823384 802400C4 00000000 */  nop
-/* 823388 802400C8 45000004 */  bc1f      .L802400DC
-/* 82338C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 823390 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 823394 802400D4 08090038 */  j         .L802400E0
-/* 823398 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 82339C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 8233A0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8233A4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8233A8 802400E8 03E00008 */  jr        $ra
-/* 8233AC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s
deleted file mode 100644
index b6cd2e4f32..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B20_824DE0
-/* 824DE0 80241B20 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 824DE4 80241B24 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 824DE8 80241B28 AFB00010 */  sw        $s0, 0x10($sp)
-/* 824DEC 80241B2C 0C00EABB */  jal       get_npc_unsafe
-/* 824DF0 80241B30 8C84014C */   lw       $a0, 0x14c($a0)
-/* 824DF4 80241B34 24040008 */  addiu     $a0, $zero, 8
-/* 824DF8 80241B38 0040802D */  daddu     $s0, $v0, $zero
-/* 824DFC 80241B3C 3C028024 */  lui       $v0, %hi(func_80241B8C_824E4C)
-/* 824E00 80241B40 24421B8C */  addiu     $v0, $v0, %lo(func_80241B8C_824E4C)
-/* 824E04 80241B44 0C00AB39 */  jal       heap_malloc
-/* 824E08 80241B48 AE020008 */   sw       $v0, 8($s0)
-/* 824E0C 80241B4C 0040182D */  daddu     $v1, $v0, $zero
-/* 824E10 80241B50 AE030020 */  sw        $v1, 0x20($s0)
-/* 824E14 80241B54 AC600000 */  sw        $zero, ($v1)
-/* 824E18 80241B58 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 824E1C 80241B5C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 824E20 80241B60 24020001 */  addiu     $v0, $zero, 1
-/* 824E24 80241B64 03E00008 */  jr        $ra
-/* 824E28 80241B68 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s
deleted file mode 100644
index 5e7970020f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B8C_824E4C
-/* 824E4C 80241B8C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 824E50 80241B90 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 824E54 80241B94 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 824E58 80241B98 3C05800B */  lui       $a1, %hi(gCameras)
-/* 824E5C 80241B9C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 824E60 80241BA0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 824E64 80241BA4 00031080 */  sll       $v0, $v1, 2
-/* 824E68 80241BA8 00431021 */  addu      $v0, $v0, $v1
-/* 824E6C 80241BAC 00021080 */  sll       $v0, $v0, 2
-/* 824E70 80241BB0 00431023 */  subu      $v0, $v0, $v1
-/* 824E74 80241BB4 000218C0 */  sll       $v1, $v0, 3
-/* 824E78 80241BB8 00431021 */  addu      $v0, $v0, $v1
-/* 824E7C 80241BBC 8C830020 */  lw        $v1, 0x20($a0)
-/* 824E80 80241BC0 000210C0 */  sll       $v0, $v0, 3
-/* 824E84 80241BC4 8C630000 */  lw        $v1, ($v1)
-/* 824E88 80241BC8 30630001 */  andi      $v1, $v1, 1
-/* 824E8C 80241BCC 10600004 */  beqz      $v1, .L80241BE0
-/* 824E90 80241BD0 00451021 */   addu     $v0, $v0, $a1
-/* 824E94 80241BD4 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 824E98 80241BD8 0C00A6C9 */  jal       clamp_angle
-/* 824E9C 80241BDC 46006307 */   neg.s    $f12, $f12
-.L80241BE0:
-/* 824EA0 80241BE0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 824EA4 80241BE4 03E00008 */  jr        $ra
-/* 824EA8 80241BE8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s
deleted file mode 100644
index b951c7736c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D38_824FF8
-/* 824FF8 80241D38 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 824FFC 80241D3C AFB00010 */  sw        $s0, 0x10($sp)
-/* 825000 80241D40 0080802D */  daddu     $s0, $a0, $zero
-/* 825004 80241D44 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 825008 80241D48 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 82500C 80241D4C AFB20018 */  sw        $s2, 0x18($sp)
-/* 825010 80241D50 10A00009 */  beqz      $a1, .L80241D78
-/* 825014 80241D54 AFB10014 */   sw       $s1, 0x14($sp)
-/* 825018 80241D58 0000202D */  daddu     $a0, $zero, $zero
-/* 82501C 80241D5C 0080282D */  daddu     $a1, $a0, $zero
-/* 825020 80241D60 0080302D */  daddu     $a2, $a0, $zero
-/* 825024 80241D64 0C046F97 */  jal       set_background_color_blend
-/* 825028 80241D68 240700FF */   addiu    $a3, $zero, 0xff
-/* 82502C 80241D6C 240200FF */  addiu     $v0, $zero, 0xff
-/* 825030 80241D70 AE020070 */  sw        $v0, 0x70($s0)
-/* 825034 80241D74 AE000074 */  sw        $zero, 0x74($s0)
-.L80241D78:
-/* 825038 80241D78 8E020070 */  lw        $v0, 0x70($s0)
-/* 82503C 80241D7C 2442FFF8 */  addiu     $v0, $v0, -8
-/* 825040 80241D80 04410002 */  bgez      $v0, .L80241D8C
-/* 825044 80241D84 AE020070 */   sw       $v0, 0x70($s0)
-/* 825048 80241D88 AE000070 */  sw        $zero, 0x70($s0)
-.L80241D8C:
-/* 82504C 80241D8C 0000202D */  daddu     $a0, $zero, $zero
-/* 825050 80241D90 0080282D */  daddu     $a1, $a0, $zero
-/* 825054 80241D94 92070073 */  lbu       $a3, 0x73($s0)
-/* 825058 80241D98 0C046F97 */  jal       set_background_color_blend
-/* 82505C 80241D9C 0080302D */   daddu    $a2, $a0, $zero
-/* 825060 80241DA0 8E020070 */  lw        $v0, 0x70($s0)
-/* 825064 80241DA4 14400006 */  bnez      $v0, .L80241DC0
-/* 825068 80241DA8 00000000 */   nop
-/* 82506C 80241DAC 8E020074 */  lw        $v0, 0x74($s0)
-/* 825070 80241DB0 14400003 */  bnez      $v0, .L80241DC0
-/* 825074 80241DB4 24020001 */   addiu    $v0, $zero, 1
-/* 825078 80241DB8 080907A3 */  j         .L80241E8C
-/* 82507C 80241DBC AE020074 */   sw       $v0, 0x74($s0)
-.L80241DC0:
-/* 825080 80241DC0 8E030074 */  lw        $v1, 0x74($s0)
-/* 825084 80241DC4 24020001 */  addiu     $v0, $zero, 1
-/* 825088 80241DC8 14620031 */  bne       $v1, $v0, .L80241E90
-/* 82508C 80241DCC 0000102D */   daddu    $v0, $zero, $zero
-/* 825090 80241DD0 0C04760B */  jal       func_8011D82C
-/* 825094 80241DD4 0000202D */   daddu    $a0, $zero, $zero
-/* 825098 80241DD8 0000802D */  daddu     $s0, $zero, $zero
-/* 82509C 80241DDC 2413FFFC */  addiu     $s3, $zero, -4
-/* 8250A0 80241DE0 2412000C */  addiu     $s2, $zero, 0xc
-/* 8250A4 80241DE4 3C11FF7F */  lui       $s1, 0xff7f
-/* 8250A8 80241DE8 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 8250AC 80241DEC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 8250B0 80241DF0 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 8250B4 80241DF4 A0400000 */  sb        $zero, ($v0)
-.L80241DF8:
-/* 8250B8 80241DF8 0C00E2B7 */  jal       get_npc_by_index
-/* 8250BC 80241DFC 0200202D */   daddu    $a0, $s0, $zero
-/* 8250C0 80241E00 0040202D */  daddu     $a0, $v0, $zero
-/* 8250C4 80241E04 5080000B */  beql      $a0, $zero, .L80241E34
-/* 8250C8 80241E08 26100001 */   addiu    $s0, $s0, 1
-/* 8250CC 80241E0C 8C820000 */  lw        $v0, ($a0)
-/* 8250D0 80241E10 50400008 */  beql      $v0, $zero, .L80241E34
-/* 8250D4 80241E14 26100001 */   addiu    $s0, $s0, 1
-/* 8250D8 80241E18 808300A4 */  lb        $v1, 0xa4($a0)
-/* 8250DC 80241E1C 10730005 */  beq       $v1, $s3, .L80241E34
-/* 8250E0 80241E20 26100001 */   addiu    $s0, $s0, 1
-/* 8250E4 80241E24 10720003 */  beq       $v1, $s2, .L80241E34
-/* 8250E8 80241E28 00000000 */   nop
-/* 8250EC 80241E2C 00511024 */  and       $v0, $v0, $s1
-/* 8250F0 80241E30 AC820000 */  sw        $v0, ($a0)
-.L80241E34:
-/* 8250F4 80241E34 2A020040 */  slti      $v0, $s0, 0x40
-/* 8250F8 80241E38 1440FFEF */  bnez      $v0, .L80241DF8
-/* 8250FC 80241E3C 00000000 */   nop
-/* 825100 80241E40 0000802D */  daddu     $s0, $zero, $zero
-/* 825104 80241E44 3C11F7FF */  lui       $s1, 0xf7ff
-/* 825108 80241E48 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80241E4C:
-/* 82510C 80241E4C 0C04C3D6 */  jal       get_item_entity
-/* 825110 80241E50 0200202D */   daddu    $a0, $s0, $zero
-/* 825114 80241E54 0040182D */  daddu     $v1, $v0, $zero
-/* 825118 80241E58 10600007 */  beqz      $v1, .L80241E78
-/* 82511C 80241E5C 26100001 */   addiu    $s0, $s0, 1
-/* 825120 80241E60 8C640000 */  lw        $a0, ($v1)
-/* 825124 80241E64 30820010 */  andi      $v0, $a0, 0x10
-/* 825128 80241E68 10400003 */  beqz      $v0, .L80241E78
-/* 82512C 80241E6C 00000000 */   nop
-/* 825130 80241E70 00911024 */  and       $v0, $a0, $s1
-/* 825134 80241E74 AC620000 */  sw        $v0, ($v1)
-.L80241E78:
-/* 825138 80241E78 2A020100 */  slti      $v0, $s0, 0x100
-/* 82513C 80241E7C 1440FFF3 */  bnez      $v0, .L80241E4C
-/* 825140 80241E80 24020002 */   addiu    $v0, $zero, 2
-/* 825144 80241E84 080907A4 */  j         .L80241E90
-/* 825148 80241E88 00000000 */   nop
-.L80241E8C:
-/* 82514C 80241E8C 0000102D */  daddu     $v0, $zero, $zero
-.L80241E90:
-/* 825150 80241E90 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 825154 80241E94 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 825158 80241E98 8FB20018 */  lw        $s2, 0x18($sp)
-/* 82515C 80241E9C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 825160 80241EA0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 825164 80241EA4 03E00008 */  jr        $ra
-/* 825168 80241EA8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240034_831834.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240034_831834.s
deleted file mode 100644
index b8dfa68bdc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831800/func_80240034_831834.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_831834
-/* 831834 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 831838 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 83183C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 831840 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 831844 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 831848 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 83184C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 831850 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 831854 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 831858 80240058 08090038 */  j         .L802400E0
-/* 83185C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 831860 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 831864 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 831868 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 83186C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 831870 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 831874 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 831878 80240078 14400003 */  bnez      $v0, .L80240088
-/* 83187C 8024007C 00000000 */   nop
-/* 831880 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 831884 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 831888 80240088 44822000 */  mtc1      $v0, $f4
-/* 83188C 8024008C 00000000 */  nop
-/* 831890 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 831894 80240094 44062000 */  mfc1      $a2, $f4
-/* 831898 80240098 44872000 */  mtc1      $a3, $f4
-/* 83189C 8024009C 00000000 */  nop
-/* 8318A0 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 8318A4 802400A4 44806000 */  mtc1      $zero, $f12
-/* 8318A8 802400A8 44072000 */  mfc1      $a3, $f4
-/* 8318AC 802400AC 0C00A720 */  jal       atan2
-/* 8318B0 802400B0 46006386 */   mov.s    $f14, $f12
-/* 8318B4 802400B4 3C014270 */  lui       $at, 0x4270
-/* 8318B8 802400B8 44811000 */  mtc1      $at, $f2
-/* 8318BC 802400BC 00000000 */  nop
-/* 8318C0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 8318C4 802400C4 00000000 */  nop
-/* 8318C8 802400C8 45000004 */  bc1f      .L802400DC
-/* 8318CC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 8318D0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 8318D4 802400D4 08090038 */  j         .L802400E0
-/* 8318D8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 8318DC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 8318E0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8318E4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8318E8 802400E8 03E00008 */  jr        $ra
-/* 8318EC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s
deleted file mode 100644
index c54033b326..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240810_832010
-/* 832010 80240810 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 832014 80240814 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 832018 80240818 AFB00010 */  sw        $s0, 0x10($sp)
-/* 83201C 8024081C 0C00EABB */  jal       get_npc_unsafe
-/* 832020 80240820 8C84014C */   lw       $a0, 0x14c($a0)
-/* 832024 80240824 24040008 */  addiu     $a0, $zero, 8
-/* 832028 80240828 0040802D */  daddu     $s0, $v0, $zero
-/* 83202C 8024082C 3C028024 */  lui       $v0, %hi(func_8024087C_83207C)
-/* 832030 80240830 2442087C */  addiu     $v0, $v0, %lo(func_8024087C_83207C)
-/* 832034 80240834 0C00AB39 */  jal       heap_malloc
-/* 832038 80240838 AE020008 */   sw       $v0, 8($s0)
-/* 83203C 8024083C 0040182D */  daddu     $v1, $v0, $zero
-/* 832040 80240840 AE030020 */  sw        $v1, 0x20($s0)
-/* 832044 80240844 AC600000 */  sw        $zero, ($v1)
-/* 832048 80240848 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 83204C 8024084C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832050 80240850 24020001 */  addiu     $v0, $zero, 1
-/* 832054 80240854 03E00008 */  jr        $ra
-/* 832058 80240858 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s
deleted file mode 100644
index 455b955ccf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024087C_83207C
-/* 83207C 8024087C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 832080 80240880 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 832084 80240884 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 832088 80240888 3C05800B */  lui       $a1, %hi(gCameras)
-/* 83208C 8024088C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 832090 80240890 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 832094 80240894 00031080 */  sll       $v0, $v1, 2
-/* 832098 80240898 00431021 */  addu      $v0, $v0, $v1
-/* 83209C 8024089C 00021080 */  sll       $v0, $v0, 2
-/* 8320A0 802408A0 00431023 */  subu      $v0, $v0, $v1
-/* 8320A4 802408A4 000218C0 */  sll       $v1, $v0, 3
-/* 8320A8 802408A8 00431021 */  addu      $v0, $v0, $v1
-/* 8320AC 802408AC 8C830020 */  lw        $v1, 0x20($a0)
-/* 8320B0 802408B0 000210C0 */  sll       $v0, $v0, 3
-/* 8320B4 802408B4 8C630000 */  lw        $v1, ($v1)
-/* 8320B8 802408B8 30630001 */  andi      $v1, $v1, 1
-/* 8320BC 802408BC 10600004 */  beqz      $v1, .L802408D0
-/* 8320C0 802408C0 00451021 */   addu     $v0, $v0, $a1
-/* 8320C4 802408C4 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 8320C8 802408C8 0C00A6C9 */  jal       clamp_angle
-/* 8320CC 802408CC 46006307 */   neg.s    $f12, $f12
-.L802408D0:
-/* 8320D0 802408D0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8320D4 802408D4 03E00008 */  jr        $ra
-/* 8320D8 802408D8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s
deleted file mode 100644
index 2d7ffbfe80..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A28_832228
-/* 832228 80240A28 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 83222C 80240A2C AFB00010 */  sw        $s0, 0x10($sp)
-/* 832230 80240A30 0080802D */  daddu     $s0, $a0, $zero
-/* 832234 80240A34 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 832238 80240A38 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 83223C 80240A3C AFB20018 */  sw        $s2, 0x18($sp)
-/* 832240 80240A40 10A00009 */  beqz      $a1, .L80240A68
-/* 832244 80240A44 AFB10014 */   sw       $s1, 0x14($sp)
-/* 832248 80240A48 0000202D */  daddu     $a0, $zero, $zero
-/* 83224C 80240A4C 0080282D */  daddu     $a1, $a0, $zero
-/* 832250 80240A50 0080302D */  daddu     $a2, $a0, $zero
-/* 832254 80240A54 0C046F97 */  jal       set_background_color_blend
-/* 832258 80240A58 240700FF */   addiu    $a3, $zero, 0xff
-/* 83225C 80240A5C 240200FF */  addiu     $v0, $zero, 0xff
-/* 832260 80240A60 AE020070 */  sw        $v0, 0x70($s0)
-/* 832264 80240A64 AE000074 */  sw        $zero, 0x74($s0)
-.L80240A68:
-/* 832268 80240A68 8E020070 */  lw        $v0, 0x70($s0)
-/* 83226C 80240A6C 2442FFF8 */  addiu     $v0, $v0, -8
-/* 832270 80240A70 04410002 */  bgez      $v0, .L80240A7C
-/* 832274 80240A74 AE020070 */   sw       $v0, 0x70($s0)
-/* 832278 80240A78 AE000070 */  sw        $zero, 0x70($s0)
-.L80240A7C:
-/* 83227C 80240A7C 0000202D */  daddu     $a0, $zero, $zero
-/* 832280 80240A80 0080282D */  daddu     $a1, $a0, $zero
-/* 832284 80240A84 92070073 */  lbu       $a3, 0x73($s0)
-/* 832288 80240A88 0C046F97 */  jal       set_background_color_blend
-/* 83228C 80240A8C 0080302D */   daddu    $a2, $a0, $zero
-/* 832290 80240A90 8E020070 */  lw        $v0, 0x70($s0)
-/* 832294 80240A94 14400006 */  bnez      $v0, .L80240AB0
-/* 832298 80240A98 00000000 */   nop
-/* 83229C 80240A9C 8E020074 */  lw        $v0, 0x74($s0)
-/* 8322A0 80240AA0 14400003 */  bnez      $v0, .L80240AB0
-/* 8322A4 80240AA4 24020001 */   addiu    $v0, $zero, 1
-/* 8322A8 80240AA8 080902DF */  j         .L80240B7C
-/* 8322AC 80240AAC AE020074 */   sw       $v0, 0x74($s0)
-.L80240AB0:
-/* 8322B0 80240AB0 8E030074 */  lw        $v1, 0x74($s0)
-/* 8322B4 80240AB4 24020001 */  addiu     $v0, $zero, 1
-/* 8322B8 80240AB8 14620031 */  bne       $v1, $v0, .L80240B80
-/* 8322BC 80240ABC 0000102D */   daddu    $v0, $zero, $zero
-/* 8322C0 80240AC0 0C04760B */  jal       func_8011D82C
-/* 8322C4 80240AC4 0000202D */   daddu    $a0, $zero, $zero
-/* 8322C8 80240AC8 0000802D */  daddu     $s0, $zero, $zero
-/* 8322CC 80240ACC 2413FFFC */  addiu     $s3, $zero, -4
-/* 8322D0 80240AD0 24120017 */  addiu     $s2, $zero, 0x17
-/* 8322D4 80240AD4 3C11FF7F */  lui       $s1, 0xff7f
-/* 8322D8 80240AD8 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 8322DC 80240ADC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 8322E0 80240AE0 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 8322E4 80240AE4 A0400000 */  sb        $zero, ($v0)
-.L80240AE8:
-/* 8322E8 80240AE8 0C00E2B7 */  jal       get_npc_by_index
-/* 8322EC 80240AEC 0200202D */   daddu    $a0, $s0, $zero
-/* 8322F0 80240AF0 0040202D */  daddu     $a0, $v0, $zero
-/* 8322F4 80240AF4 5080000B */  beql      $a0, $zero, .L80240B24
-/* 8322F8 80240AF8 26100001 */   addiu    $s0, $s0, 1
-/* 8322FC 80240AFC 8C820000 */  lw        $v0, ($a0)
-/* 832300 80240B00 50400008 */  beql      $v0, $zero, .L80240B24
-/* 832304 80240B04 26100001 */   addiu    $s0, $s0, 1
-/* 832308 80240B08 808300A4 */  lb        $v1, 0xa4($a0)
-/* 83230C 80240B0C 10730005 */  beq       $v1, $s3, .L80240B24
-/* 832310 80240B10 26100001 */   addiu    $s0, $s0, 1
-/* 832314 80240B14 10720003 */  beq       $v1, $s2, .L80240B24
-/* 832318 80240B18 00000000 */   nop
-/* 83231C 80240B1C 00511024 */  and       $v0, $v0, $s1
-/* 832320 80240B20 AC820000 */  sw        $v0, ($a0)
-.L80240B24:
-/* 832324 80240B24 2A020040 */  slti      $v0, $s0, 0x40
-/* 832328 80240B28 1440FFEF */  bnez      $v0, .L80240AE8
-/* 83232C 80240B2C 00000000 */   nop
-/* 832330 80240B30 0000802D */  daddu     $s0, $zero, $zero
-/* 832334 80240B34 3C11F7FF */  lui       $s1, 0xf7ff
-/* 832338 80240B38 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80240B3C:
-/* 83233C 80240B3C 0C04C3D6 */  jal       get_item_entity
-/* 832340 80240B40 0200202D */   daddu    $a0, $s0, $zero
-/* 832344 80240B44 0040182D */  daddu     $v1, $v0, $zero
-/* 832348 80240B48 10600007 */  beqz      $v1, .L80240B68
-/* 83234C 80240B4C 26100001 */   addiu    $s0, $s0, 1
-/* 832350 80240B50 8C640000 */  lw        $a0, ($v1)
-/* 832354 80240B54 30820010 */  andi      $v0, $a0, 0x10
-/* 832358 80240B58 10400003 */  beqz      $v0, .L80240B68
-/* 83235C 80240B5C 00000000 */   nop
-/* 832360 80240B60 00911024 */  and       $v0, $a0, $s1
-/* 832364 80240B64 AC620000 */  sw        $v0, ($v1)
-.L80240B68:
-/* 832368 80240B68 2A020100 */  slti      $v0, $s0, 0x100
-/* 83236C 80240B6C 1440FFF3 */  bnez      $v0, .L80240B3C
-/* 832370 80240B70 24020002 */   addiu    $v0, $zero, 2
-/* 832374 80240B74 080902E0 */  j         .L80240B80
-/* 832378 80240B78 00000000 */   nop
-.L80240B7C:
-/* 83237C 80240B7C 0000102D */  daddu     $v0, $zero, $zero
-.L80240B80:
-/* 832380 80240B80 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 832384 80240B84 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 832388 80240B88 8FB20018 */  lw        $s2, 0x18($sp)
-/* 83238C 80240B8C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 832390 80240B90 8FB00010 */  lw        $s0, 0x10($sp)
-/* 832394 80240B94 03E00008 */  jr        $ra
-/* 832398 80240B98 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40_833740.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40_833740.s
deleted file mode 100644
index 33143b58cc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40_833740.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F40_833740
-/* 833740 80241F40 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 833744 80241F44 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 833748 80241F48 8C82000C */  lw        $v0, 0xc($a0)
-/* 83374C 80241F4C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* 833750 80241F50 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* 833754 80241F54 0C0B2026 */  jal       set_variable
-/* 833758 80241F58 8C450000 */   lw       $a1, ($v0)
-/* 83375C 80241F5C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 833760 80241F60 24020002 */  addiu     $v0, $zero, 2
-/* 833764 80241F64 03E00008 */  jr        $ra
-/* 833768 80241F68 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s
deleted file mode 100644
index 4d379a4ac6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802407C0_843390
-/* 843390 802407C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 843394 802407C4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 843398 802407C8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 84339C 802407CC 0C00EABB */  jal       get_npc_unsafe
-/* 8433A0 802407D0 8C84014C */   lw       $a0, 0x14c($a0)
-/* 8433A4 802407D4 24040008 */  addiu     $a0, $zero, 8
-/* 8433A8 802407D8 0040802D */  daddu     $s0, $v0, $zero
-/* 8433AC 802407DC 3C028024 */  lui       $v0, %hi(func_8024082C_8433FC)
-/* 8433B0 802407E0 2442082C */  addiu     $v0, $v0, %lo(func_8024082C_8433FC)
-/* 8433B4 802407E4 0C00AB39 */  jal       heap_malloc
-/* 8433B8 802407E8 AE020008 */   sw       $v0, 8($s0)
-/* 8433BC 802407EC 0040182D */  daddu     $v1, $v0, $zero
-/* 8433C0 802407F0 AE030020 */  sw        $v1, 0x20($s0)
-/* 8433C4 802407F4 AC600000 */  sw        $zero, ($v1)
-/* 8433C8 802407F8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8433CC 802407FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8433D0 80240800 24020001 */  addiu     $v0, $zero, 1
-/* 8433D4 80240804 03E00008 */  jr        $ra
-/* 8433D8 80240808 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s
deleted file mode 100644
index be54ceacc4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024082C_8433FC
-/* 8433FC 8024082C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 843400 80240830 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 843404 80240834 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 843408 80240838 3C05800B */  lui       $a1, %hi(gCameras)
-/* 84340C 8024083C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 843410 80240840 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 843414 80240844 00031080 */  sll       $v0, $v1, 2
-/* 843418 80240848 00431021 */  addu      $v0, $v0, $v1
-/* 84341C 8024084C 00021080 */  sll       $v0, $v0, 2
-/* 843420 80240850 00431023 */  subu      $v0, $v0, $v1
-/* 843424 80240854 000218C0 */  sll       $v1, $v0, 3
-/* 843428 80240858 00431021 */  addu      $v0, $v0, $v1
-/* 84342C 8024085C 8C830020 */  lw        $v1, 0x20($a0)
-/* 843430 80240860 000210C0 */  sll       $v0, $v0, 3
-/* 843434 80240864 8C630000 */  lw        $v1, ($v1)
-/* 843438 80240868 30630001 */  andi      $v1, $v1, 1
-/* 84343C 8024086C 10600004 */  beqz      $v1, .L80240880
-/* 843440 80240870 00451021 */   addu     $v0, $v0, $a1
-/* 843444 80240874 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 843448 80240878 0C00A6C9 */  jal       clamp_angle
-/* 84344C 8024087C 46006307 */   neg.s    $f12, $f12
-.L80240880:
-/* 843450 80240880 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 843454 80240884 03E00008 */  jr        $ra
-/* 843458 80240888 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s
deleted file mode 100644
index ab89c1ea2a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409D8_8435A8
-/* 8435A8 802409D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8435AC 802409DC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8435B0 802409E0 0080802D */  daddu     $s0, $a0, $zero
-/* 8435B4 802409E4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 8435B8 802409E8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8435BC 802409EC AFB20018 */  sw        $s2, 0x18($sp)
-/* 8435C0 802409F0 10A00009 */  beqz      $a1, .L80240A18
-/* 8435C4 802409F4 AFB10014 */   sw       $s1, 0x14($sp)
-/* 8435C8 802409F8 0000202D */  daddu     $a0, $zero, $zero
-/* 8435CC 802409FC 0080282D */  daddu     $a1, $a0, $zero
-/* 8435D0 80240A00 0080302D */  daddu     $a2, $a0, $zero
-/* 8435D4 80240A04 0C046F97 */  jal       set_background_color_blend
-/* 8435D8 80240A08 240700FF */   addiu    $a3, $zero, 0xff
-/* 8435DC 80240A0C 240200FF */  addiu     $v0, $zero, 0xff
-/* 8435E0 80240A10 AE020070 */  sw        $v0, 0x70($s0)
-/* 8435E4 80240A14 AE000074 */  sw        $zero, 0x74($s0)
-.L80240A18:
-/* 8435E8 80240A18 8E020070 */  lw        $v0, 0x70($s0)
-/* 8435EC 80240A1C 2442FFF8 */  addiu     $v0, $v0, -8
-/* 8435F0 80240A20 04410002 */  bgez      $v0, .L80240A2C
-/* 8435F4 80240A24 AE020070 */   sw       $v0, 0x70($s0)
-/* 8435F8 80240A28 AE000070 */  sw        $zero, 0x70($s0)
-.L80240A2C:
-/* 8435FC 80240A2C 0000202D */  daddu     $a0, $zero, $zero
-/* 843600 80240A30 0080282D */  daddu     $a1, $a0, $zero
-/* 843604 80240A34 92070073 */  lbu       $a3, 0x73($s0)
-/* 843608 80240A38 0C046F97 */  jal       set_background_color_blend
-/* 84360C 80240A3C 0080302D */   daddu    $a2, $a0, $zero
-/* 843610 80240A40 8E020070 */  lw        $v0, 0x70($s0)
-/* 843614 80240A44 14400006 */  bnez      $v0, .L80240A60
-/* 843618 80240A48 00000000 */   nop
-/* 84361C 80240A4C 8E020074 */  lw        $v0, 0x74($s0)
-/* 843620 80240A50 14400003 */  bnez      $v0, .L80240A60
-/* 843624 80240A54 24020001 */   addiu    $v0, $zero, 1
-/* 843628 80240A58 080902CB */  j         .L80240B2C
-/* 84362C 80240A5C AE020074 */   sw       $v0, 0x74($s0)
-.L80240A60:
-/* 843630 80240A60 8E030074 */  lw        $v1, 0x74($s0)
-/* 843634 80240A64 24020001 */  addiu     $v0, $zero, 1
-/* 843638 80240A68 14620031 */  bne       $v1, $v0, .L80240B30
-/* 84363C 80240A6C 0000102D */   daddu    $v0, $zero, $zero
-/* 843640 80240A70 0C04760B */  jal       func_8011D82C
-/* 843644 80240A74 0000202D */   daddu    $a0, $zero, $zero
-/* 843648 80240A78 0000802D */  daddu     $s0, $zero, $zero
-/* 84364C 80240A7C 2413FFFC */  addiu     $s3, $zero, -4
-/* 843650 80240A80 24120014 */  addiu     $s2, $zero, 0x14
-/* 843654 80240A84 3C11FF7F */  lui       $s1, 0xff7f
-/* 843658 80240A88 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 84365C 80240A8C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 843660 80240A90 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 843664 80240A94 A0400000 */  sb        $zero, ($v0)
-.L80240A98:
-/* 843668 80240A98 0C00E2B7 */  jal       get_npc_by_index
-/* 84366C 80240A9C 0200202D */   daddu    $a0, $s0, $zero
-/* 843670 80240AA0 0040202D */  daddu     $a0, $v0, $zero
-/* 843674 80240AA4 5080000B */  beql      $a0, $zero, .L80240AD4
-/* 843678 80240AA8 26100001 */   addiu    $s0, $s0, 1
-/* 84367C 80240AAC 8C820000 */  lw        $v0, ($a0)
-/* 843680 80240AB0 50400008 */  beql      $v0, $zero, .L80240AD4
-/* 843684 80240AB4 26100001 */   addiu    $s0, $s0, 1
-/* 843688 80240AB8 808300A4 */  lb        $v1, 0xa4($a0)
-/* 84368C 80240ABC 10730005 */  beq       $v1, $s3, .L80240AD4
-/* 843690 80240AC0 26100001 */   addiu    $s0, $s0, 1
-/* 843694 80240AC4 10720003 */  beq       $v1, $s2, .L80240AD4
-/* 843698 80240AC8 00000000 */   nop
-/* 84369C 80240ACC 00511024 */  and       $v0, $v0, $s1
-/* 8436A0 80240AD0 AC820000 */  sw        $v0, ($a0)
-.L80240AD4:
-/* 8436A4 80240AD4 2A020040 */  slti      $v0, $s0, 0x40
-/* 8436A8 80240AD8 1440FFEF */  bnez      $v0, .L80240A98
-/* 8436AC 80240ADC 00000000 */   nop
-/* 8436B0 80240AE0 0000802D */  daddu     $s0, $zero, $zero
-/* 8436B4 80240AE4 3C11F7FF */  lui       $s1, 0xf7ff
-/* 8436B8 80240AE8 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80240AEC:
-/* 8436BC 80240AEC 0C04C3D6 */  jal       get_item_entity
-/* 8436C0 80240AF0 0200202D */   daddu    $a0, $s0, $zero
-/* 8436C4 80240AF4 0040182D */  daddu     $v1, $v0, $zero
-/* 8436C8 80240AF8 10600007 */  beqz      $v1, .L80240B18
-/* 8436CC 80240AFC 26100001 */   addiu    $s0, $s0, 1
-/* 8436D0 80240B00 8C640000 */  lw        $a0, ($v1)
-/* 8436D4 80240B04 30820010 */  andi      $v0, $a0, 0x10
-/* 8436D8 80240B08 10400003 */  beqz      $v0, .L80240B18
-/* 8436DC 80240B0C 00000000 */   nop
-/* 8436E0 80240B10 00911024 */  and       $v0, $a0, $s1
-/* 8436E4 80240B14 AC620000 */  sw        $v0, ($v1)
-.L80240B18:
-/* 8436E8 80240B18 2A020100 */  slti      $v0, $s0, 0x100
-/* 8436EC 80240B1C 1440FFF3 */  bnez      $v0, .L80240AEC
-/* 8436F0 80240B20 24020002 */   addiu    $v0, $zero, 2
-/* 8436F4 80240B24 080902CC */  j         .L80240B30
-/* 8436F8 80240B28 00000000 */   nop
-.L80240B2C:
-/* 8436FC 80240B2C 0000102D */  daddu     $v0, $zero, $zero
-.L80240B30:
-/* 843700 80240B30 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 843704 80240B34 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 843708 80240B38 8FB20018 */  lw        $s2, 0x18($sp)
-/* 84370C 80240B3C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 843710 80240B40 8FB00010 */  lw        $s0, 0x10($sp)
-/* 843714 80240B44 03E00008 */  jr        $ra
-/* 843718 80240B48 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980_844550.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980_844550.s
deleted file mode 100644
index d72fccfc5b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980_844550.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241980_844550
-/* 844550 80241980 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 844554 80241984 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 844558 80241988 8C82000C */  lw        $v0, 0xc($a0)
-/* 84455C 8024198C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* 844560 80241990 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* 844564 80241994 0C0B2026 */  jal       set_variable
-/* 844568 80241998 8C450000 */   lw       $a1, ($v0)
-/* 84456C 8024199C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 844570 802419A0 24020002 */  addiu     $v0, $zero, 2
-/* 844574 802419A4 03E00008 */  jr        $ra
-/* 844578 802419A8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s
deleted file mode 100644
index 3f0151df79..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241680_8537F0
-/* 8537F0 80241680 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8537F4 80241684 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8537F8 80241688 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8537FC 8024168C 0C00EABB */  jal       get_npc_unsafe
-/* 853800 80241690 8C84014C */   lw       $a0, 0x14c($a0)
-/* 853804 80241694 24040008 */  addiu     $a0, $zero, 8
-/* 853808 80241698 0040802D */  daddu     $s0, $v0, $zero
-/* 85380C 8024169C 3C028024 */  lui       $v0, %hi(func_802416EC_85385C)
-/* 853810 802416A0 244216EC */  addiu     $v0, $v0, %lo(func_802416EC_85385C)
-/* 853814 802416A4 0C00AB39 */  jal       heap_malloc
-/* 853818 802416A8 AE020008 */   sw       $v0, 8($s0)
-/* 85381C 802416AC 0040182D */  daddu     $v1, $v0, $zero
-/* 853820 802416B0 AE030020 */  sw        $v1, 0x20($s0)
-/* 853824 802416B4 AC600000 */  sw        $zero, ($v1)
-/* 853828 802416B8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 85382C 802416BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 853830 802416C0 24020001 */  addiu     $v0, $zero, 1
-/* 853834 802416C4 03E00008 */  jr        $ra
-/* 853838 802416C8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s
deleted file mode 100644
index dab178f0cd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802416EC_85385C
-/* 85385C 802416EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 853860 802416F0 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 853864 802416F4 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 853868 802416F8 3C05800B */  lui       $a1, %hi(gCameras)
-/* 85386C 802416FC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 853870 80241700 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 853874 80241704 00031080 */  sll       $v0, $v1, 2
-/* 853878 80241708 00431021 */  addu      $v0, $v0, $v1
-/* 85387C 8024170C 00021080 */  sll       $v0, $v0, 2
-/* 853880 80241710 00431023 */  subu      $v0, $v0, $v1
-/* 853884 80241714 000218C0 */  sll       $v1, $v0, 3
-/* 853888 80241718 00431021 */  addu      $v0, $v0, $v1
-/* 85388C 8024171C 8C830020 */  lw        $v1, 0x20($a0)
-/* 853890 80241720 000210C0 */  sll       $v0, $v0, 3
-/* 853894 80241724 8C630000 */  lw        $v1, ($v1)
-/* 853898 80241728 30630001 */  andi      $v1, $v1, 1
-/* 85389C 8024172C 10600004 */  beqz      $v1, .L80241740
-/* 8538A0 80241730 00451021 */   addu     $v0, $v0, $a1
-/* 8538A4 80241734 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 8538A8 80241738 0C00A6C9 */  jal       clamp_angle
-/* 8538AC 8024173C 46006307 */   neg.s    $f12, $f12
-.L80241740:
-/* 8538B0 80241740 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8538B4 80241744 03E00008 */  jr        $ra
-/* 8538B8 80241748 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s
deleted file mode 100644
index 6ee87cd003..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241898_853A08
-/* 853A08 80241898 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 853A0C 8024189C AFB00010 */  sw        $s0, 0x10($sp)
-/* 853A10 802418A0 0080802D */  daddu     $s0, $a0, $zero
-/* 853A14 802418A4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 853A18 802418A8 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 853A1C 802418AC AFB20018 */  sw        $s2, 0x18($sp)
-/* 853A20 802418B0 10A00009 */  beqz      $a1, .L802418D8
-/* 853A24 802418B4 AFB10014 */   sw       $s1, 0x14($sp)
-/* 853A28 802418B8 0000202D */  daddu     $a0, $zero, $zero
-/* 853A2C 802418BC 0080282D */  daddu     $a1, $a0, $zero
-/* 853A30 802418C0 0080302D */  daddu     $a2, $a0, $zero
-/* 853A34 802418C4 0C046F97 */  jal       set_background_color_blend
-/* 853A38 802418C8 240700FF */   addiu    $a3, $zero, 0xff
-/* 853A3C 802418CC 240200FF */  addiu     $v0, $zero, 0xff
-/* 853A40 802418D0 AE020070 */  sw        $v0, 0x70($s0)
-/* 853A44 802418D4 AE000074 */  sw        $zero, 0x74($s0)
-.L802418D8:
-/* 853A48 802418D8 8E020070 */  lw        $v0, 0x70($s0)
-/* 853A4C 802418DC 2442FFF8 */  addiu     $v0, $v0, -8
-/* 853A50 802418E0 04410002 */  bgez      $v0, .L802418EC
-/* 853A54 802418E4 AE020070 */   sw       $v0, 0x70($s0)
-/* 853A58 802418E8 AE000070 */  sw        $zero, 0x70($s0)
-.L802418EC:
-/* 853A5C 802418EC 0000202D */  daddu     $a0, $zero, $zero
-/* 853A60 802418F0 0080282D */  daddu     $a1, $a0, $zero
-/* 853A64 802418F4 92070073 */  lbu       $a3, 0x73($s0)
-/* 853A68 802418F8 0C046F97 */  jal       set_background_color_blend
-/* 853A6C 802418FC 0080302D */   daddu    $a2, $a0, $zero
-/* 853A70 80241900 8E020070 */  lw        $v0, 0x70($s0)
-/* 853A74 80241904 14400006 */  bnez      $v0, .L80241920
-/* 853A78 80241908 00000000 */   nop
-/* 853A7C 8024190C 8E020074 */  lw        $v0, 0x74($s0)
-/* 853A80 80241910 14400003 */  bnez      $v0, .L80241920
-/* 853A84 80241914 24020001 */   addiu    $v0, $zero, 1
-/* 853A88 80241918 0809067B */  j         .L802419EC
-/* 853A8C 8024191C AE020074 */   sw       $v0, 0x74($s0)
-.L80241920:
-/* 853A90 80241920 8E030074 */  lw        $v1, 0x74($s0)
-/* 853A94 80241924 24020001 */  addiu     $v0, $zero, 1
-/* 853A98 80241928 14620031 */  bne       $v1, $v0, .L802419F0
-/* 853A9C 8024192C 0000102D */   daddu    $v0, $zero, $zero
-/* 853AA0 80241930 0C04760B */  jal       func_8011D82C
-/* 853AA4 80241934 0000202D */   daddu    $a0, $zero, $zero
-/* 853AA8 80241938 0000802D */  daddu     $s0, $zero, $zero
-/* 853AAC 8024193C 2413FFFC */  addiu     $s3, $zero, -4
-/* 853AB0 80241940 24120006 */  addiu     $s2, $zero, 6
-/* 853AB4 80241944 3C11FF7F */  lui       $s1, 0xff7f
-/* 853AB8 80241948 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 853ABC 8024194C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 853AC0 80241950 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 853AC4 80241954 A0400000 */  sb        $zero, ($v0)
-.L80241958:
-/* 853AC8 80241958 0C00E2B7 */  jal       get_npc_by_index
-/* 853ACC 8024195C 0200202D */   daddu    $a0, $s0, $zero
-/* 853AD0 80241960 0040202D */  daddu     $a0, $v0, $zero
-/* 853AD4 80241964 5080000B */  beql      $a0, $zero, .L80241994
-/* 853AD8 80241968 26100001 */   addiu    $s0, $s0, 1
-/* 853ADC 8024196C 8C820000 */  lw        $v0, ($a0)
-/* 853AE0 80241970 50400008 */  beql      $v0, $zero, .L80241994
-/* 853AE4 80241974 26100001 */   addiu    $s0, $s0, 1
-/* 853AE8 80241978 808300A4 */  lb        $v1, 0xa4($a0)
-/* 853AEC 8024197C 10730005 */  beq       $v1, $s3, .L80241994
-/* 853AF0 80241980 26100001 */   addiu    $s0, $s0, 1
-/* 853AF4 80241984 10720003 */  beq       $v1, $s2, .L80241994
-/* 853AF8 80241988 00000000 */   nop
-/* 853AFC 8024198C 00511024 */  and       $v0, $v0, $s1
-/* 853B00 80241990 AC820000 */  sw        $v0, ($a0)
-.L80241994:
-/* 853B04 80241994 2A020040 */  slti      $v0, $s0, 0x40
-/* 853B08 80241998 1440FFEF */  bnez      $v0, .L80241958
-/* 853B0C 8024199C 00000000 */   nop
-/* 853B10 802419A0 0000802D */  daddu     $s0, $zero, $zero
-/* 853B14 802419A4 3C11F7FF */  lui       $s1, 0xf7ff
-/* 853B18 802419A8 3631FFFF */  ori       $s1, $s1, 0xffff
-.L802419AC:
-/* 853B1C 802419AC 0C04C3D6 */  jal       get_item_entity
-/* 853B20 802419B0 0200202D */   daddu    $a0, $s0, $zero
-/* 853B24 802419B4 0040182D */  daddu     $v1, $v0, $zero
-/* 853B28 802419B8 10600007 */  beqz      $v1, .L802419D8
-/* 853B2C 802419BC 26100001 */   addiu    $s0, $s0, 1
-/* 853B30 802419C0 8C640000 */  lw        $a0, ($v1)
-/* 853B34 802419C4 30820010 */  andi      $v0, $a0, 0x10
-/* 853B38 802419C8 10400003 */  beqz      $v0, .L802419D8
-/* 853B3C 802419CC 00000000 */   nop
-/* 853B40 802419D0 00911024 */  and       $v0, $a0, $s1
-/* 853B44 802419D4 AC620000 */  sw        $v0, ($v1)
-.L802419D8:
-/* 853B48 802419D8 2A020100 */  slti      $v0, $s0, 0x100
-/* 853B4C 802419DC 1440FFF3 */  bnez      $v0, .L802419AC
-/* 853B50 802419E0 24020002 */   addiu    $v0, $zero, 2
-/* 853B54 802419E4 0809067C */  j         .L802419F0
-/* 853B58 802419E8 00000000 */   nop
-.L802419EC:
-/* 853B5C 802419EC 0000102D */  daddu     $v0, $zero, $zero
-.L802419F0:
-/* 853B60 802419F0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 853B64 802419F4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 853B68 802419F8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 853B6C 802419FC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 853B70 80241A00 8FB00010 */  lw        $s0, 0x10($sp)
-/* 853B74 80241A04 03E00008 */  jr        $ra
-/* 853B78 80241A08 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243088_8551F8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243088_8551F8.s
deleted file mode 100644
index 4c4bb559a0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243088_8551F8.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243088_8551F8
-/* 8551F8 80243088 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8551FC 8024308C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 855200 80243090 8C82000C */  lw        $v0, 0xc($a0)
-/* 855204 80243094 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* 855208 80243098 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* 85520C 8024309C 0C0B2026 */  jal       set_variable
-/* 855210 802430A0 8C450000 */   lw       $a1, ($v0)
-/* 855214 802430A4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 855218 802430A8 24020002 */  addiu     $v0, $zero, 2
-/* 85521C 802430AC 03E00008 */  jr        $ra
-/* 855220 802430B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030_7E73D0.s b/ver/us/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030_7E73D0.s
deleted file mode 100644
index e9cdfd959f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030_7E73D0.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240030_7E73D0
-/* 7E73D0 80240030 03E00008 */  jr        $ra
-/* 7E73D4 80240034 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240034_E0E7D4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240034_E0E7D4.s
deleted file mode 100644
index 51f29ac194..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240034_E0E7D4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_E0E7D4
-/* E0E7D4 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* E0E7D8 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* E0E7DC 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E0E7E0 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* E0E7E4 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* E0E7E8 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* E0E7EC 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* E0E7F0 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* E0E7F4 80240054 24020002 */   addiu    $v0, $zero, 2
-/* E0E7F8 80240058 08090038 */  j         .L802400E0
-/* E0E7FC 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* E0E800 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* E0E804 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* E0E808 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* E0E80C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* E0E810 80240070 04420001 */  bltzl     $v0, .L80240078
-/* E0E814 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* E0E818 80240078 14400003 */  bnez      $v0, .L80240088
-/* E0E81C 8024007C 00000000 */   nop
-/* E0E820 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* E0E824 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* E0E828 80240088 44822000 */  mtc1      $v0, $f4
-/* E0E82C 8024008C 00000000 */  nop
-/* E0E830 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* E0E834 80240094 44062000 */  mfc1      $a2, $f4
-/* E0E838 80240098 44872000 */  mtc1      $a3, $f4
-/* E0E83C 8024009C 00000000 */  nop
-/* E0E840 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* E0E844 802400A4 44806000 */  mtc1      $zero, $f12
-/* E0E848 802400A8 44072000 */  mfc1      $a3, $f4
-/* E0E84C 802400AC 0C00A720 */  jal       atan2
-/* E0E850 802400B0 46006386 */   mov.s    $f14, $f12
-/* E0E854 802400B4 3C014270 */  lui       $at, 0x4270
-/* E0E858 802400B8 44811000 */  mtc1      $at, $f2
-/* E0E85C 802400BC 00000000 */  nop
-/* E0E860 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* E0E864 802400C4 00000000 */  nop
-/* E0E868 802400C8 45000004 */  bc1f      .L802400DC
-/* E0E86C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* E0E870 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* E0E874 802400D4 08090038 */  j         .L802400E0
-/* E0E878 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* E0E87C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* E0E880 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* E0E884 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* E0E888 802400E8 03E00008 */  jr        $ra
-/* E0E88C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s
index 048eb74007..1aa1ac4456 100644
--- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s
+++ b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s
@@ -13,8 +13,8 @@ glabel func_8024113C_B98D3C
 /* B98D5C 8024115C 8C620000 */  lw        $v0, ($v1)
 /* B98D60 80241160 5040000A */  beql      $v0, $zero, .L8024118C
 /* B98D64 80241164 00041080 */   sll      $v0, $a0, 2
-/* B98D68 80241168 3C058024 */  lui       $a1, %hi(dro_01_foliage_setup_shear_mtx)
-/* B98D6C 8024116C 24A53880 */  addiu     $a1, $a1, %lo(dro_01_foliage_setup_shear_mtx)
+/* B98D68 80241168 3C058024 */  lui       $a1, %hi(func_80243880_95EA80)
+/* B98D6C 8024116C 24A53880 */  addiu     $a1, $a1, %lo(func_80243880_95EA80)
 .L80241170:
 /* B98D70 80241170 24630004 */  addiu     $v1, $v1, 4
 /* B98D74 80241174 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024113C_B98D3C
 /* B98D84 80241184 24A50004 */   addiu    $a1, $a1, 4
 /* B98D88 80241188 00041080 */  sll       $v0, $a0, 2
 .L8024118C:
-/* B98D8C 8024118C 3C018024 */  lui       $at, %hi(dro_01_foliage_setup_shear_mtx)
+/* B98D8C 8024118C 3C018024 */  lui       $at, %hi(func_80243880_95EA80)
 /* B98D90 80241190 00220821 */  addu      $at, $at, $v0
-/* B98D94 80241194 AC203880 */  sw        $zero, %lo(dro_01_foliage_setup_shear_mtx)($at)
+/* B98D94 80241194 AC203880 */  sw        $zero, %lo(func_80243880_95EA80)($at)
 /* B98D98 80241198 08090472 */  j         .L802411C8
 /* B98D9C 8024119C 00000000 */   nop
 .L802411A0:
-/* B98DA0 802411A0 3C038024 */  lui       $v1, %hi(dro_01_foliage_setup_shear_mtx)
-/* B98DA4 802411A4 24633880 */  addiu     $v1, $v1, %lo(dro_01_foliage_setup_shear_mtx)
+/* B98DA0 802411A0 3C038024 */  lui       $v1, %hi(func_80243880_95EA80)
+/* B98DA4 802411A4 24633880 */  addiu     $v1, $v1, %lo(func_80243880_95EA80)
 /* B98DA8 802411A8 0060282D */  daddu     $a1, $v1, $zero
 .L802411AC:
 /* B98DAC 802411AC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240034_BB70A4.s b/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240034_BB70A4.s
deleted file mode 100644
index 5ce99c2ead..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240034_BB70A4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_BB70A4
-/* BB70A4 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* BB70A8 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* BB70AC 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BB70B0 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* BB70B4 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* BB70B8 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* BB70BC 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* BB70C0 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* BB70C4 80240054 24020002 */   addiu    $v0, $zero, 2
-/* BB70C8 80240058 08090038 */  j         .L802400E0
-/* BB70CC 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* BB70D0 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* BB70D4 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* BB70D8 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* BB70DC 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* BB70E0 80240070 04420001 */  bltzl     $v0, .L80240078
-/* BB70E4 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* BB70E8 80240078 14400003 */  bnez      $v0, .L80240088
-/* BB70EC 8024007C 00000000 */   nop
-/* BB70F0 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* BB70F4 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* BB70F8 80240088 44822000 */  mtc1      $v0, $f4
-/* BB70FC 8024008C 00000000 */  nop
-/* BB7100 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* BB7104 80240094 44062000 */  mfc1      $a2, $f4
-/* BB7108 80240098 44872000 */  mtc1      $a3, $f4
-/* BB710C 8024009C 00000000 */  nop
-/* BB7110 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* BB7114 802400A4 44806000 */  mtc1      $zero, $f12
-/* BB7118 802400A8 44072000 */  mfc1      $a3, $f4
-/* BB711C 802400AC 0C00A720 */  jal       atan2
-/* BB7120 802400B0 46006386 */   mov.s    $f14, $f12
-/* BB7124 802400B4 3C014270 */  lui       $at, 0x4270
-/* BB7128 802400B8 44811000 */  mtc1      $at, $f2
-/* BB712C 802400BC 00000000 */  nop
-/* BB7130 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* BB7134 802400C4 00000000 */  nop
-/* BB7138 802400C8 45000004 */  bc1f      .L802400DC
-/* BB713C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* BB7140 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* BB7144 802400D4 08090038 */  j         .L802400E0
-/* BB7148 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* BB714C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* BB7150 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* BB7154 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* BB7158 802400E8 03E00008 */  jr        $ra
-/* BB715C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s
deleted file mode 100644
index 8461b90780..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240AB4_9C5E94
-/* 9C5E94 80240AB4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9C5E98 80240AB8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C5E9C 80240ABC 0080882D */  daddu     $s1, $a0, $zero
-/* 9C5EA0 80240AC0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9C5EA4 80240AC4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C5EA8 80240AC8 8E30000C */  lw        $s0, 0xc($s1)
-/* 9C5EAC 80240ACC 8E050000 */  lw        $a1, ($s0)
-/* 9C5EB0 80240AD0 0C0B1EAF */  jal       get_variable
-/* 9C5EB4 80240AD4 26100004 */   addiu    $s0, $s0, 4
-/* 9C5EB8 80240AD8 0220202D */  daddu     $a0, $s1, $zero
-/* 9C5EBC 80240ADC 8E050000 */  lw        $a1, ($s0)
-/* 9C5EC0 80240AE0 0C0B1EAF */  jal       get_variable
-/* 9C5EC4 80240AE4 0040882D */   daddu    $s1, $v0, $zero
-/* 9C5EC8 80240AE8 0000202D */  daddu     $a0, $zero, $zero
-/* 9C5ECC 80240AEC 0080282D */  daddu     $a1, $a0, $zero
-/* 9C5ED0 80240AF0 0040802D */  daddu     $s0, $v0, $zero
-/* 9C5ED4 80240AF4 240600BE */  addiu     $a2, $zero, 0xbe
-/* 9C5ED8 80240AF8 0C04DF93 */  jal       set_transition_stencil_center
-/* 9C5EDC 80240AFC 24070091 */   addiu    $a3, $zero, 0x91
-/* 9C5EE0 80240B00 44900000 */  mtc1      $s0, $f0
-/* 9C5EE4 80240B04 00000000 */  nop
-/* 9C5EE8 80240B08 46800020 */  cvt.s.w   $f0, $f0
-/* 9C5EEC 80240B0C 44050000 */  mfc1      $a1, $f0
-/* 9C5EF0 80240B10 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* 9C5EF4 80240B14 322400FF */   andi     $a0, $s1, 0xff
-/* 9C5EF8 80240B18 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9C5EFC 80240B1C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C5F00 80240B20 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C5F04 80240B24 24020002 */  addiu     $v0, $zero, 2
-/* 9C5F08 80240B28 03E00008 */  jr        $ra
-/* 9C5F0C 80240B2C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s
deleted file mode 100644
index e6abf400af..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B30_9C5F10
-/* 9C5F10 80240B30 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9C5F14 80240B34 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C5F18 80240B38 0080882D */  daddu     $s1, $a0, $zero
-/* 9C5F1C 80240B3C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 9C5F20 80240B40 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C5F24 80240B44 8E30000C */  lw        $s0, 0xc($s1)
-/* 9C5F28 80240B48 8E050000 */  lw        $a1, ($s0)
-/* 9C5F2C 80240B4C 0C0B1EAF */  jal       get_variable
-/* 9C5F30 80240B50 26100004 */   addiu    $s0, $s0, 4
-/* 9C5F34 80240B54 0220202D */  daddu     $a0, $s1, $zero
-/* 9C5F38 80240B58 8E050000 */  lw        $a1, ($s0)
-/* 9C5F3C 80240B5C 0C0B1EAF */  jal       get_variable
-/* 9C5F40 80240B60 0040802D */   daddu    $s0, $v0, $zero
-/* 9C5F44 80240B64 44820000 */  mtc1      $v0, $f0
-/* 9C5F48 80240B68 00000000 */  nop
-/* 9C5F4C 80240B6C 46800020 */  cvt.s.w   $f0, $f0
-/* 9C5F50 80240B70 24020002 */  addiu     $v0, $zero, 2
-/* 9C5F54 80240B74 00501804 */  sllv      $v1, $s0, $v0
-/* 9C5F58 80240B78 00701821 */  addu      $v1, $v1, $s0
-/* 9C5F5C 80240B7C 00431804 */  sllv      $v1, $v1, $v0
-/* 9C5F60 80240B80 00701823 */  subu      $v1, $v1, $s0
-/* 9C5F64 80240B84 000320C0 */  sll       $a0, $v1, 3
-/* 9C5F68 80240B88 00641821 */  addu      $v1, $v1, $a0
-/* 9C5F6C 80240B8C 000318C0 */  sll       $v1, $v1, 3
-/* 9C5F70 80240B90 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* 9C5F74 80240B94 00230821 */  addu      $at, $at, $v1
-/* 9C5F78 80240B98 E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* 9C5F7C 80240B9C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 9C5F80 80240BA0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C5F84 80240BA4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C5F88 80240BA8 03E00008 */  jr        $ra
-/* 9C5F8C 80240BAC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s
deleted file mode 100644
index a2fd83eeda..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C2C_9C600C
-/* 9C600C 80240C2C 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* 9C6010 80240C30 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* 9C6014 80240C34 AC800088 */  sw        $zero, 0x88($a0)
-/* 9C6018 80240C38 80A30003 */  lb        $v1, 3($a1)
-/* 9C601C 80240C3C 80A20002 */  lb        $v0, 2($a1)
-/* 9C6020 80240C40 1462000B */  bne       $v1, $v0, .L80240C70
-/* 9C6024 80240C44 00A0302D */   daddu    $a2, $a1, $zero
-/* 9C6028 80240C48 80A30006 */  lb        $v1, 6($a1)
-/* 9C602C 80240C4C 80A20005 */  lb        $v0, 5($a1)
-/* 9C6030 80240C50 14620007 */  bne       $v1, $v0, .L80240C70
-/* 9C6034 80240C54 00000000 */   nop
-/* 9C6038 80240C58 80C2028E */  lb        $v0, 0x28e($a2)
-/* 9C603C 80240C5C 84C30290 */  lh        $v1, 0x290($a2)
-/* 9C6040 80240C60 00021200 */  sll       $v0, $v0, 8
-/* 9C6044 80240C64 14620004 */  bne       $v1, $v0, .L80240C78
-/* 9C6048 80240C68 24020001 */   addiu    $v0, $zero, 1
-/* 9C604C 80240C6C AC820088 */  sw        $v0, 0x88($a0)
-.L80240C70:
-/* 9C6050 80240C70 03E00008 */  jr        $ra
-/* 9C6054 80240C74 24020002 */   addiu    $v0, $zero, 2
-.L80240C78:
-/* 9C6058 80240C78 03E00008 */  jr        $ra
-/* 9C605C 80240C7C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C80_9C6060.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C80_9C6060.s
deleted file mode 100644
index 183fe9683b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C80_9C6060.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C80_9C6060
-/* 9C6060 80240C80 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 9C6064 80240C84 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9C6068 80240C88 0080882D */  daddu     $s1, $a0, $zero
-/* 9C606C 80240C8C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 9C6070 80240C90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9C6074 80240C94 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C6078 80240C98 8E30000C */  lw        $s0, 0xc($s1)
-/* 9C607C 80240C9C 8E050000 */  lw        $a1, ($s0)
-/* 9C6080 80240CA0 0C0B1EAF */  jal       get_variable
-/* 9C6084 80240CA4 26100004 */   addiu    $s0, $s0, 4
-/* 9C6088 80240CA8 8E050000 */  lw        $a1, ($s0)
-/* 9C608C 80240CAC 26100004 */  addiu     $s0, $s0, 4
-/* 9C6090 80240CB0 0220202D */  daddu     $a0, $s1, $zero
-/* 9C6094 80240CB4 0C0B1EAF */  jal       get_variable
-/* 9C6098 80240CB8 0040902D */   daddu    $s2, $v0, $zero
-/* 9C609C 80240CBC 0220202D */  daddu     $a0, $s1, $zero
-/* 9C60A0 80240CC0 8E050000 */  lw        $a1, ($s0)
-/* 9C60A4 80240CC4 0C0B1EAF */  jal       get_variable
-/* 9C60A8 80240CC8 0040802D */   daddu    $s0, $v0, $zero
-/* 9C60AC 80240CCC 0000202D */  daddu     $a0, $zero, $zero
-/* 9C60B0 80240CD0 324500FF */  andi      $a1, $s2, 0xff
-/* 9C60B4 80240CD4 320600FF */  andi      $a2, $s0, 0xff
-/* 9C60B8 80240CD8 0C04DF84 */  jal       set_transition_stencil_color
-/* 9C60BC 80240CDC 304700FF */   andi     $a3, $v0, 0xff
-/* 9C60C0 80240CE0 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 9C60C4 80240CE4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9C60C8 80240CE8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C60CC 80240CEC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C60D0 80240CF0 24020002 */  addiu     $v0, $zero, 2
-/* 9C60D4 80240CF4 03E00008 */  jr        $ra
-/* 9C60D8 80240CF8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60_9C6140.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60_9C6140.s
deleted file mode 100644
index 08b5f3f65a..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60_9C6140.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D60_9C6140
-/* 9C6140 80240D60 03E00008 */  jr        $ra
-/* 9C6144 80240D64 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s
deleted file mode 100644
index 93eaed7a50..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802410C8_9C64A8
-/* 9C64A8 802410C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C64AC 802410CC AFBF0014 */  sw        $ra, 0x14($sp)
-/* 9C64B0 802410D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C64B4 802410D4 0C00EABB */  jal       get_npc_unsafe
-/* 9C64B8 802410D8 8C84014C */   lw       $a0, 0x14c($a0)
-/* 9C64BC 802410DC 24040008 */  addiu     $a0, $zero, 8
-/* 9C64C0 802410E0 0040802D */  daddu     $s0, $v0, $zero
-/* 9C64C4 802410E4 3C028024 */  lui       $v0, %hi(func_80241134_9C6514)
-/* 9C64C8 802410E8 24421134 */  addiu     $v0, $v0, %lo(func_80241134_9C6514)
-/* 9C64CC 802410EC 0C00AB39 */  jal       heap_malloc
-/* 9C64D0 802410F0 AE020008 */   sw       $v0, 8($s0)
-/* 9C64D4 802410F4 0040182D */  daddu     $v1, $v0, $zero
-/* 9C64D8 802410F8 AE030020 */  sw        $v1, 0x20($s0)
-/* 9C64DC 802410FC AC600000 */  sw        $zero, ($v1)
-/* 9C64E0 80241100 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 9C64E4 80241104 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C64E8 80241108 24020001 */  addiu     $v0, $zero, 1
-/* 9C64EC 8024110C 03E00008 */  jr        $ra
-/* 9C64F0 80241110 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s
deleted file mode 100644
index 72c1233088..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241134_9C6514
-/* 9C6514 80241134 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C6518 80241138 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 9C651C 8024113C 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 9C6520 80241140 3C05800B */  lui       $a1, %hi(gCameras)
-/* 9C6524 80241144 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 9C6528 80241148 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C652C 8024114C 00031080 */  sll       $v0, $v1, 2
-/* 9C6530 80241150 00431021 */  addu      $v0, $v0, $v1
-/* 9C6534 80241154 00021080 */  sll       $v0, $v0, 2
-/* 9C6538 80241158 00431023 */  subu      $v0, $v0, $v1
-/* 9C653C 8024115C 000218C0 */  sll       $v1, $v0, 3
-/* 9C6540 80241160 00431021 */  addu      $v0, $v0, $v1
-/* 9C6544 80241164 8C830020 */  lw        $v1, 0x20($a0)
-/* 9C6548 80241168 000210C0 */  sll       $v0, $v0, 3
-/* 9C654C 8024116C 8C630000 */  lw        $v1, ($v1)
-/* 9C6550 80241170 30630001 */  andi      $v1, $v1, 1
-/* 9C6554 80241174 10600004 */  beqz      $v1, .L80241188
-/* 9C6558 80241178 00451021 */   addu     $v0, $v0, $a1
-/* 9C655C 8024117C C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 9C6560 80241180 0C00A6C9 */  jal       clamp_angle
-/* 9C6564 80241184 46006307 */   neg.s    $f12, $f12
-.L80241188:
-/* 9C6568 80241188 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C656C 8024118C 03E00008 */  jr        $ra
-/* 9C6570 80241190 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s
deleted file mode 100644
index 85e1ddbe1e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412E0_9C66C0
-/* 9C66C0 802412E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9C66C4 802412E4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C66C8 802412E8 0080802D */  daddu     $s0, $a0, $zero
-/* 9C66CC 802412EC AFBF0020 */  sw        $ra, 0x20($sp)
-/* 9C66D0 802412F0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9C66D4 802412F4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9C66D8 802412F8 10A00009 */  beqz      $a1, .L80241320
-/* 9C66DC 802412FC AFB10014 */   sw       $s1, 0x14($sp)
-/* 9C66E0 80241300 0000202D */  daddu     $a0, $zero, $zero
-/* 9C66E4 80241304 0080282D */  daddu     $a1, $a0, $zero
-/* 9C66E8 80241308 0080302D */  daddu     $a2, $a0, $zero
-/* 9C66EC 8024130C 0C046F97 */  jal       set_background_color_blend
-/* 9C66F0 80241310 240700FF */   addiu    $a3, $zero, 0xff
-/* 9C66F4 80241314 240200FF */  addiu     $v0, $zero, 0xff
-/* 9C66F8 80241318 AE020070 */  sw        $v0, 0x70($s0)
-/* 9C66FC 8024131C AE000074 */  sw        $zero, 0x74($s0)
-.L80241320:
-/* 9C6700 80241320 8E020070 */  lw        $v0, 0x70($s0)
-/* 9C6704 80241324 2442FFF8 */  addiu     $v0, $v0, -8
-/* 9C6708 80241328 04410002 */  bgez      $v0, .L80241334
-/* 9C670C 8024132C AE020070 */   sw       $v0, 0x70($s0)
-/* 9C6710 80241330 AE000070 */  sw        $zero, 0x70($s0)
-.L80241334:
-/* 9C6714 80241334 0000202D */  daddu     $a0, $zero, $zero
-/* 9C6718 80241338 0080282D */  daddu     $a1, $a0, $zero
-/* 9C671C 8024133C 92070073 */  lbu       $a3, 0x73($s0)
-/* 9C6720 80241340 0C046F97 */  jal       set_background_color_blend
-/* 9C6724 80241344 0080302D */   daddu    $a2, $a0, $zero
-/* 9C6728 80241348 8E020070 */  lw        $v0, 0x70($s0)
-/* 9C672C 8024134C 14400006 */  bnez      $v0, .L80241368
-/* 9C6730 80241350 00000000 */   nop
-/* 9C6734 80241354 8E020074 */  lw        $v0, 0x74($s0)
-/* 9C6738 80241358 14400003 */  bnez      $v0, .L80241368
-/* 9C673C 8024135C 24020001 */   addiu    $v0, $zero, 1
-/* 9C6740 80241360 0809050D */  j         .L80241434
-/* 9C6744 80241364 AE020074 */   sw       $v0, 0x74($s0)
-.L80241368:
-/* 9C6748 80241368 8E030074 */  lw        $v1, 0x74($s0)
-/* 9C674C 8024136C 24020001 */  addiu     $v0, $zero, 1
-/* 9C6750 80241370 14620031 */  bne       $v1, $v0, .L80241438
-/* 9C6754 80241374 0000102D */   daddu    $v0, $zero, $zero
-/* 9C6758 80241378 0C04760B */  jal       func_8011D82C
-/* 9C675C 8024137C 0000202D */   daddu    $a0, $zero, $zero
-/* 9C6760 80241380 0000802D */  daddu     $s0, $zero, $zero
-/* 9C6764 80241384 2413FFFC */  addiu     $s3, $zero, -4
-/* 9C6768 80241388 2412000F */  addiu     $s2, $zero, 0xf
-/* 9C676C 8024138C 3C11FF7F */  lui       $s1, 0xff7f
-/* 9C6770 80241390 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 9C6774 80241394 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 9C6778 80241398 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 9C677C 8024139C A0400000 */  sb        $zero, ($v0)
-.L802413A0:
-/* 9C6780 802413A0 0C00E2B7 */  jal       get_npc_by_index
-/* 9C6784 802413A4 0200202D */   daddu    $a0, $s0, $zero
-/* 9C6788 802413A8 0040202D */  daddu     $a0, $v0, $zero
-/* 9C678C 802413AC 5080000B */  beql      $a0, $zero, .L802413DC
-/* 9C6790 802413B0 26100001 */   addiu    $s0, $s0, 1
-/* 9C6794 802413B4 8C820000 */  lw        $v0, ($a0)
-/* 9C6798 802413B8 50400008 */  beql      $v0, $zero, .L802413DC
-/* 9C679C 802413BC 26100001 */   addiu    $s0, $s0, 1
-/* 9C67A0 802413C0 808300A4 */  lb        $v1, 0xa4($a0)
-/* 9C67A4 802413C4 10730005 */  beq       $v1, $s3, .L802413DC
-/* 9C67A8 802413C8 26100001 */   addiu    $s0, $s0, 1
-/* 9C67AC 802413CC 10720003 */  beq       $v1, $s2, .L802413DC
-/* 9C67B0 802413D0 00000000 */   nop
-/* 9C67B4 802413D4 00511024 */  and       $v0, $v0, $s1
-/* 9C67B8 802413D8 AC820000 */  sw        $v0, ($a0)
-.L802413DC:
-/* 9C67BC 802413DC 2A020040 */  slti      $v0, $s0, 0x40
-/* 9C67C0 802413E0 1440FFEF */  bnez      $v0, .L802413A0
-/* 9C67C4 802413E4 00000000 */   nop
-/* 9C67C8 802413E8 0000802D */  daddu     $s0, $zero, $zero
-/* 9C67CC 802413EC 3C11F7FF */  lui       $s1, 0xf7ff
-/* 9C67D0 802413F0 3631FFFF */  ori       $s1, $s1, 0xffff
-.L802413F4:
-/* 9C67D4 802413F4 0C04C3D6 */  jal       get_item_entity
-/* 9C67D8 802413F8 0200202D */   daddu    $a0, $s0, $zero
-/* 9C67DC 802413FC 0040182D */  daddu     $v1, $v0, $zero
-/* 9C67E0 80241400 10600007 */  beqz      $v1, .L80241420
-/* 9C67E4 80241404 26100001 */   addiu    $s0, $s0, 1
-/* 9C67E8 80241408 8C640000 */  lw        $a0, ($v1)
-/* 9C67EC 8024140C 30820010 */  andi      $v0, $a0, 0x10
-/* 9C67F0 80241410 10400003 */  beqz      $v0, .L80241420
-/* 9C67F4 80241414 00000000 */   nop
-/* 9C67F8 80241418 00911024 */  and       $v0, $a0, $s1
-/* 9C67FC 8024141C AC620000 */  sw        $v0, ($v1)
-.L80241420:
-/* 9C6800 80241420 2A020100 */  slti      $v0, $s0, 0x100
-/* 9C6804 80241424 1440FFF3 */  bnez      $v0, .L802413F4
-/* 9C6808 80241428 24020002 */   addiu    $v0, $zero, 2
-/* 9C680C 8024142C 0809050E */  j         .L80241438
-/* 9C6810 80241430 00000000 */   nop
-.L80241434:
-/* 9C6814 80241434 0000102D */  daddu     $v0, $zero, $zero
-.L80241438:
-/* 9C6818 80241438 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 9C681C 8024143C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9C6820 80241440 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9C6824 80241444 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9C6828 80241448 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9C682C 8024144C 03E00008 */  jr        $ra
-/* 9C6830 80241450 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240034_9D7054.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240034_9D7054.s
deleted file mode 100644
index 396f81d347..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240034_9D7054.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_9D7054
-/* 9D7054 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 9D7058 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 9D705C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D7060 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D7064 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 9D7068 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 9D706C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 9D7070 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 9D7074 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 9D7078 80240058 08090038 */  j         .L802400E0
-/* 9D707C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 9D7080 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 9D7084 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 9D7088 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 9D708C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 9D7090 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 9D7094 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 9D7098 80240078 14400003 */  bnez      $v0, .L80240088
-/* 9D709C 8024007C 00000000 */   nop
-/* 9D70A0 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 9D70A4 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 9D70A8 80240088 44822000 */  mtc1      $v0, $f4
-/* 9D70AC 8024008C 00000000 */  nop
-/* 9D70B0 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 9D70B4 80240094 44062000 */  mfc1      $a2, $f4
-/* 9D70B8 80240098 44872000 */  mtc1      $a3, $f4
-/* 9D70BC 8024009C 00000000 */  nop
-/* 9D70C0 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 9D70C4 802400A4 44806000 */  mtc1      $zero, $f12
-/* 9D70C8 802400A8 44072000 */  mfc1      $a3, $f4
-/* 9D70CC 802400AC 0C00A720 */  jal       atan2
-/* 9D70D0 802400B0 46006386 */   mov.s    $f14, $f12
-/* 9D70D4 802400B4 3C014270 */  lui       $at, 0x4270
-/* 9D70D8 802400B8 44811000 */  mtc1      $at, $f2
-/* 9D70DC 802400BC 00000000 */  nop
-/* 9D70E0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 9D70E4 802400C4 00000000 */  nop
-/* 9D70E8 802400C8 45000004 */  bc1f      .L802400DC
-/* 9D70EC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 9D70F0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 9D70F4 802400D4 08090038 */  j         .L802400E0
-/* 9D70F8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 9D70FC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 9D7100 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 9D7104 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D7108 802400E8 03E00008 */  jr        $ra
-/* 9D710C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s
deleted file mode 100644
index 9dc93ddf79..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241C70_9D8C90
-/* 9D8C90 80241C70 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D8C94 80241C74 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 9D8C98 80241C78 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D8C9C 80241C7C 0C00EABB */  jal       get_npc_unsafe
-/* 9D8CA0 80241C80 8C84014C */   lw       $a0, 0x14c($a0)
-/* 9D8CA4 80241C84 24040008 */  addiu     $a0, $zero, 8
-/* 9D8CA8 80241C88 0040802D */  daddu     $s0, $v0, $zero
-/* 9D8CAC 80241C8C 3C028024 */  lui       $v0, %hi(func_80241CDC_9D8CFC)
-/* 9D8CB0 80241C90 24421CDC */  addiu     $v0, $v0, %lo(func_80241CDC_9D8CFC)
-/* 9D8CB4 80241C94 0C00AB39 */  jal       heap_malloc
-/* 9D8CB8 80241C98 AE020008 */   sw       $v0, 8($s0)
-/* 9D8CBC 80241C9C 0040182D */  daddu     $v1, $v0, $zero
-/* 9D8CC0 80241CA0 AE030020 */  sw        $v1, 0x20($s0)
-/* 9D8CC4 80241CA4 AC600000 */  sw        $zero, ($v1)
-/* 9D8CC8 80241CA8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 9D8CCC 80241CAC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D8CD0 80241CB0 24020001 */  addiu     $v0, $zero, 1
-/* 9D8CD4 80241CB4 03E00008 */  jr        $ra
-/* 9D8CD8 80241CB8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s
deleted file mode 100644
index 4625c2ef3b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241CDC_9D8CFC
-/* 9D8CFC 80241CDC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D8D00 80241CE0 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* 9D8D04 80241CE4 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* 9D8D08 80241CE8 3C05800B */  lui       $a1, %hi(gCameras)
-/* 9D8D0C 80241CEC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* 9D8D10 80241CF0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9D8D14 80241CF4 00031080 */  sll       $v0, $v1, 2
-/* 9D8D18 80241CF8 00431021 */  addu      $v0, $v0, $v1
-/* 9D8D1C 80241CFC 00021080 */  sll       $v0, $v0, 2
-/* 9D8D20 80241D00 00431023 */  subu      $v0, $v0, $v1
-/* 9D8D24 80241D04 000218C0 */  sll       $v1, $v0, 3
-/* 9D8D28 80241D08 00431021 */  addu      $v0, $v0, $v1
-/* 9D8D2C 80241D0C 8C830020 */  lw        $v1, 0x20($a0)
-/* 9D8D30 80241D10 000210C0 */  sll       $v0, $v0, 3
-/* 9D8D34 80241D14 8C630000 */  lw        $v1, ($v1)
-/* 9D8D38 80241D18 30630001 */  andi      $v1, $v1, 1
-/* 9D8D3C 80241D1C 10600004 */  beqz      $v1, .L80241D30
-/* 9D8D40 80241D20 00451021 */   addu     $v0, $v0, $a1
-/* 9D8D44 80241D24 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* 9D8D48 80241D28 0C00A6C9 */  jal       clamp_angle
-/* 9D8D4C 80241D2C 46006307 */   neg.s    $f12, $f12
-.L80241D30:
-/* 9D8D50 80241D30 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9D8D54 80241D34 03E00008 */  jr        $ra
-/* 9D8D58 80241D38 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s
deleted file mode 100644
index 36469c3b29..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241E88_9D8EA8
-/* 9D8EA8 80241E88 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9D8EAC 80241E8C AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D8EB0 80241E90 0080802D */  daddu     $s0, $a0, $zero
-/* 9D8EB4 80241E94 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 9D8EB8 80241E98 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9D8EBC 80241E9C AFB20018 */  sw        $s2, 0x18($sp)
-/* 9D8EC0 80241EA0 10A00009 */  beqz      $a1, .L80241EC8
-/* 9D8EC4 80241EA4 AFB10014 */   sw       $s1, 0x14($sp)
-/* 9D8EC8 80241EA8 0000202D */  daddu     $a0, $zero, $zero
-/* 9D8ECC 80241EAC 0080282D */  daddu     $a1, $a0, $zero
-/* 9D8ED0 80241EB0 0080302D */  daddu     $a2, $a0, $zero
-/* 9D8ED4 80241EB4 0C046F97 */  jal       set_background_color_blend
-/* 9D8ED8 80241EB8 240700FF */   addiu    $a3, $zero, 0xff
-/* 9D8EDC 80241EBC 240200FF */  addiu     $v0, $zero, 0xff
-/* 9D8EE0 80241EC0 AE020070 */  sw        $v0, 0x70($s0)
-/* 9D8EE4 80241EC4 AE000074 */  sw        $zero, 0x74($s0)
-.L80241EC8:
-/* 9D8EE8 80241EC8 8E020070 */  lw        $v0, 0x70($s0)
-/* 9D8EEC 80241ECC 2442FFF8 */  addiu     $v0, $v0, -8
-/* 9D8EF0 80241ED0 04410002 */  bgez      $v0, .L80241EDC
-/* 9D8EF4 80241ED4 AE020070 */   sw       $v0, 0x70($s0)
-/* 9D8EF8 80241ED8 AE000070 */  sw        $zero, 0x70($s0)
-.L80241EDC:
-/* 9D8EFC 80241EDC 0000202D */  daddu     $a0, $zero, $zero
-/* 9D8F00 80241EE0 0080282D */  daddu     $a1, $a0, $zero
-/* 9D8F04 80241EE4 92070073 */  lbu       $a3, 0x73($s0)
-/* 9D8F08 80241EE8 0C046F97 */  jal       set_background_color_blend
-/* 9D8F0C 80241EEC 0080302D */   daddu    $a2, $a0, $zero
-/* 9D8F10 80241EF0 8E020070 */  lw        $v0, 0x70($s0)
-/* 9D8F14 80241EF4 14400006 */  bnez      $v0, .L80241F10
-/* 9D8F18 80241EF8 00000000 */   nop
-/* 9D8F1C 80241EFC 8E020074 */  lw        $v0, 0x74($s0)
-/* 9D8F20 80241F00 14400003 */  bnez      $v0, .L80241F10
-/* 9D8F24 80241F04 24020001 */   addiu    $v0, $zero, 1
-/* 9D8F28 80241F08 080907F7 */  j         .L80241FDC
-/* 9D8F2C 80241F0C AE020074 */   sw       $v0, 0x74($s0)
-.L80241F10:
-/* 9D8F30 80241F10 8E030074 */  lw        $v1, 0x74($s0)
-/* 9D8F34 80241F14 24020001 */  addiu     $v0, $zero, 1
-/* 9D8F38 80241F18 14620031 */  bne       $v1, $v0, .L80241FE0
-/* 9D8F3C 80241F1C 0000102D */   daddu    $v0, $zero, $zero
-/* 9D8F40 80241F20 0C04760B */  jal       func_8011D82C
-/* 9D8F44 80241F24 0000202D */   daddu    $a0, $zero, $zero
-/* 9D8F48 80241F28 0000802D */  daddu     $s0, $zero, $zero
-/* 9D8F4C 80241F2C 2413FFFC */  addiu     $s3, $zero, -4
-/* 9D8F50 80241F30 24120013 */  addiu     $s2, $zero, 0x13
-/* 9D8F54 80241F34 3C11FF7F */  lui       $s1, 0xff7f
-/* 9D8F58 80241F38 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 9D8F5C 80241F3C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 9D8F60 80241F40 3631FFFF */  ori       $s1, $s1, 0xffff
-/* 9D8F64 80241F44 A0400000 */  sb        $zero, ($v0)
-.L80241F48:
-/* 9D8F68 80241F48 0C00E2B7 */  jal       get_npc_by_index
-/* 9D8F6C 80241F4C 0200202D */   daddu    $a0, $s0, $zero
-/* 9D8F70 80241F50 0040202D */  daddu     $a0, $v0, $zero
-/* 9D8F74 80241F54 5080000B */  beql      $a0, $zero, .L80241F84
-/* 9D8F78 80241F58 26100001 */   addiu    $s0, $s0, 1
-/* 9D8F7C 80241F5C 8C820000 */  lw        $v0, ($a0)
-/* 9D8F80 80241F60 50400008 */  beql      $v0, $zero, .L80241F84
-/* 9D8F84 80241F64 26100001 */   addiu    $s0, $s0, 1
-/* 9D8F88 80241F68 808300A4 */  lb        $v1, 0xa4($a0)
-/* 9D8F8C 80241F6C 10730005 */  beq       $v1, $s3, .L80241F84
-/* 9D8F90 80241F70 26100001 */   addiu    $s0, $s0, 1
-/* 9D8F94 80241F74 10720003 */  beq       $v1, $s2, .L80241F84
-/* 9D8F98 80241F78 00000000 */   nop
-/* 9D8F9C 80241F7C 00511024 */  and       $v0, $v0, $s1
-/* 9D8FA0 80241F80 AC820000 */  sw        $v0, ($a0)
-.L80241F84:
-/* 9D8FA4 80241F84 2A020040 */  slti      $v0, $s0, 0x40
-/* 9D8FA8 80241F88 1440FFEF */  bnez      $v0, .L80241F48
-/* 9D8FAC 80241F8C 00000000 */   nop
-/* 9D8FB0 80241F90 0000802D */  daddu     $s0, $zero, $zero
-/* 9D8FB4 80241F94 3C11F7FF */  lui       $s1, 0xf7ff
-/* 9D8FB8 80241F98 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80241F9C:
-/* 9D8FBC 80241F9C 0C04C3D6 */  jal       get_item_entity
-/* 9D8FC0 80241FA0 0200202D */   daddu    $a0, $s0, $zero
-/* 9D8FC4 80241FA4 0040182D */  daddu     $v1, $v0, $zero
-/* 9D8FC8 80241FA8 10600007 */  beqz      $v1, .L80241FC8
-/* 9D8FCC 80241FAC 26100001 */   addiu    $s0, $s0, 1
-/* 9D8FD0 80241FB0 8C640000 */  lw        $a0, ($v1)
-/* 9D8FD4 80241FB4 30820010 */  andi      $v0, $a0, 0x10
-/* 9D8FD8 80241FB8 10400003 */  beqz      $v0, .L80241FC8
-/* 9D8FDC 80241FBC 00000000 */   nop
-/* 9D8FE0 80241FC0 00911024 */  and       $v0, $a0, $s1
-/* 9D8FE4 80241FC4 AC620000 */  sw        $v0, ($v1)
-.L80241FC8:
-/* 9D8FE8 80241FC8 2A020100 */  slti      $v0, $s0, 0x100
-/* 9D8FEC 80241FCC 1440FFF3 */  bnez      $v0, .L80241F9C
-/* 9D8FF0 80241FD0 24020002 */   addiu    $v0, $zero, 2
-/* 9D8FF4 80241FD4 080907F8 */  j         .L80241FE0
-/* 9D8FF8 80241FD8 00000000 */   nop
-.L80241FDC:
-/* 9D8FFC 80241FDC 0000102D */  daddu     $v0, $zero, $zero
-.L80241FE0:
-/* 9D9000 80241FE0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 9D9004 80241FE4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9D9008 80241FE8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9D900C 80241FEC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9D9010 80241FF0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9D9014 80241FF4 03E00008 */  jr        $ra
-/* 9D9018 80241FF8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240000_9EDBF0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240000_9EDBF0.s
deleted file mode 100644
index 1d95fabab1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240000_9EDBF0.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_9EDBF0
-/* 9EDBF0 80240000 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9EDBF4 80240004 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9EDBF8 80240008 0080902D */  daddu     $s2, $a0, $zero
-/* 9EDBFC 8024000C AFB10014 */  sw        $s1, 0x14($sp)
-/* 9EDC00 80240010 00A0882D */  daddu     $s1, $a1, $zero
-/* 9EDC04 80240014 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 9EDC08 80240018 AFB40020 */  sw        $s4, 0x20($sp)
-/* 9EDC0C 8024001C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9EDC10 80240020 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9EDC14 80240024 8E50000C */  lw        $s0, 0xc($s2)
-/* 9EDC18 80240028 8E050000 */  lw        $a1, ($s0)
-/* 9EDC1C 8024002C 0C0B1EAF */  jal       get_variable
-/* 9EDC20 80240030 26100004 */   addiu    $s0, $s0, 4
-/* 9EDC24 80240034 0240202D */  daddu     $a0, $s2, $zero
-/* 9EDC28 80240038 8E050000 */  lw        $a1, ($s0)
-/* 9EDC2C 8024003C 0C0B1EAF */  jal       get_variable
-/* 9EDC30 80240040 0040802D */   daddu    $s0, $v0, $zero
-/* 9EDC34 80240044 0200202D */  daddu     $a0, $s0, $zero
-/* 9EDC38 80240048 0C00EAD2 */  jal       get_npc_safe
-/* 9EDC3C 8024004C 0040A02D */   daddu    $s4, $v0, $zero
-/* 9EDC40 80240050 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* 9EDC44 80240054 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* 9EDC48 80240058 12200006 */  beqz      $s1, .L80240074
-/* 9EDC4C 8024005C 0040802D */   daddu    $s0, $v0, $zero
-/* 9EDC50 80240060 82620012 */  lb        $v0, 0x12($s3)
-/* 9EDC54 80240064 54400003 */  bnel      $v0, $zero, .L80240074
-/* 9EDC58 80240068 AE400070 */   sw       $zero, 0x70($s2)
-/* 9EDC5C 8024006C 24020002 */  addiu     $v0, $zero, 2
-/* 9EDC60 80240070 AE420070 */  sw        $v0, 0x70($s2)
-.L80240074:
-/* 9EDC64 80240074 8E430070 */  lw        $v1, 0x70($s2)
-/* 9EDC68 80240078 24110001 */  addiu     $s1, $zero, 1
-/* 9EDC6C 8024007C 10710013 */  beq       $v1, $s1, .L802400CC
-/* 9EDC70 80240080 28620002 */   slti     $v0, $v1, 2
-/* 9EDC74 80240084 10400005 */  beqz      $v0, .L8024009C
-/* 9EDC78 80240088 24020002 */   addiu    $v0, $zero, 2
-/* 9EDC7C 8024008C 10600009 */  beqz      $v1, .L802400B4
-/* 9EDC80 80240090 0000102D */   daddu    $v0, $zero, $zero
-/* 9EDC84 80240094 08090059 */  j         .L80240164
-/* 9EDC88 80240098 00000000 */   nop
-.L8024009C:
-/* 9EDC8C 8024009C 10620013 */  beq       $v1, $v0, .L802400EC
-/* 9EDC90 802400A0 24020003 */   addiu    $v0, $zero, 3
-/* 9EDC94 802400A4 1062001E */  beq       $v1, $v0, .L80240120
-/* 9EDC98 802400A8 0000102D */   daddu    $v0, $zero, $zero
-/* 9EDC9C 802400AC 08090059 */  j         .L80240164
-/* 9EDCA0 802400B0 00000000 */   nop
-.L802400B4:
-/* 9EDCA4 802400B4 0C03AC5A */  jal       func_800EB168
-/* 9EDCA8 802400B8 0000202D */   daddu    $a0, $zero, $zero
-/* 9EDCAC 802400BC 2402001E */  addiu     $v0, $zero, 0x1e
-/* 9EDCB0 802400C0 AE420074 */  sw        $v0, 0x74($s2)
-/* 9EDCB4 802400C4 08090058 */  j         .L80240160
-/* 9EDCB8 802400C8 AE510070 */   sw       $s1, 0x70($s2)
-.L802400CC:
-/* 9EDCBC 802400CC 8E420074 */  lw        $v0, 0x74($s2)
-/* 9EDCC0 802400D0 2403FFFF */  addiu     $v1, $zero, -1
-/* 9EDCC4 802400D4 2442FFFF */  addiu     $v0, $v0, -1
-/* 9EDCC8 802400D8 14430021 */  bne       $v0, $v1, .L80240160
-/* 9EDCCC 802400DC AE420074 */   sw       $v0, 0x74($s2)
-/* 9EDCD0 802400E0 24020002 */  addiu     $v0, $zero, 2
-/* 9EDCD4 802400E4 08090058 */  j         .L80240160
-/* 9EDCD8 802400E8 AE420070 */   sw       $v0, 0x70($s2)
-.L802400EC:
-/* 9EDCDC 802400EC 0200202D */  daddu     $a0, $s0, $zero
-/* 9EDCE0 802400F0 00141600 */  sll       $v0, $s4, 0x18
-/* 9EDCE4 802400F4 00021543 */  sra       $v0, $v0, 0x15
-/* 9EDCE8 802400F8 02621021 */  addu      $v0, $s3, $v0
-/* 9EDCEC 802400FC A2740012 */  sb        $s4, 0x12($s3)
-/* 9EDCF0 80240100 0C03BD17 */  jal       clear_partner_move_history
-/* 9EDCF4 80240104 A0510014 */   sb       $s1, 0x14($v0)
-/* 9EDCF8 80240108 82640012 */  lb        $a0, 0x12($s3)
-/* 9EDCFC 8024010C 0C03ACA9 */  jal       func_800EB2A4
-/* 9EDD00 80240110 00000000 */   nop
-/* 9EDD04 80240114 24020003 */  addiu     $v0, $zero, 3
-/* 9EDD08 80240118 08090058 */  j         .L80240160
-/* 9EDD0C 8024011C AE420070 */   sw       $v0, 0x70($s2)
-.L80240120:
-/* 9EDD10 80240120 0C00EAD2 */  jal       get_npc_safe
-/* 9EDD14 80240124 2404FFFC */   addiu    $a0, $zero, -4
-/* 9EDD18 80240128 8E05000C */  lw        $a1, 0xc($s0)
-/* 9EDD1C 8024012C 0C00ECD0 */  jal       set_npc_yaw
-/* 9EDD20 80240130 0040202D */   daddu    $a0, $v0, $zero
-/* 9EDD24 80240134 0200202D */  daddu     $a0, $s0, $zero
-/* 9EDD28 80240138 8E020000 */  lw        $v0, ($s0)
-/* 9EDD2C 8024013C 2403FFFB */  addiu     $v1, $zero, -5
-/* 9EDD30 80240140 00431024 */  and       $v0, $v0, $v1
-/* 9EDD34 80240144 0C00EAFF */  jal       disable_npc_shadow
-/* 9EDD38 80240148 AE020000 */   sw       $v0, ($s0)
-/* 9EDD3C 8024014C 3C01C47A */  lui       $at, 0xc47a
-/* 9EDD40 80240150 44810000 */  mtc1      $at, $f0
-/* 9EDD44 80240154 24020002 */  addiu     $v0, $zero, 2
-/* 9EDD48 80240158 08090059 */  j         .L80240164
-/* 9EDD4C 8024015C E600003C */   swc1     $f0, 0x3c($s0)
-.L80240160:
-/* 9EDD50 80240160 0000102D */  daddu     $v0, $zero, $zero
-.L80240164:
-/* 9EDD54 80240164 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 9EDD58 80240168 8FB40020 */  lw        $s4, 0x20($sp)
-/* 9EDD5C 8024016C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9EDD60 80240170 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9EDD64 80240174 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9EDD68 80240178 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9EDD6C 8024017C 03E00008 */  jr        $ra
-/* 9EDD70 80240180 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240034_A06F34.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240034_A06F34.s
deleted file mode 100644
index 4e042d021d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240034_A06F34.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_A06F34
-/* A06F34 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* A06F38 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* A06F3C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A06F40 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* A06F44 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* A06F48 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* A06F4C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* A06F50 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* A06F54 80240054 24020002 */   addiu    $v0, $zero, 2
-/* A06F58 80240058 08090038 */  j         .L802400E0
-/* A06F5C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* A06F60 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* A06F64 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* A06F68 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* A06F6C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* A06F70 80240070 04420001 */  bltzl     $v0, .L80240078
-/* A06F74 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* A06F78 80240078 14400003 */  bnez      $v0, .L80240088
-/* A06F7C 8024007C 00000000 */   nop
-/* A06F80 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* A06F84 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* A06F88 80240088 44822000 */  mtc1      $v0, $f4
-/* A06F8C 8024008C 00000000 */  nop
-/* A06F90 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* A06F94 80240094 44062000 */  mfc1      $a2, $f4
-/* A06F98 80240098 44872000 */  mtc1      $a3, $f4
-/* A06F9C 8024009C 00000000 */  nop
-/* A06FA0 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* A06FA4 802400A4 44806000 */  mtc1      $zero, $f12
-/* A06FA8 802400A8 44072000 */  mfc1      $a3, $f4
-/* A06FAC 802400AC 0C00A720 */  jal       atan2
-/* A06FB0 802400B0 46006386 */   mov.s    $f14, $f12
-/* A06FB4 802400B4 3C014270 */  lui       $at, 0x4270
-/* A06FB8 802400B8 44811000 */  mtc1      $at, $f2
-/* A06FBC 802400BC 00000000 */  nop
-/* A06FC0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* A06FC4 802400C4 00000000 */  nop
-/* A06FC8 802400C8 45000004 */  bc1f      .L802400DC
-/* A06FCC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* A06FD0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* A06FD4 802400D4 08090038 */  j         .L802400E0
-/* A06FD8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* A06FDC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* A06FE0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A06FE4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* A06FE8 802400E8 03E00008 */  jr        $ra
-/* A06FEC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
index a665d4350d..2531ea55f3 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
@@ -13,8 +13,8 @@ glabel func_80240BB0_BBDD50
 /* BBDD70 80240BD0 8C620000 */  lw        $v0, ($v1)
 /* BBDD74 80240BD4 5040000A */  beql      $v0, $zero, .L80240C00
 /* BBDD78 80240BD8 00041080 */   sll      $v0, $a0, 2
-/* BBDD7C 80240BDC 3C058024 */  lui       $a1, %hi(D_802458F0)
-/* BBDD80 80240BE0 24A558F0 */  addiu     $a1, $a1, %lo(D_802458F0)
+/* BBDD7C 80240BDC 3C058024 */  lui       $a1, %hi(obk_01_bss_sym)
+/* BBDD80 80240BE0 24A558F0 */  addiu     $a1, $a1, %lo(obk_01_bss_sym)
 .L80240BE4:
 /* BBDD84 80240BE4 24630004 */  addiu     $v1, $v1, 4
 /* BBDD88 80240BE8 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240BB0_BBDD50
 /* BBDD98 80240BF8 24A50004 */   addiu    $a1, $a1, 4
 /* BBDD9C 80240BFC 00041080 */  sll       $v0, $a0, 2
 .L80240C00:
-/* BBDDA0 80240C00 3C018024 */  lui       $at, %hi(D_802458F0)
+/* BBDDA0 80240C00 3C018024 */  lui       $at, %hi(obk_01_bss_sym)
 /* BBDDA4 80240C04 00220821 */  addu      $at, $at, $v0
-/* BBDDA8 80240C08 AC2058F0 */  sw        $zero, %lo(D_802458F0)($at)
+/* BBDDA8 80240C08 AC2058F0 */  sw        $zero, %lo(obk_01_bss_sym)($at)
 /* BBDDAC 80240C0C 0809030F */  j         .L80240C3C
 /* BBDDB0 80240C10 00000000 */   nop
 .L80240C14:
-/* BBDDB4 80240C14 3C038024 */  lui       $v1, %hi(D_802458F0)
-/* BBDDB8 80240C18 246358F0 */  addiu     $v1, $v1, %lo(D_802458F0)
+/* BBDDB4 80240C14 3C038024 */  lui       $v1, %hi(obk_01_bss_sym)
+/* BBDDB8 80240C18 246358F0 */  addiu     $v1, $v1, %lo(obk_01_bss_sym)
 /* BBDDBC 80240C1C 0060282D */  daddu     $a1, $v1, $zero
 .L80240C20:
 /* BBDDC0 80240C20 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s
index 0059b995b5..2e26f4195e 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s
@@ -15,7 +15,7 @@ glabel func_80240858_BC4AD8
 /* BC4B00 80240880 8FBF0014 */  lw        $ra, 0x14($sp)
 /* BC4B04 80240884 8FB00010 */  lw        $s0, 0x10($sp)
 /* BC4B08 80240888 24020002 */  addiu     $v0, $zero, 2
-/* BC4B0C 8024088C 3C018024 */  lui       $at, %hi(D_80243DA4)
-/* BC4B10 80240890 AC233DA4 */  sw        $v1, %lo(D_80243DA4)($at)
+/* BC4B0C 8024088C 3C018024 */  lui       $at, %hi(flo_13_80243DA4)
+/* BC4B10 80240890 AC233DA4 */  sw        $v1, %lo(flo_13_80243DA4)($at)
 /* BC4B14 80240894 03E00008 */  jr        $ra
 /* BC4B18 80240898 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s
index 2dc56e3dee..60f83f8aaf 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s
@@ -6,8 +6,8 @@ glabel func_8024089C_BC4B1C
 /* BC4B20 802408A0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BC4B24 802408A4 0C00EABB */  jal       get_npc_unsafe
 /* BC4B28 802408A8 8C84008C */   lw       $a0, 0x8c($a0)
-/* BC4B2C 802408AC 3C038024 */  lui       $v1, %hi(D_80243DA4)
-/* BC4B30 802408B0 8C633DA4 */  lw        $v1, %lo(D_80243DA4)($v1)
+/* BC4B2C 802408AC 3C038024 */  lui       $v1, %hi(flo_13_80243DA4)
+/* BC4B30 802408B0 8C633DA4 */  lw        $v1, %lo(flo_13_80243DA4)($v1)
 /* BC4B34 802408B4 AC430028 */  sw        $v1, 0x28($v0)
 /* BC4B38 802408B8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BC4B3C 802408BC 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241788_BD0378.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241788_BD0378.s
deleted file mode 100644
index b427cf1884..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241788_BD0378.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241788_BD0378
-/* BD0378 80241788 03E00008 */  jr        $ra
-/* BD037C 8024178C 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDA7B0/func_80240000_BDA7B0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDA7B0/func_80240000_BDA7B0.s
deleted file mode 100644
index 6c638969e7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDA7B0/func_80240000_BDA7B0.s
+++ /dev/null
@@ -1,112 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_BDA7B0
-/* BDA7B0 80240000 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* BDA7B4 80240004 AFB20018 */  sw        $s2, 0x18($sp)
-/* BDA7B8 80240008 0080902D */  daddu     $s2, $a0, $zero
-/* BDA7BC 8024000C AFB10014 */  sw        $s1, 0x14($sp)
-/* BDA7C0 80240010 00A0882D */  daddu     $s1, $a1, $zero
-/* BDA7C4 80240014 AFBF0024 */  sw        $ra, 0x24($sp)
-/* BDA7C8 80240018 AFB40020 */  sw        $s4, 0x20($sp)
-/* BDA7CC 8024001C AFB3001C */  sw        $s3, 0x1c($sp)
-/* BDA7D0 80240020 AFB00010 */  sw        $s0, 0x10($sp)
-/* BDA7D4 80240024 8E50000C */  lw        $s0, 0xc($s2)
-/* BDA7D8 80240028 8E050000 */  lw        $a1, ($s0)
-/* BDA7DC 8024002C 0C0B1EAF */  jal       get_variable
-/* BDA7E0 80240030 26100004 */   addiu    $s0, $s0, 4
-/* BDA7E4 80240034 0240202D */  daddu     $a0, $s2, $zero
-/* BDA7E8 80240038 8E050000 */  lw        $a1, ($s0)
-/* BDA7EC 8024003C 0C0B1EAF */  jal       get_variable
-/* BDA7F0 80240040 0040802D */   daddu    $s0, $v0, $zero
-/* BDA7F4 80240044 0200202D */  daddu     $a0, $s0, $zero
-/* BDA7F8 80240048 0C00EAD2 */  jal       get_npc_safe
-/* BDA7FC 8024004C 0040A02D */   daddu    $s4, $v0, $zero
-/* BDA800 80240050 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* BDA804 80240054 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* BDA808 80240058 12200006 */  beqz      $s1, .L80240074
-/* BDA80C 8024005C 0040802D */   daddu    $s0, $v0, $zero
-/* BDA810 80240060 82620012 */  lb        $v0, 0x12($s3)
-/* BDA814 80240064 54400003 */  bnel      $v0, $zero, .L80240074
-/* BDA818 80240068 AE400070 */   sw       $zero, 0x70($s2)
-/* BDA81C 8024006C 24020002 */  addiu     $v0, $zero, 2
-/* BDA820 80240070 AE420070 */  sw        $v0, 0x70($s2)
-.L80240074:
-/* BDA824 80240074 8E430070 */  lw        $v1, 0x70($s2)
-/* BDA828 80240078 24110001 */  addiu     $s1, $zero, 1
-/* BDA82C 8024007C 10710013 */  beq       $v1, $s1, .L802400CC
-/* BDA830 80240080 28620002 */   slti     $v0, $v1, 2
-/* BDA834 80240084 10400005 */  beqz      $v0, .L8024009C
-/* BDA838 80240088 24020002 */   addiu    $v0, $zero, 2
-/* BDA83C 8024008C 10600009 */  beqz      $v1, .L802400B4
-/* BDA840 80240090 0000102D */   daddu    $v0, $zero, $zero
-/* BDA844 80240094 08090059 */  j         .L80240164
-/* BDA848 80240098 00000000 */   nop
-.L8024009C:
-/* BDA84C 8024009C 10620013 */  beq       $v1, $v0, .L802400EC
-/* BDA850 802400A0 24020003 */   addiu    $v0, $zero, 3
-/* BDA854 802400A4 1062001E */  beq       $v1, $v0, .L80240120
-/* BDA858 802400A8 0000102D */   daddu    $v0, $zero, $zero
-/* BDA85C 802400AC 08090059 */  j         .L80240164
-/* BDA860 802400B0 00000000 */   nop
-.L802400B4:
-/* BDA864 802400B4 0C03AC5A */  jal       func_800EB168
-/* BDA868 802400B8 0000202D */   daddu    $a0, $zero, $zero
-/* BDA86C 802400BC 2402001E */  addiu     $v0, $zero, 0x1e
-/* BDA870 802400C0 AE420074 */  sw        $v0, 0x74($s2)
-/* BDA874 802400C4 08090058 */  j         .L80240160
-/* BDA878 802400C8 AE510070 */   sw       $s1, 0x70($s2)
-.L802400CC:
-/* BDA87C 802400CC 8E420074 */  lw        $v0, 0x74($s2)
-/* BDA880 802400D0 2403FFFF */  addiu     $v1, $zero, -1
-/* BDA884 802400D4 2442FFFF */  addiu     $v0, $v0, -1
-/* BDA888 802400D8 14430021 */  bne       $v0, $v1, .L80240160
-/* BDA88C 802400DC AE420074 */   sw       $v0, 0x74($s2)
-/* BDA890 802400E0 24020002 */  addiu     $v0, $zero, 2
-/* BDA894 802400E4 08090058 */  j         .L80240160
-/* BDA898 802400E8 AE420070 */   sw       $v0, 0x70($s2)
-.L802400EC:
-/* BDA89C 802400EC 0200202D */  daddu     $a0, $s0, $zero
-/* BDA8A0 802400F0 00141600 */  sll       $v0, $s4, 0x18
-/* BDA8A4 802400F4 00021543 */  sra       $v0, $v0, 0x15
-/* BDA8A8 802400F8 02621021 */  addu      $v0, $s3, $v0
-/* BDA8AC 802400FC A2740012 */  sb        $s4, 0x12($s3)
-/* BDA8B0 80240100 0C03BD17 */  jal       clear_partner_move_history
-/* BDA8B4 80240104 A0510014 */   sb       $s1, 0x14($v0)
-/* BDA8B8 80240108 82640012 */  lb        $a0, 0x12($s3)
-/* BDA8BC 8024010C 0C03ACA9 */  jal       func_800EB2A4
-/* BDA8C0 80240110 00000000 */   nop
-/* BDA8C4 80240114 24020003 */  addiu     $v0, $zero, 3
-/* BDA8C8 80240118 08090058 */  j         .L80240160
-/* BDA8CC 8024011C AE420070 */   sw       $v0, 0x70($s2)
-.L80240120:
-/* BDA8D0 80240120 0C00EAD2 */  jal       get_npc_safe
-/* BDA8D4 80240124 2404FFFC */   addiu    $a0, $zero, -4
-/* BDA8D8 80240128 8E05000C */  lw        $a1, 0xc($s0)
-/* BDA8DC 8024012C 0C00ECD0 */  jal       set_npc_yaw
-/* BDA8E0 80240130 0040202D */   daddu    $a0, $v0, $zero
-/* BDA8E4 80240134 0200202D */  daddu     $a0, $s0, $zero
-/* BDA8E8 80240138 8E020000 */  lw        $v0, ($s0)
-/* BDA8EC 8024013C 2403FFFB */  addiu     $v1, $zero, -5
-/* BDA8F0 80240140 00431024 */  and       $v0, $v0, $v1
-/* BDA8F4 80240144 0C00EAFF */  jal       disable_npc_shadow
-/* BDA8F8 80240148 AE020000 */   sw       $v0, ($s0)
-/* BDA8FC 8024014C 3C01C47A */  lui       $at, 0xc47a
-/* BDA900 80240150 44810000 */  mtc1      $at, $f0
-/* BDA904 80240154 24020002 */  addiu     $v0, $zero, 2
-/* BDA908 80240158 08090059 */  j         .L80240164
-/* BDA90C 8024015C E600003C */   swc1     $f0, 0x3c($s0)
-.L80240160:
-/* BDA910 80240160 0000102D */  daddu     $v0, $zero, $zero
-.L80240164:
-/* BDA914 80240164 8FBF0024 */  lw        $ra, 0x24($sp)
-/* BDA918 80240168 8FB40020 */  lw        $s4, 0x20($sp)
-/* BDA91C 8024016C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* BDA920 80240170 8FB20018 */  lw        $s2, 0x18($sp)
-/* BDA924 80240174 8FB10014 */  lw        $s1, 0x14($sp)
-/* BDA928 80240178 8FB00010 */  lw        $s0, 0x10($sp)
-/* BDA92C 8024017C 03E00008 */  jr        $ra
-/* BDA930 80240180 27BD0028 */   addiu    $sp, $sp, 0x28
-/* BDA934 80240184 00000000 */  nop
-/* BDA938 80240188 00000000 */  nop
-/* BDA93C 8024018C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s
deleted file mode 100644
index 06e525080e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240864_DDD094
-/* DDD094 80240864 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* DDD098 80240868 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* DDD09C 8024086C 000420C0 */  sll       $a0, $a0, 3
-/* DDD0A0 80240870 00822021 */  addu      $a0, $a0, $v0
-/* DDD0A4 80240874 90820014 */  lbu       $v0, 0x14($a0)
-/* DDD0A8 80240878 10400009 */  beqz      $v0, .L802408A0
-/* DDD0AC 8024087C 00000000 */   nop
-/* DDD0B0 80240880 90820015 */  lbu       $v0, 0x15($a0)
-/* DDD0B4 80240884 00022600 */  sll       $a0, $v0, 0x18
-/* DDD0B8 80240888 00041E03 */  sra       $v1, $a0, 0x18
-/* DDD0BC 8024088C 00051400 */  sll       $v0, $a1, 0x10
-/* DDD0C0 80240890 00021403 */  sra       $v0, $v0, 0x10
-/* DDD0C4 80240894 0043102A */  slt       $v0, $v0, $v1
-/* DDD0C8 80240898 10400003 */  beqz      $v0, .L802408A8
-/* DDD0CC 8024089C 00000000 */   nop
-.L802408A0:
-/* DDD0D0 802408A0 03E00008 */  jr        $ra
-/* DDD0D4 802408A4 2402FFFF */   addiu    $v0, $zero, -1
-.L802408A8:
-/* DDD0D8 802408A8 03E00008 */  jr        $ra
-/* DDD0DC 802408AC 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s
deleted file mode 100644
index 8395e83a4f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802408B0_DDD0E0
-/* DDD0E0 802408B0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* DDD0E4 802408B4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* DDD0E8 802408B8 0080982D */  daddu     $s3, $a0, $zero
-/* DDD0EC 802408BC AFB00010 */  sw        $s0, 0x10($sp)
-/* DDD0F0 802408C0 24100001 */  addiu     $s0, $zero, 1
-/* DDD0F4 802408C4 AFB40020 */  sw        $s4, 0x20($sp)
-/* DDD0F8 802408C8 2414FFFF */  addiu     $s4, $zero, -1
-/* DDD0FC 802408CC AFB50024 */  sw        $s5, 0x24($sp)
-/* DDD100 802408D0 0200A82D */  daddu     $s5, $s0, $zero
-/* DDD104 802408D4 AFB10014 */  sw        $s1, 0x14($sp)
-/* DDD108 802408D8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* DDD10C 802408DC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* DDD110 802408E0 AFBF0028 */  sw        $ra, 0x28($sp)
-/* DDD114 802408E4 AFB20018 */  sw        $s2, 0x18($sp)
-/* DDD118 802408E8 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* DDD11C 802408EC 0280182D */  daddu     $v1, $s4, $zero
-/* DDD120 802408F0 AE630084 */  sw        $v1, 0x84($s3)
-/* DDD124 802408F4 00021027 */  nor       $v0, $zero, $v0
-/* DDD128 802408F8 000217C2 */  srl       $v0, $v0, 0x1f
-/* DDD12C 802408FC 00029400 */  sll       $s2, $v0, 0x10
-.L80240900:
-/* DDD130 80240900 92220014 */  lbu       $v0, 0x14($s1)
-/* DDD134 80240904 50400008 */  beql      $v0, $zero, .L80240928
-/* DDD138 80240908 26100001 */   addiu    $s0, $s0, 1
-/* DDD13C 8024090C 0200202D */  daddu     $a0, $s0, $zero
-/* DDD140 80240910 0C090219 */  jal       func_80240864_DDD094
-/* DDD144 80240914 00122C03 */   sra      $a1, $s2, 0x10
-/* DDD148 80240918 10540003 */  beq       $v0, $s4, .L80240928
-/* DDD14C 8024091C 26100001 */   addiu    $s0, $s0, 1
-/* DDD150 80240920 0809024D */  j         .L80240934
-/* DDD154 80240924 AE750084 */   sw       $s5, 0x84($s3)
-.L80240928:
-/* DDD158 80240928 2A02000C */  slti      $v0, $s0, 0xc
-/* DDD15C 8024092C 1440FFF4 */  bnez      $v0, .L80240900
-/* DDD160 80240930 26310008 */   addiu    $s1, $s1, 8
-.L80240934:
-/* DDD164 80240934 8FBF0028 */  lw        $ra, 0x28($sp)
-/* DDD168 80240938 8FB50024 */  lw        $s5, 0x24($sp)
-/* DDD16C 8024093C 8FB40020 */  lw        $s4, 0x20($sp)
-/* DDD170 80240940 8FB3001C */  lw        $s3, 0x1c($sp)
-/* DDD174 80240944 8FB20018 */  lw        $s2, 0x18($sp)
-/* DDD178 80240948 8FB10014 */  lw        $s1, 0x14($sp)
-/* DDD17C 8024094C 8FB00010 */  lw        $s0, 0x10($sp)
-/* DDD180 80240950 24020002 */  addiu     $v0, $zero, 2
-/* DDD184 80240954 03E00008 */  jr        $ra
-/* DDD188 80240958 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s
index 31e413ee3f..302ed8796f 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s
@@ -49,7 +49,7 @@ glabel func_8024095C_DDD18C
 /* DDD238 80240A08 AE300108 */  sw        $s0, 0x108($s1)
 /* DDD23C 80240A0C 8C420000 */  lw        $v0, ($v0)
 /* DDD240 80240A10 02E0282D */  daddu     $a1, $s7, $zero
-/* DDD244 80240A14 0C090219 */  jal       func_80240864_DDD094
+/* DDD244 80240A14 0C090219 */  jal       omo_11_UnkFunc37
 /* DDD248 80240A18 AE220084 */   sw       $v0, 0x84($s1)
 /* DDD24C 80240A1C 0040202D */  daddu     $a0, $v0, $zero
 /* DDD250 80240A20 04800011 */  bltz      $a0, .L80240A68
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240CA0_DDD4D0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240CA0_DDD4D0.s
deleted file mode 100644
index 57a6b47dee..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240CA0_DDD4D0.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CA0_DDD4D0
-/* DDD4D0 80240CA0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DDD4D4 80240CA4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* DDD4D8 80240CA8 8C82000C */  lw        $v0, 0xc($a0)
-/* DDD4DC 80240CAC 0C0B1EAF */  jal       get_variable
-/* DDD4E0 80240CB0 8C450000 */   lw       $a1, ($v0)
-/* DDD4E4 80240CB4 0040202D */  daddu     $a0, $v0, $zero
-/* DDD4E8 80240CB8 8C830000 */  lw        $v1, ($a0)
-/* DDD4EC 80240CBC 34630010 */  ori       $v1, $v1, 0x10
-/* DDD4F0 80240CC0 AC830000 */  sw        $v1, ($a0)
-/* DDD4F4 80240CC4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* DDD4F8 80240CC8 24020002 */  addiu     $v0, $zero, 2
-/* DDD4FC 80240CCC 03E00008 */  jr        $ra
-/* DDD500 80240CD0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s
deleted file mode 100644
index b0333aa711..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241498_DDDCC8
-/* DDDCC8 80241498 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* DDDCCC 8024149C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* DDDCD0 802414A0 AC800084 */  sw        $zero, 0x84($a0)
-/* DDDCD4 802414A4 80620000 */  lb        $v0, ($v1)
-/* DDDCD8 802414A8 10400005 */  beqz      $v0, .L802414C0
-/* DDDCDC 802414AC 24020003 */   addiu    $v0, $zero, 3
-/* DDDCE0 802414B0 80630003 */  lb        $v1, 3($v1)
-/* DDDCE4 802414B4 14620002 */  bne       $v1, $v0, .L802414C0
-/* DDDCE8 802414B8 24020001 */   addiu    $v0, $zero, 1
-/* DDDCEC 802414BC AC820084 */  sw        $v0, 0x84($a0)
-.L802414C0:
-/* DDDCF0 802414C0 03E00008 */  jr        $ra
-/* DDDCF4 802414C4 24020002 */   addiu    $v0, $zero, 2
-/* DDDCF8 802414C8 00000000 */  nop
-/* DDDCFC 802414CC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240000_DDF310.s b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240000_DDF310.s
deleted file mode 100644
index 8cad23c8f1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240000_DDF310.s
+++ /dev/null
@@ -1,109 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240000_DDF310
-/* DDF310 80240000 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* DDF314 80240004 AFB20018 */  sw        $s2, 0x18($sp)
-/* DDF318 80240008 0080902D */  daddu     $s2, $a0, $zero
-/* DDF31C 8024000C AFB10014 */  sw        $s1, 0x14($sp)
-/* DDF320 80240010 00A0882D */  daddu     $s1, $a1, $zero
-/* DDF324 80240014 AFBF0024 */  sw        $ra, 0x24($sp)
-/* DDF328 80240018 AFB40020 */  sw        $s4, 0x20($sp)
-/* DDF32C 8024001C AFB3001C */  sw        $s3, 0x1c($sp)
-/* DDF330 80240020 AFB00010 */  sw        $s0, 0x10($sp)
-/* DDF334 80240024 8E50000C */  lw        $s0, 0xc($s2)
-/* DDF338 80240028 8E050000 */  lw        $a1, ($s0)
-/* DDF33C 8024002C 0C0B1EAF */  jal       get_variable
-/* DDF340 80240030 26100004 */   addiu    $s0, $s0, 4
-/* DDF344 80240034 0240202D */  daddu     $a0, $s2, $zero
-/* DDF348 80240038 8E050000 */  lw        $a1, ($s0)
-/* DDF34C 8024003C 0C0B1EAF */  jal       get_variable
-/* DDF350 80240040 0040802D */   daddu    $s0, $v0, $zero
-/* DDF354 80240044 0200202D */  daddu     $a0, $s0, $zero
-/* DDF358 80240048 0C00EAD2 */  jal       get_npc_safe
-/* DDF35C 8024004C 0040A02D */   daddu    $s4, $v0, $zero
-/* DDF360 80240050 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* DDF364 80240054 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* DDF368 80240058 12200006 */  beqz      $s1, .L80240074
-/* DDF36C 8024005C 0040802D */   daddu    $s0, $v0, $zero
-/* DDF370 80240060 82620012 */  lb        $v0, 0x12($s3)
-/* DDF374 80240064 54400003 */  bnel      $v0, $zero, .L80240074
-/* DDF378 80240068 AE400070 */   sw       $zero, 0x70($s2)
-/* DDF37C 8024006C 24020002 */  addiu     $v0, $zero, 2
-/* DDF380 80240070 AE420070 */  sw        $v0, 0x70($s2)
-.L80240074:
-/* DDF384 80240074 8E430070 */  lw        $v1, 0x70($s2)
-/* DDF388 80240078 24110001 */  addiu     $s1, $zero, 1
-/* DDF38C 8024007C 10710013 */  beq       $v1, $s1, .L802400CC
-/* DDF390 80240080 28620002 */   slti     $v0, $v1, 2
-/* DDF394 80240084 10400005 */  beqz      $v0, .L8024009C
-/* DDF398 80240088 24020002 */   addiu    $v0, $zero, 2
-/* DDF39C 8024008C 10600009 */  beqz      $v1, .L802400B4
-/* DDF3A0 80240090 0000102D */   daddu    $v0, $zero, $zero
-/* DDF3A4 80240094 08090059 */  j         .L80240164
-/* DDF3A8 80240098 00000000 */   nop
-.L8024009C:
-/* DDF3AC 8024009C 10620013 */  beq       $v1, $v0, .L802400EC
-/* DDF3B0 802400A0 24020003 */   addiu    $v0, $zero, 3
-/* DDF3B4 802400A4 1062001E */  beq       $v1, $v0, .L80240120
-/* DDF3B8 802400A8 0000102D */   daddu    $v0, $zero, $zero
-/* DDF3BC 802400AC 08090059 */  j         .L80240164
-/* DDF3C0 802400B0 00000000 */   nop
-.L802400B4:
-/* DDF3C4 802400B4 0C03AC5A */  jal       func_800EB168
-/* DDF3C8 802400B8 0000202D */   daddu    $a0, $zero, $zero
-/* DDF3CC 802400BC 2402001E */  addiu     $v0, $zero, 0x1e
-/* DDF3D0 802400C0 AE420074 */  sw        $v0, 0x74($s2)
-/* DDF3D4 802400C4 08090058 */  j         .L80240160
-/* DDF3D8 802400C8 AE510070 */   sw       $s1, 0x70($s2)
-.L802400CC:
-/* DDF3DC 802400CC 8E420074 */  lw        $v0, 0x74($s2)
-/* DDF3E0 802400D0 2403FFFF */  addiu     $v1, $zero, -1
-/* DDF3E4 802400D4 2442FFFF */  addiu     $v0, $v0, -1
-/* DDF3E8 802400D8 14430021 */  bne       $v0, $v1, .L80240160
-/* DDF3EC 802400DC AE420074 */   sw       $v0, 0x74($s2)
-/* DDF3F0 802400E0 24020002 */  addiu     $v0, $zero, 2
-/* DDF3F4 802400E4 08090058 */  j         .L80240160
-/* DDF3F8 802400E8 AE420070 */   sw       $v0, 0x70($s2)
-.L802400EC:
-/* DDF3FC 802400EC 0200202D */  daddu     $a0, $s0, $zero
-/* DDF400 802400F0 00141600 */  sll       $v0, $s4, 0x18
-/* DDF404 802400F4 00021543 */  sra       $v0, $v0, 0x15
-/* DDF408 802400F8 02621021 */  addu      $v0, $s3, $v0
-/* DDF40C 802400FC A2740012 */  sb        $s4, 0x12($s3)
-/* DDF410 80240100 0C03BD17 */  jal       clear_partner_move_history
-/* DDF414 80240104 A0510014 */   sb       $s1, 0x14($v0)
-/* DDF418 80240108 82640012 */  lb        $a0, 0x12($s3)
-/* DDF41C 8024010C 0C03ACA9 */  jal       func_800EB2A4
-/* DDF420 80240110 00000000 */   nop
-/* DDF424 80240114 24020003 */  addiu     $v0, $zero, 3
-/* DDF428 80240118 08090058 */  j         .L80240160
-/* DDF42C 8024011C AE420070 */   sw       $v0, 0x70($s2)
-.L80240120:
-/* DDF430 80240120 0C00EAD2 */  jal       get_npc_safe
-/* DDF434 80240124 2404FFFC */   addiu    $a0, $zero, -4
-/* DDF438 80240128 8E05000C */  lw        $a1, 0xc($s0)
-/* DDF43C 8024012C 0C00ECD0 */  jal       set_npc_yaw
-/* DDF440 80240130 0040202D */   daddu    $a0, $v0, $zero
-/* DDF444 80240134 0200202D */  daddu     $a0, $s0, $zero
-/* DDF448 80240138 8E020000 */  lw        $v0, ($s0)
-/* DDF44C 8024013C 2403FFFB */  addiu     $v1, $zero, -5
-/* DDF450 80240140 00431024 */  and       $v0, $v0, $v1
-/* DDF454 80240144 0C00EAFF */  jal       disable_npc_shadow
-/* DDF458 80240148 AE020000 */   sw       $v0, ($s0)
-/* DDF45C 8024014C 3C01C47A */  lui       $at, 0xc47a
-/* DDF460 80240150 44810000 */  mtc1      $at, $f0
-/* DDF464 80240154 24020002 */  addiu     $v0, $zero, 2
-/* DDF468 80240158 08090059 */  j         .L80240164
-/* DDF46C 8024015C E600003C */   swc1     $f0, 0x3c($s0)
-.L80240160:
-/* DDF470 80240160 0000102D */  daddu     $v0, $zero, $zero
-.L80240164:
-/* DDF474 80240164 8FBF0024 */  lw        $ra, 0x24($sp)
-/* DDF478 80240168 8FB40020 */  lw        $s4, 0x20($sp)
-/* DDF47C 8024016C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* DDF480 80240170 8FB20018 */  lw        $s2, 0x18($sp)
-/* DDF484 80240174 8FB10014 */  lw        $s1, 0x14($sp)
-/* DDF488 80240178 8FB00010 */  lw        $s0, 0x10($sp)
-/* DDF48C 8024017C 03E00008 */  jr        $ra
-/* DDF490 80240180 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s
index ad5c88db77..2caecd9cd1 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s
@@ -13,8 +13,8 @@ glabel func_80240F8C_DE341C
 /* DE343C 80240FAC 8C620000 */  lw        $v0, ($v1)
 /* DE3440 80240FB0 5040000A */  beql      $v0, $zero, .L80240FDC
 /* DE3444 80240FB4 00041080 */   sll      $v0, $a0, 2
-/* DE3448 80240FB8 3C058024 */  lui       $a1, %hi(func_80243220_DC04D0)
-/* DE344C 80240FBC 24A53220 */  addiu     $a1, $a1, %lo(func_80243220_DC04D0)
+/* DE3448 80240FB8 3C058024 */  lui       $a1, %hi(flo_10_npcSettings_80243220)
+/* DE344C 80240FBC 24A53220 */  addiu     $a1, $a1, %lo(flo_10_npcSettings_80243220)
 .L80240FC0:
 /* DE3450 80240FC0 24630004 */  addiu     $v1, $v1, 4
 /* DE3454 80240FC4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240F8C_DE341C
 /* DE3464 80240FD4 24A50004 */   addiu    $a1, $a1, 4
 /* DE3468 80240FD8 00041080 */  sll       $v0, $a0, 2
 .L80240FDC:
-/* DE346C 80240FDC 3C018024 */  lui       $at, %hi(func_80243220_DC04D0)
+/* DE346C 80240FDC 3C018024 */  lui       $at, %hi(flo_10_npcSettings_80243220)
 /* DE3470 80240FE0 00220821 */  addu      $at, $at, $v0
-/* DE3474 80240FE4 AC203220 */  sw        $zero, %lo(func_80243220_DC04D0)($at)
+/* DE3474 80240FE4 AC203220 */  sw        $zero, %lo(flo_10_npcSettings_80243220)($at)
 /* DE3478 80240FE8 08090406 */  j         .L80241018
 /* DE347C 80240FEC 00000000 */   nop
 .L80240FF0:
-/* DE3480 80240FF0 3C038024 */  lui       $v1, %hi(func_80243220_DC04D0)
-/* DE3484 80240FF4 24633220 */  addiu     $v1, $v1, %lo(func_80243220_DC04D0)
+/* DE3480 80240FF0 3C038024 */  lui       $v1, %hi(flo_10_npcSettings_80243220)
+/* DE3484 80240FF4 24633220 */  addiu     $v1, $v1, %lo(flo_10_npcSettings_80243220)
 /* DE3488 80240FF8 0060282D */  daddu     $a1, $v1, $zero
 .L80240FFC:
 /* DE348C 80240FFC 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s b/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s
deleted file mode 100644
index 293ff21dec..0000000000
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240380_AACBB0
-/* AACBB0 80240380 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* AACBB4 80240384 AFB10014 */  sw        $s1, 0x14($sp)
-/* AACBB8 80240388 0080882D */  daddu     $s1, $a0, $zero
-/* AACBBC 8024038C AFBF001C */  sw        $ra, 0x1c($sp)
-/* AACBC0 80240390 AFB20018 */  sw        $s2, 0x18($sp)
-/* AACBC4 80240394 AFB00010 */  sw        $s0, 0x10($sp)
-/* AACBC8 80240398 8E30000C */  lw        $s0, 0xc($s1)
-/* AACBCC 8024039C 8E050000 */  lw        $a1, ($s0)
-/* AACBD0 802403A0 0C0B1EAF */  jal       get_variable
-/* AACBD4 802403A4 26100004 */   addiu    $s0, $s0, 4
-/* AACBD8 802403A8 8E050000 */  lw        $a1, ($s0)
-/* AACBDC 802403AC 26100004 */  addiu     $s0, $s0, 4
-/* AACBE0 802403B0 0220202D */  daddu     $a0, $s1, $zero
-/* AACBE4 802403B4 0C0B1EAF */  jal       get_variable
-/* AACBE8 802403B8 0040902D */   daddu    $s2, $v0, $zero
-/* AACBEC 802403BC 0220202D */  daddu     $a0, $s1, $zero
-/* AACBF0 802403C0 8E050000 */  lw        $a1, ($s0)
-/* AACBF4 802403C4 0C0B1EAF */  jal       get_variable
-/* AACBF8 802403C8 0040802D */   daddu    $s0, $v0, $zero
-/* AACBFC 802403CC 0040882D */  daddu     $s1, $v0, $zero
-/* AACC00 802403D0 2402FFFF */  addiu     $v0, $zero, -1
-/* AACC04 802403D4 16020005 */  bne       $s0, $v0, .L802403EC
-/* AACC08 802403D8 24020001 */   addiu    $v0, $zero, 1
-/* AACC0C 802403DC 0C04760B */  jal       func_8011D82C
-/* AACC10 802403E0 0220202D */   daddu    $a0, $s1, $zero
-/* AACC14 802403E4 08090123 */  j         .L8024048C
-/* AACC18 802403E8 24020002 */   addiu    $v0, $zero, 2
-.L802403EC:
-/* AACC1C 802403EC 12420018 */  beq       $s2, $v0, .L80240450
-/* AACC20 802403F0 2A420002 */   slti     $v0, $s2, 2
-/* AACC24 802403F4 10400005 */  beqz      $v0, .L8024040C
-/* AACC28 802403F8 24020002 */   addiu    $v0, $zero, 2
-/* AACC2C 802403FC 12400007 */  beqz      $s2, .L8024041C
-/* AACC30 80240400 3412FFFF */   ori      $s2, $zero, 0xffff
-/* AACC34 80240404 08090123 */  j         .L8024048C
-/* AACC38 80240408 00000000 */   nop
-.L8024040C:
-/* AACC3C 8024040C 1242001B */  beq       $s2, $v0, .L8024047C
-/* AACC40 80240410 24020002 */   addiu    $v0, $zero, 2
-/* AACC44 80240414 08090123 */  j         .L8024048C
-/* AACC48 80240418 00000000 */   nop
-.L8024041C:
-/* AACC4C 8024041C 8E040000 */  lw        $a0, ($s0)
-/* AACC50 80240420 1092001A */  beq       $a0, $s2, .L8024048C
-/* AACC54 80240424 24020002 */   addiu    $v0, $zero, 2
-/* AACC58 80240428 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* AACC5C 8024042C 26100004 */   addiu    $s0, $s0, 4
-/* AACC60 80240430 0C046B4C */  jal       get_model_from_list_index
-/* AACC64 80240434 0040202D */   daddu    $a0, $v0, $zero
-/* AACC68 80240438 0040202D */  daddu     $a0, $v0, $zero
-/* AACC6C 8024043C 2405FFFF */  addiu     $a1, $zero, -1
-/* AACC70 80240440 0C046F1F */  jal       func_8011BC7C
-/* AACC74 80240444 0220302D */   daddu    $a2, $s1, $zero
-/* AACC78 80240448 08090107 */  j         .L8024041C
-/* AACC7C 8024044C 00000000 */   nop
-.L80240450:
-/* AACC80 80240450 3412FFFF */  ori       $s2, $zero, 0xffff
-.L80240454:
-/* AACC84 80240454 8E020000 */  lw        $v0, ($s0)
-/* AACC88 80240458 1052000B */  beq       $v0, $s2, .L80240488
-/* AACC8C 8024045C 2405FFFF */   addiu    $a1, $zero, -1
-/* AACC90 80240460 96040002 */  lhu       $a0, 2($s0)
-/* AACC94 80240464 0220302D */  daddu     $a2, $s1, $zero
-/* AACC98 80240468 26100004 */  addiu     $s0, $s0, 4
-/* AACC9C 8024046C 0C046E54 */  jal       func_8011B950
-/* AACCA0 80240470 0000382D */   daddu    $a3, $zero, $zero
-/* AACCA4 80240474 08090115 */  j         .L80240454
-/* AACCA8 80240478 00000000 */   nop
-.L8024047C:
-/* AACCAC 8024047C 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* AACCB0 80240480 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* AACCB4 80240484 A0510000 */  sb        $s1, ($v0)
-.L80240488:
-/* AACCB8 80240488 24020002 */  addiu     $v0, $zero, 2
-.L8024048C:
-/* AACCBC 8024048C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* AACCC0 80240490 8FB20018 */  lw        $s2, 0x18($sp)
-/* AACCC4 80240494 8FB10014 */  lw        $s1, 0x14($sp)
-/* AACCC8 80240498 8FB00010 */  lw        $s0, 0x10($sp)
-/* AACCCC 8024049C 03E00008 */  jr        $ra
-/* AACCD0 802404A0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802404A4_AACCD4.s b/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802404A4_AACCD4.s
deleted file mode 100644
index 901b5bc7ed..0000000000
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802404A4_AACCD4.s
+++ /dev/null
@@ -1,126 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404A4_AACCD4
-/* AACCD4 802404A4 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* AACCD8 802404A8 AFB10034 */  sw        $s1, 0x34($sp)
-/* AACCDC 802404AC 0080882D */  daddu     $s1, $a0, $zero
-/* AACCE0 802404B0 AFBF0054 */  sw        $ra, 0x54($sp)
-/* AACCE4 802404B4 AFBE0050 */  sw        $fp, 0x50($sp)
-/* AACCE8 802404B8 AFB7004C */  sw        $s7, 0x4c($sp)
-/* AACCEC 802404BC AFB60048 */  sw        $s6, 0x48($sp)
-/* AACCF0 802404C0 AFB50044 */  sw        $s5, 0x44($sp)
-/* AACCF4 802404C4 AFB40040 */  sw        $s4, 0x40($sp)
-/* AACCF8 802404C8 AFB3003C */  sw        $s3, 0x3c($sp)
-/* AACCFC 802404CC AFB20038 */  sw        $s2, 0x38($sp)
-/* AACD00 802404D0 AFB00030 */  sw        $s0, 0x30($sp)
-/* AACD04 802404D4 8E30000C */  lw        $s0, 0xc($s1)
-/* AACD08 802404D8 8E050000 */  lw        $a1, ($s0)
-/* AACD0C 802404DC 0C0B1EAF */  jal       get_variable
-/* AACD10 802404E0 26100004 */   addiu    $s0, $s0, 4
-/* AACD14 802404E4 8E050000 */  lw        $a1, ($s0)
-/* AACD18 802404E8 26100004 */  addiu     $s0, $s0, 4
-/* AACD1C 802404EC 0220202D */  daddu     $a0, $s1, $zero
-/* AACD20 802404F0 0C0B1EAF */  jal       get_variable
-/* AACD24 802404F4 0040982D */   daddu    $s3, $v0, $zero
-/* AACD28 802404F8 8E050000 */  lw        $a1, ($s0)
-/* AACD2C 802404FC 26100004 */  addiu     $s0, $s0, 4
-/* AACD30 80240500 0220202D */  daddu     $a0, $s1, $zero
-/* AACD34 80240504 0C0B1EAF */  jal       get_variable
-/* AACD38 80240508 0040B02D */   daddu    $s6, $v0, $zero
-/* AACD3C 8024050C 8E050000 */  lw        $a1, ($s0)
-/* AACD40 80240510 26100004 */  addiu     $s0, $s0, 4
-/* AACD44 80240514 0220202D */  daddu     $a0, $s1, $zero
-/* AACD48 80240518 0C0B1EAF */  jal       get_variable
-/* AACD4C 8024051C 0040A82D */   daddu    $s5, $v0, $zero
-/* AACD50 80240520 8E050000 */  lw        $a1, ($s0)
-/* AACD54 80240524 26100004 */  addiu     $s0, $s0, 4
-/* AACD58 80240528 0220202D */  daddu     $a0, $s1, $zero
-/* AACD5C 8024052C 0C0B1EAF */  jal       get_variable
-/* AACD60 80240530 0040A02D */   daddu    $s4, $v0, $zero
-/* AACD64 80240534 8E050000 */  lw        $a1, ($s0)
-/* AACD68 80240538 26100004 */  addiu     $s0, $s0, 4
-/* AACD6C 8024053C 0220202D */  daddu     $a0, $s1, $zero
-/* AACD70 80240540 0C0B1EAF */  jal       get_variable
-/* AACD74 80240544 0040902D */   daddu    $s2, $v0, $zero
-/* AACD78 80240548 8E050000 */  lw        $a1, ($s0)
-/* AACD7C 8024054C 26100004 */  addiu     $s0, $s0, 4
-/* AACD80 80240550 0220202D */  daddu     $a0, $s1, $zero
-/* AACD84 80240554 0C0B1EAF */  jal       get_variable
-/* AACD88 80240558 AFA20028 */   sw       $v0, 0x28($sp)
-/* AACD8C 8024055C 8E050000 */  lw        $a1, ($s0)
-/* AACD90 80240560 26100004 */  addiu     $s0, $s0, 4
-/* AACD94 80240564 0220202D */  daddu     $a0, $s1, $zero
-/* AACD98 80240568 0C0B1EAF */  jal       get_variable
-/* AACD9C 8024056C 0040F02D */   daddu    $fp, $v0, $zero
-/* AACDA0 80240570 8E050000 */  lw        $a1, ($s0)
-/* AACDA4 80240574 26100004 */  addiu     $s0, $s0, 4
-/* AACDA8 80240578 0220202D */  daddu     $a0, $s1, $zero
-/* AACDAC 8024057C 0C0B1EAF */  jal       get_variable
-/* AACDB0 80240580 0040B82D */   daddu    $s7, $v0, $zero
-/* AACDB4 80240584 0220202D */  daddu     $a0, $s1, $zero
-/* AACDB8 80240588 8E050000 */  lw        $a1, ($s0)
-/* AACDBC 8024058C 0C0B1EAF */  jal       get_variable
-/* AACDC0 80240590 0040802D */   daddu    $s0, $v0, $zero
-/* AACDC4 80240594 0040182D */  daddu     $v1, $v0, $zero
-/* AACDC8 80240598 24020002 */  addiu     $v0, $zero, 2
-/* AACDCC 8024059C 12620012 */  beq       $s3, $v0, .L802405E8
-/* AACDD0 802405A0 2A620003 */   slti     $v0, $s3, 3
-/* AACDD4 802405A4 10400005 */  beqz      $v0, .L802405BC
-/* AACDD8 802405A8 24020001 */   addiu    $v0, $zero, 1
-/* AACDDC 802405AC 12620008 */  beq       $s3, $v0, .L802405D0
-/* AACDE0 802405B0 32C400FF */   andi     $a0, $s6, 0xff
-/* AACDE4 802405B4 08090191 */  j         .L80240644
-/* AACDE8 802405B8 00000000 */   nop
-.L802405BC:
-/* AACDEC 802405BC 24020003 */  addiu     $v0, $zero, 3
-/* AACDF0 802405C0 12620018 */  beq       $s3, $v0, .L80240624
-/* AACDF4 802405C4 32C400FF */   andi     $a0, $s6, 0xff
-/* AACDF8 802405C8 08090191 */  j         .L80240644
-/* AACDFC 802405CC 00000000 */   nop
-.L802405D0:
-/* AACE00 802405D0 32A500FF */  andi      $a1, $s5, 0xff
-/* AACE04 802405D4 328600FF */  andi      $a2, $s4, 0xff
-/* AACE08 802405D8 0C046F97 */  jal       set_background_color_blend
-/* AACE0C 802405DC 324700FF */   andi     $a3, $s2, 0xff
-/* AACE10 802405E0 08090191 */  j         .L80240644
-/* AACE14 802405E4 00000000 */   nop
-.L802405E8:
-/* AACE18 802405E8 32C400FF */  andi      $a0, $s6, 0xff
-/* AACE1C 802405EC 32A500FF */  andi      $a1, $s5, 0xff
-/* AACE20 802405F0 328600FF */  andi      $a2, $s4, 0xff
-/* AACE24 802405F4 324700FF */  andi      $a3, $s2, 0xff
-/* AACE28 802405F8 93A2002B */  lbu       $v0, 0x2b($sp)
-/* AACE2C 802405FC AFB0001C */  sw        $s0, 0x1c($sp)
-/* AACE30 80240600 AFA30020 */  sw        $v1, 0x20($sp)
-/* AACE34 80240604 AFA20010 */  sw        $v0, 0x10($sp)
-/* AACE38 80240608 33C200FF */  andi      $v0, $fp, 0xff
-/* AACE3C 8024060C AFA20014 */  sw        $v0, 0x14($sp)
-/* AACE40 80240610 32E200FF */  andi      $v0, $s7, 0xff
-/* AACE44 80240614 0C046FAD */  jal       func_8011BEB4
-/* AACE48 80240618 AFA20018 */   sw       $v0, 0x18($sp)
-/* AACE4C 8024061C 08090191 */  j         .L80240644
-/* AACE50 80240620 00000000 */   nop
-.L80240624:
-/* AACE54 80240624 32A500FF */  andi      $a1, $s5, 0xff
-/* AACE58 80240628 328600FF */  andi      $a2, $s4, 0xff
-/* AACE5C 8024062C 324700FF */  andi      $a3, $s2, 0xff
-/* AACE60 80240630 93A2002B */  lbu       $v0, 0x2b($sp)
-/* AACE64 80240634 AFA20010 */  sw        $v0, 0x10($sp)
-/* AACE68 80240638 33C200FF */  andi      $v0, $fp, 0xff
-/* AACE6C 8024063C 0C046FE6 */  jal       func_8011BF98
-/* AACE70 80240640 AFA20014 */   sw       $v0, 0x14($sp)
-.L80240644:
-/* AACE74 80240644 8FBF0054 */  lw        $ra, 0x54($sp)
-/* AACE78 80240648 8FBE0050 */  lw        $fp, 0x50($sp)
-/* AACE7C 8024064C 8FB7004C */  lw        $s7, 0x4c($sp)
-/* AACE80 80240650 8FB60048 */  lw        $s6, 0x48($sp)
-/* AACE84 80240654 8FB50044 */  lw        $s5, 0x44($sp)
-/* AACE88 80240658 8FB40040 */  lw        $s4, 0x40($sp)
-/* AACE8C 8024065C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* AACE90 80240660 8FB20038 */  lw        $s2, 0x38($sp)
-/* AACE94 80240664 8FB10034 */  lw        $s1, 0x34($sp)
-/* AACE98 80240668 8FB00030 */  lw        $s0, 0x30($sp)
-/* AACE9C 8024066C 24020002 */  addiu     $v0, $zero, 2
-/* AACEA0 80240670 03E00008 */  jr        $ra
-/* AACEA4 80240674 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241478_D51468.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241478_D51468.s
deleted file mode 100644
index 4d3ddeccf2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241478_D51468.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241478_D51468
-/* D51468 80241478 AC800084 */  sw        $zero, 0x84($a0)
-/* D5146C 8024147C 3C038011 */  lui       $v1, %hi(gPlayerActionState)
-/* D51470 80241480 8063F07C */  lb        $v1, %lo(gPlayerActionState)($v1)
-/* D51474 80241484 2402000E */  addiu     $v0, $zero, 0xe
-/* D51478 80241488 10620004 */  beq       $v1, $v0, .L8024149C
-/* D5147C 8024148C 24020001 */   addiu    $v0, $zero, 1
-/* D51480 80241490 24020010 */  addiu     $v0, $zero, 0x10
-/* D51484 80241494 14620002 */  bne       $v1, $v0, .L802414A0
-/* D51488 80241498 24020001 */   addiu    $v0, $zero, 1
-.L8024149C:
-/* D5148C 8024149C AC820084 */  sw        $v0, 0x84($a0)
-.L802414A0:
-/* D51490 802414A0 03E00008 */  jr        $ra
-/* D51494 802414A4 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s
index c1d7d9a5c0..65e54fd13f 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s
@@ -13,8 +13,8 @@ glabel func_802411D8_D59A68
 /* D59A88 802411F8 8C620000 */  lw        $v0, ($v1)
 /* D59A8C 802411FC 5040000A */  beql      $v0, $zero, .L80241228
 /* D59A90 80241200 00041080 */   sll      $v0, $a0, 2
-/* D59A94 80241204 3C058024 */  lui       $a1, %hi(D_80246A20)
-/* D59A98 80241208 24A56A20 */  addiu     $a1, $a1, %lo(D_80246A20)
+/* D59A94 80241204 3C058024 */  lui       $a1, %hi(pra_09_bss_sym)
+/* D59A98 80241208 24A56A20 */  addiu     $a1, $a1, %lo(pra_09_bss_sym)
 .L8024120C:
 /* D59A9C 8024120C 24630004 */  addiu     $v1, $v1, 4
 /* D59AA0 80241210 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802411D8_D59A68
 /* D59AB0 80241220 24A50004 */   addiu    $a1, $a1, 4
 /* D59AB4 80241224 00041080 */  sll       $v0, $a0, 2
 .L80241228:
-/* D59AB8 80241228 3C018024 */  lui       $at, %hi(D_80246A20)
+/* D59AB8 80241228 3C018024 */  lui       $at, %hi(pra_09_bss_sym)
 /* D59ABC 8024122C 00220821 */  addu      $at, $at, $v0
-/* D59AC0 80241230 AC206A20 */  sw        $zero, %lo(D_80246A20)($at)
+/* D59AC0 80241230 AC206A20 */  sw        $zero, %lo(pra_09_bss_sym)($at)
 /* D59AC4 80241234 08090499 */  j         .L80241264
 /* D59AC8 80241238 00000000 */   nop
 .L8024123C:
-/* D59ACC 8024123C 3C038024 */  lui       $v1, %hi(D_80246A20)
-/* D59AD0 80241240 24636A20 */  addiu     $v1, $v1, %lo(D_80246A20)
+/* D59ACC 8024123C 3C038024 */  lui       $v1, %hi(pra_09_bss_sym)
+/* D59AD0 80241240 24636A20 */  addiu     $v1, $v1, %lo(pra_09_bss_sym)
 /* D59AD4 80241244 0060282D */  daddu     $a1, $v1, $zero
 .L80241248:
 /* D59AD8 80241248 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s
deleted file mode 100644
index b55b14d4bc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A60_CF85D0
-/* CF85D0 80240A60 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF85D4 80240A64 AFBF0014 */  sw        $ra, 0x14($sp)
-/* CF85D8 80240A68 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF85DC 80240A6C 0C00EABB */  jal       get_npc_unsafe
-/* CF85E0 80240A70 8C84014C */   lw       $a0, 0x14c($a0)
-/* CF85E4 80240A74 24040008 */  addiu     $a0, $zero, 8
-/* CF85E8 80240A78 0040802D */  daddu     $s0, $v0, $zero
-/* CF85EC 80240A7C 3C028024 */  lui       $v0, %hi(func_80240ACC_CF863C)
-/* CF85F0 80240A80 24420ACC */  addiu     $v0, $v0, %lo(func_80240ACC_CF863C)
-/* CF85F4 80240A84 0C00AB39 */  jal       heap_malloc
-/* CF85F8 80240A88 AE020008 */   sw       $v0, 8($s0)
-/* CF85FC 80240A8C 0040182D */  daddu     $v1, $v0, $zero
-/* CF8600 80240A90 AE030020 */  sw        $v1, 0x20($s0)
-/* CF8604 80240A94 AC600000 */  sw        $zero, ($v1)
-/* CF8608 80240A98 8FBF0014 */  lw        $ra, 0x14($sp)
-/* CF860C 80240A9C 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF8610 80240AA0 24020001 */  addiu     $v0, $zero, 1
-/* CF8614 80240AA4 03E00008 */  jr        $ra
-/* CF8618 80240AA8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s
deleted file mode 100644
index f527a4ac21..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240ACC_CF863C
-/* CF863C 80240ACC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF8640 80240AD0 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* CF8644 80240AD4 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* CF8648 80240AD8 3C05800B */  lui       $a1, %hi(gCameras)
-/* CF864C 80240ADC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* CF8650 80240AE0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CF8654 80240AE4 00031080 */  sll       $v0, $v1, 2
-/* CF8658 80240AE8 00431021 */  addu      $v0, $v0, $v1
-/* CF865C 80240AEC 00021080 */  sll       $v0, $v0, 2
-/* CF8660 80240AF0 00431023 */  subu      $v0, $v0, $v1
-/* CF8664 80240AF4 000218C0 */  sll       $v1, $v0, 3
-/* CF8668 80240AF8 00431021 */  addu      $v0, $v0, $v1
-/* CF866C 80240AFC 8C830020 */  lw        $v1, 0x20($a0)
-/* CF8670 80240B00 000210C0 */  sll       $v0, $v0, 3
-/* CF8674 80240B04 8C630000 */  lw        $v1, ($v1)
-/* CF8678 80240B08 30630001 */  andi      $v1, $v1, 1
-/* CF867C 80240B0C 10600004 */  beqz      $v1, .L80240B20
-/* CF8680 80240B10 00451021 */   addu     $v0, $v0, $a1
-/* CF8684 80240B14 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* CF8688 80240B18 0C00A6C9 */  jal       clamp_angle
-/* CF868C 80240B1C 46006307 */   neg.s    $f12, $f12
-.L80240B20:
-/* CF8690 80240B20 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF8694 80240B24 03E00008 */  jr        $ra
-/* CF8698 80240B28 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s
deleted file mode 100644
index fa611e4e93..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240C78_CF87E8
-/* CF87E8 80240C78 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CF87EC 80240C7C AFB00010 */  sw        $s0, 0x10($sp)
-/* CF87F0 80240C80 0080802D */  daddu     $s0, $a0, $zero
-/* CF87F4 80240C84 AFBF0020 */  sw        $ra, 0x20($sp)
-/* CF87F8 80240C88 AFB3001C */  sw        $s3, 0x1c($sp)
-/* CF87FC 80240C8C AFB20018 */  sw        $s2, 0x18($sp)
-/* CF8800 80240C90 10A00009 */  beqz      $a1, .L80240CB8
-/* CF8804 80240C94 AFB10014 */   sw       $s1, 0x14($sp)
-/* CF8808 80240C98 0000202D */  daddu     $a0, $zero, $zero
-/* CF880C 80240C9C 0080282D */  daddu     $a1, $a0, $zero
-/* CF8810 80240CA0 0080302D */  daddu     $a2, $a0, $zero
-/* CF8814 80240CA4 0C046F97 */  jal       set_background_color_blend
-/* CF8818 80240CA8 240700FF */   addiu    $a3, $zero, 0xff
-/* CF881C 80240CAC 240200FF */  addiu     $v0, $zero, 0xff
-/* CF8820 80240CB0 AE020070 */  sw        $v0, 0x70($s0)
-/* CF8824 80240CB4 AE000074 */  sw        $zero, 0x74($s0)
-.L80240CB8:
-/* CF8828 80240CB8 8E020070 */  lw        $v0, 0x70($s0)
-/* CF882C 80240CBC 2442FFF8 */  addiu     $v0, $v0, -8
-/* CF8830 80240CC0 04410002 */  bgez      $v0, .L80240CCC
-/* CF8834 80240CC4 AE020070 */   sw       $v0, 0x70($s0)
-/* CF8838 80240CC8 AE000070 */  sw        $zero, 0x70($s0)
-.L80240CCC:
-/* CF883C 80240CCC 0000202D */  daddu     $a0, $zero, $zero
-/* CF8840 80240CD0 0080282D */  daddu     $a1, $a0, $zero
-/* CF8844 80240CD4 92070073 */  lbu       $a3, 0x73($s0)
-/* CF8848 80240CD8 0C046F97 */  jal       set_background_color_blend
-/* CF884C 80240CDC 0080302D */   daddu    $a2, $a0, $zero
-/* CF8850 80240CE0 8E020070 */  lw        $v0, 0x70($s0)
-/* CF8854 80240CE4 14400006 */  bnez      $v0, .L80240D00
-/* CF8858 80240CE8 00000000 */   nop
-/* CF885C 80240CEC 8E020074 */  lw        $v0, 0x74($s0)
-/* CF8860 80240CF0 14400003 */  bnez      $v0, .L80240D00
-/* CF8864 80240CF4 24020001 */   addiu    $v0, $zero, 1
-/* CF8868 80240CF8 08090373 */  j         .L80240DCC
-/* CF886C 80240CFC AE020074 */   sw       $v0, 0x74($s0)
-.L80240D00:
-/* CF8870 80240D00 8E030074 */  lw        $v1, 0x74($s0)
-/* CF8874 80240D04 24020001 */  addiu     $v0, $zero, 1
-/* CF8878 80240D08 14620031 */  bne       $v1, $v0, .L80240DD0
-/* CF887C 80240D0C 0000102D */   daddu    $v0, $zero, $zero
-/* CF8880 80240D10 0C04760B */  jal       func_8011D82C
-/* CF8884 80240D14 0000202D */   daddu    $a0, $zero, $zero
-/* CF8888 80240D18 0000802D */  daddu     $s0, $zero, $zero
-/* CF888C 80240D1C 2413FFFC */  addiu     $s3, $zero, -4
-/* CF8890 80240D20 2412000E */  addiu     $s2, $zero, 0xe
-/* CF8894 80240D24 3C11FF7F */  lui       $s1, 0xff7f
-/* CF8898 80240D28 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* CF889C 80240D2C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* CF88A0 80240D30 3631FFFF */  ori       $s1, $s1, 0xffff
-/* CF88A4 80240D34 A0400000 */  sb        $zero, ($v0)
-.L80240D38:
-/* CF88A8 80240D38 0C00E2B7 */  jal       get_npc_by_index
-/* CF88AC 80240D3C 0200202D */   daddu    $a0, $s0, $zero
-/* CF88B0 80240D40 0040202D */  daddu     $a0, $v0, $zero
-/* CF88B4 80240D44 5080000B */  beql      $a0, $zero, .L80240D74
-/* CF88B8 80240D48 26100001 */   addiu    $s0, $s0, 1
-/* CF88BC 80240D4C 8C820000 */  lw        $v0, ($a0)
-/* CF88C0 80240D50 50400008 */  beql      $v0, $zero, .L80240D74
-/* CF88C4 80240D54 26100001 */   addiu    $s0, $s0, 1
-/* CF88C8 80240D58 808300A4 */  lb        $v1, 0xa4($a0)
-/* CF88CC 80240D5C 10730005 */  beq       $v1, $s3, .L80240D74
-/* CF88D0 80240D60 26100001 */   addiu    $s0, $s0, 1
-/* CF88D4 80240D64 10720003 */  beq       $v1, $s2, .L80240D74
-/* CF88D8 80240D68 00000000 */   nop
-/* CF88DC 80240D6C 00511024 */  and       $v0, $v0, $s1
-/* CF88E0 80240D70 AC820000 */  sw        $v0, ($a0)
-.L80240D74:
-/* CF88E4 80240D74 2A020040 */  slti      $v0, $s0, 0x40
-/* CF88E8 80240D78 1440FFEF */  bnez      $v0, .L80240D38
-/* CF88EC 80240D7C 00000000 */   nop
-/* CF88F0 80240D80 0000802D */  daddu     $s0, $zero, $zero
-/* CF88F4 80240D84 3C11F7FF */  lui       $s1, 0xf7ff
-/* CF88F8 80240D88 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80240D8C:
-/* CF88FC 80240D8C 0C04C3D6 */  jal       get_item_entity
-/* CF8900 80240D90 0200202D */   daddu    $a0, $s0, $zero
-/* CF8904 80240D94 0040182D */  daddu     $v1, $v0, $zero
-/* CF8908 80240D98 10600007 */  beqz      $v1, .L80240DB8
-/* CF890C 80240D9C 26100001 */   addiu    $s0, $s0, 1
-/* CF8910 80240DA0 8C640000 */  lw        $a0, ($v1)
-/* CF8914 80240DA4 30820010 */  andi      $v0, $a0, 0x10
-/* CF8918 80240DA8 10400003 */  beqz      $v0, .L80240DB8
-/* CF891C 80240DAC 00000000 */   nop
-/* CF8920 80240DB0 00911024 */  and       $v0, $a0, $s1
-/* CF8924 80240DB4 AC620000 */  sw        $v0, ($v1)
-.L80240DB8:
-/* CF8928 80240DB8 2A020100 */  slti      $v0, $s0, 0x100
-/* CF892C 80240DBC 1440FFF3 */  bnez      $v0, .L80240D8C
-/* CF8930 80240DC0 24020002 */   addiu    $v0, $zero, 2
-/* CF8934 80240DC4 08090374 */  j         .L80240DD0
-/* CF8938 80240DC8 00000000 */   nop
-.L80240DCC:
-/* CF893C 80240DCC 0000102D */  daddu     $v0, $zero, $zero
-.L80240DD0:
-/* CF8940 80240DD0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* CF8944 80240DD4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* CF8948 80240DD8 8FB20018 */  lw        $s2, 0x18($sp)
-/* CF894C 80240DDC 8FB10014 */  lw        $s1, 0x14($sp)
-/* CF8950 80240DE0 8FB00010 */  lw        $s0, 0x10($sp)
-/* CF8954 80240DE4 03E00008 */  jr        $ra
-/* CF8958 80240DE8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240034_D05764.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240034_D05764.s
deleted file mode 100644
index dead250d1d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240034_D05764.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_D05764
-/* D05764 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* D05768 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* D0576C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D05770 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* D05774 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* D05778 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D0577C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* D05780 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* D05784 80240054 24020002 */   addiu    $v0, $zero, 2
-/* D05788 80240058 08090038 */  j         .L802400E0
-/* D0578C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* D05790 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* D05794 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* D05798 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* D0579C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* D057A0 80240070 04420001 */  bltzl     $v0, .L80240078
-/* D057A4 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* D057A8 80240078 14400003 */  bnez      $v0, .L80240088
-/* D057AC 8024007C 00000000 */   nop
-/* D057B0 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* D057B4 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* D057B8 80240088 44822000 */  mtc1      $v0, $f4
-/* D057BC 8024008C 00000000 */  nop
-/* D057C0 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* D057C4 80240094 44062000 */  mfc1      $a2, $f4
-/* D057C8 80240098 44872000 */  mtc1      $a3, $f4
-/* D057CC 8024009C 00000000 */  nop
-/* D057D0 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* D057D4 802400A4 44806000 */  mtc1      $zero, $f12
-/* D057D8 802400A8 44072000 */  mfc1      $a3, $f4
-/* D057DC 802400AC 0C00A720 */  jal       atan2
-/* D057E0 802400B0 46006386 */   mov.s    $f14, $f12
-/* D057E4 802400B4 3C014270 */  lui       $at, 0x4270
-/* D057E8 802400B8 44811000 */  mtc1      $at, $f2
-/* D057EC 802400BC 00000000 */  nop
-/* D057F0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* D057F4 802400C4 00000000 */  nop
-/* D057F8 802400C8 45000004 */  bc1f      .L802400DC
-/* D057FC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* D05800 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* D05804 802400D4 08090038 */  j         .L802400E0
-/* D05808 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* D0580C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* D05810 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D05814 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D05818 802400E8 03E00008 */  jr        $ra
-/* D0581C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s
deleted file mode 100644
index 8e34f8ae87..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240878_D05FA8.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240878_D05FA8
-/* D05FA8 80240878 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D05FAC 8024087C AFB10014 */  sw        $s1, 0x14($sp)
-/* D05FB0 80240880 0080882D */  daddu     $s1, $a0, $zero
-/* D05FB4 80240884 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D05FB8 80240888 AFB00010 */  sw        $s0, 0x10($sp)
-/* D05FBC 8024088C 8E30000C */  lw        $s0, 0xc($s1)
-/* D05FC0 80240890 8E050000 */  lw        $a1, ($s0)
-/* D05FC4 80240894 0C0B1EAF */  jal       get_variable
-/* D05FC8 80240898 26100004 */   addiu    $s0, $s0, 4
-/* D05FCC 8024089C 0220202D */  daddu     $a0, $s1, $zero
-/* D05FD0 802408A0 8E050000 */  lw        $a1, ($s0)
-/* D05FD4 802408A4 0C0B1EAF */  jal       get_variable
-/* D05FD8 802408A8 0040882D */   daddu    $s1, $v0, $zero
-/* D05FDC 802408AC 0000202D */  daddu     $a0, $zero, $zero
-/* D05FE0 802408B0 0080282D */  daddu     $a1, $a0, $zero
-/* D05FE4 802408B4 0040802D */  daddu     $s0, $v0, $zero
-/* D05FE8 802408B8 240600BE */  addiu     $a2, $zero, 0xbe
-/* D05FEC 802408BC 0C04DF93 */  jal       set_transition_stencil_center
-/* D05FF0 802408C0 24070091 */   addiu    $a3, $zero, 0x91
-/* D05FF4 802408C4 44900000 */  mtc1      $s0, $f0
-/* D05FF8 802408C8 00000000 */  nop
-/* D05FFC 802408CC 46800020 */  cvt.s.w   $f0, $f0
-/* D06000 802408D0 44050000 */  mfc1      $a1, $f0
-/* D06004 802408D4 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* D06008 802408D8 322400FF */   andi     $a0, $s1, 0xff
-/* D0600C 802408DC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D06010 802408E0 8FB10014 */  lw        $s1, 0x14($sp)
-/* D06014 802408E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* D06018 802408E8 24020002 */  addiu     $v0, $zero, 2
-/* D0601C 802408EC 03E00008 */  jr        $ra
-/* D06020 802408F0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s
deleted file mode 100644
index 7e6971379f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802408F4_D06024
-/* D06024 802408F4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D06028 802408F8 AFB10014 */  sw        $s1, 0x14($sp)
-/* D0602C 802408FC 0080882D */  daddu     $s1, $a0, $zero
-/* D06030 80240900 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D06034 80240904 AFB00010 */  sw        $s0, 0x10($sp)
-/* D06038 80240908 8E30000C */  lw        $s0, 0xc($s1)
-/* D0603C 8024090C 8E050000 */  lw        $a1, ($s0)
-/* D06040 80240910 0C0B1EAF */  jal       get_variable
-/* D06044 80240914 26100004 */   addiu    $s0, $s0, 4
-/* D06048 80240918 0220202D */  daddu     $a0, $s1, $zero
-/* D0604C 8024091C 8E050000 */  lw        $a1, ($s0)
-/* D06050 80240920 0C0B1EAF */  jal       get_variable
-/* D06054 80240924 0040802D */   daddu    $s0, $v0, $zero
-/* D06058 80240928 44820000 */  mtc1      $v0, $f0
-/* D0605C 8024092C 00000000 */  nop
-/* D06060 80240930 46800020 */  cvt.s.w   $f0, $f0
-/* D06064 80240934 24020002 */  addiu     $v0, $zero, 2
-/* D06068 80240938 00501804 */  sllv      $v1, $s0, $v0
-/* D0606C 8024093C 00701821 */  addu      $v1, $v1, $s0
-/* D06070 80240940 00431804 */  sllv      $v1, $v1, $v0
-/* D06074 80240944 00701823 */  subu      $v1, $v1, $s0
-/* D06078 80240948 000320C0 */  sll       $a0, $v1, 3
-/* D0607C 8024094C 00641821 */  addu      $v1, $v1, $a0
-/* D06080 80240950 000318C0 */  sll       $v1, $v1, 3
-/* D06084 80240954 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* D06088 80240958 00230821 */  addu      $at, $at, $v1
-/* D0608C 8024095C E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* D06090 80240960 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D06094 80240964 8FB10014 */  lw        $s1, 0x14($sp)
-/* D06098 80240968 8FB00010 */  lw        $s0, 0x10($sp)
-/* D0609C 8024096C 03E00008 */  jr        $ra
-/* D060A0 80240970 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409F0_D06120.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409F0_D06120.s
deleted file mode 100644
index 750e77f96d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409F0_D06120.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802409F0_D06120
-/* D06120 802409F0 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* D06124 802409F4 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* D06128 802409F8 AC800088 */  sw        $zero, 0x88($a0)
-/* D0612C 802409FC 80A30003 */  lb        $v1, 3($a1)
-/* D06130 80240A00 80A20002 */  lb        $v0, 2($a1)
-/* D06134 80240A04 1462000B */  bne       $v1, $v0, .L80240A34
-/* D06138 80240A08 00A0302D */   daddu    $a2, $a1, $zero
-/* D0613C 80240A0C 80A30006 */  lb        $v1, 6($a1)
-/* D06140 80240A10 80A20005 */  lb        $v0, 5($a1)
-/* D06144 80240A14 14620007 */  bne       $v1, $v0, .L80240A34
-/* D06148 80240A18 00000000 */   nop
-/* D0614C 80240A1C 80C2028E */  lb        $v0, 0x28e($a2)
-/* D06150 80240A20 84C30290 */  lh        $v1, 0x290($a2)
-/* D06154 80240A24 00021200 */  sll       $v0, $v0, 8
-/* D06158 80240A28 14620004 */  bne       $v1, $v0, .L80240A3C
-/* D0615C 80240A2C 24020001 */   addiu    $v0, $zero, 1
-/* D06160 80240A30 AC820088 */  sw        $v0, 0x88($a0)
-.L80240A34:
-/* D06164 80240A34 03E00008 */  jr        $ra
-/* D06168 80240A38 24020002 */   addiu    $v0, $zero, 2
-.L80240A3C:
-/* D0616C 80240A3C 03E00008 */  jr        $ra
-/* D06170 80240A40 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240A44_D06174.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240A44_D06174.s
deleted file mode 100644
index 50ce266bd5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240A44_D06174.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A44_D06174
-/* D06174 80240A44 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D06178 80240A48 AFB10014 */  sw        $s1, 0x14($sp)
-/* D0617C 80240A4C 0080882D */  daddu     $s1, $a0, $zero
-/* D06180 80240A50 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D06184 80240A54 AFB20018 */  sw        $s2, 0x18($sp)
-/* D06188 80240A58 AFB00010 */  sw        $s0, 0x10($sp)
-/* D0618C 80240A5C 8E30000C */  lw        $s0, 0xc($s1)
-/* D06190 80240A60 8E050000 */  lw        $a1, ($s0)
-/* D06194 80240A64 0C0B1EAF */  jal       get_variable
-/* D06198 80240A68 26100004 */   addiu    $s0, $s0, 4
-/* D0619C 80240A6C 8E050000 */  lw        $a1, ($s0)
-/* D061A0 80240A70 26100004 */  addiu     $s0, $s0, 4
-/* D061A4 80240A74 0220202D */  daddu     $a0, $s1, $zero
-/* D061A8 80240A78 0C0B1EAF */  jal       get_variable
-/* D061AC 80240A7C 0040902D */   daddu    $s2, $v0, $zero
-/* D061B0 80240A80 0220202D */  daddu     $a0, $s1, $zero
-/* D061B4 80240A84 8E050000 */  lw        $a1, ($s0)
-/* D061B8 80240A88 0C0B1EAF */  jal       get_variable
-/* D061BC 80240A8C 0040802D */   daddu    $s0, $v0, $zero
-/* D061C0 80240A90 0000202D */  daddu     $a0, $zero, $zero
-/* D061C4 80240A94 324500FF */  andi      $a1, $s2, 0xff
-/* D061C8 80240A98 320600FF */  andi      $a2, $s0, 0xff
-/* D061CC 80240A9C 0C04DF84 */  jal       set_transition_stencil_color
-/* D061D0 80240AA0 304700FF */   andi     $a3, $v0, 0xff
-/* D061D4 80240AA4 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D061D8 80240AA8 8FB20018 */  lw        $s2, 0x18($sp)
-/* D061DC 80240AAC 8FB10014 */  lw        $s1, 0x14($sp)
-/* D061E0 80240AB0 8FB00010 */  lw        $s0, 0x10($sp)
-/* D061E4 80240AB4 24020002 */  addiu     $v0, $zero, 2
-/* D061E8 80240AB8 03E00008 */  jr        $ra
-/* D061EC 80240ABC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B24_D06254.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B24_D06254.s
deleted file mode 100644
index 5479636028..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B24_D06254.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B24_D06254
-/* D06254 80240B24 03E00008 */  jr        $ra
-/* D06258 80240B28 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s
deleted file mode 100644
index 390a85d049..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240E8C_D065BC
-/* D065BC 80240E8C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D065C0 80240E90 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D065C4 80240E94 AFB00010 */  sw        $s0, 0x10($sp)
-/* D065C8 80240E98 0C00EABB */  jal       get_npc_unsafe
-/* D065CC 80240E9C 8C84014C */   lw       $a0, 0x14c($a0)
-/* D065D0 80240EA0 24040008 */  addiu     $a0, $zero, 8
-/* D065D4 80240EA4 0040802D */  daddu     $s0, $v0, $zero
-/* D065D8 80240EA8 3C028024 */  lui       $v0, %hi(func_80240EF8_D06628)
-/* D065DC 80240EAC 24420EF8 */  addiu     $v0, $v0, %lo(func_80240EF8_D06628)
-/* D065E0 80240EB0 0C00AB39 */  jal       heap_malloc
-/* D065E4 80240EB4 AE020008 */   sw       $v0, 8($s0)
-/* D065E8 80240EB8 0040182D */  daddu     $v1, $v0, $zero
-/* D065EC 80240EBC AE030020 */  sw        $v1, 0x20($s0)
-/* D065F0 80240EC0 AC600000 */  sw        $zero, ($v1)
-/* D065F4 80240EC4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D065F8 80240EC8 8FB00010 */  lw        $s0, 0x10($sp)
-/* D065FC 80240ECC 24020001 */  addiu     $v0, $zero, 1
-/* D06600 80240ED0 03E00008 */  jr        $ra
-/* D06604 80240ED4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240EF8_D06628.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240EF8_D06628.s
deleted file mode 100644
index f7c37f0e09..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240EF8_D06628.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240EF8_D06628
-/* D06628 80240EF8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D0662C 80240EFC 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* D06630 80240F00 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* D06634 80240F04 3C05800B */  lui       $a1, %hi(gCameras)
-/* D06638 80240F08 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D0663C 80240F0C AFBF0010 */  sw        $ra, 0x10($sp)
-/* D06640 80240F10 00031080 */  sll       $v0, $v1, 2
-/* D06644 80240F14 00431021 */  addu      $v0, $v0, $v1
-/* D06648 80240F18 00021080 */  sll       $v0, $v0, 2
-/* D0664C 80240F1C 00431023 */  subu      $v0, $v0, $v1
-/* D06650 80240F20 000218C0 */  sll       $v1, $v0, 3
-/* D06654 80240F24 00431021 */  addu      $v0, $v0, $v1
-/* D06658 80240F28 8C830020 */  lw        $v1, 0x20($a0)
-/* D0665C 80240F2C 000210C0 */  sll       $v0, $v0, 3
-/* D06660 80240F30 8C630000 */  lw        $v1, ($v1)
-/* D06664 80240F34 30630001 */  andi      $v1, $v1, 1
-/* D06668 80240F38 10600004 */  beqz      $v1, .L80240F4C
-/* D0666C 80240F3C 00451021 */   addu     $v0, $v0, $a1
-/* D06670 80240F40 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* D06674 80240F44 0C00A6C9 */  jal       clamp_angle
-/* D06678 80240F48 46006307 */   neg.s    $f12, $f12
-.L80240F4C:
-/* D0667C 80240F4C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D06680 80240F50 03E00008 */  jr        $ra
-/* D06684 80240F54 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s
deleted file mode 100644
index d660b84b79..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802410A4_D067D4
-/* D067D4 802410A4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D067D8 802410A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* D067DC 802410AC 0080802D */  daddu     $s0, $a0, $zero
-/* D067E0 802410B0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* D067E4 802410B4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D067E8 802410B8 AFB20018 */  sw        $s2, 0x18($sp)
-/* D067EC 802410BC 10A00009 */  beqz      $a1, .L802410E4
-/* D067F0 802410C0 AFB10014 */   sw       $s1, 0x14($sp)
-/* D067F4 802410C4 0000202D */  daddu     $a0, $zero, $zero
-/* D067F8 802410C8 0080282D */  daddu     $a1, $a0, $zero
-/* D067FC 802410CC 0080302D */  daddu     $a2, $a0, $zero
-/* D06800 802410D0 0C046F97 */  jal       set_background_color_blend
-/* D06804 802410D4 240700FF */   addiu    $a3, $zero, 0xff
-/* D06808 802410D8 240200FF */  addiu     $v0, $zero, 0xff
-/* D0680C 802410DC AE020070 */  sw        $v0, 0x70($s0)
-/* D06810 802410E0 AE000074 */  sw        $zero, 0x74($s0)
-.L802410E4:
-/* D06814 802410E4 8E020070 */  lw        $v0, 0x70($s0)
-/* D06818 802410E8 2442FFF8 */  addiu     $v0, $v0, -8
-/* D0681C 802410EC 04410002 */  bgez      $v0, .L802410F8
-/* D06820 802410F0 AE020070 */   sw       $v0, 0x70($s0)
-/* D06824 802410F4 AE000070 */  sw        $zero, 0x70($s0)
-.L802410F8:
-/* D06828 802410F8 0000202D */  daddu     $a0, $zero, $zero
-/* D0682C 802410FC 0080282D */  daddu     $a1, $a0, $zero
-/* D06830 80241100 92070073 */  lbu       $a3, 0x73($s0)
-/* D06834 80241104 0C046F97 */  jal       set_background_color_blend
-/* D06838 80241108 0080302D */   daddu    $a2, $a0, $zero
-/* D0683C 8024110C 8E020070 */  lw        $v0, 0x70($s0)
-/* D06840 80241110 14400006 */  bnez      $v0, .L8024112C
-/* D06844 80241114 00000000 */   nop
-/* D06848 80241118 8E020074 */  lw        $v0, 0x74($s0)
-/* D0684C 8024111C 14400003 */  bnez      $v0, .L8024112C
-/* D06850 80241120 24020001 */   addiu    $v0, $zero, 1
-/* D06854 80241124 0809047E */  j         .L802411F8
-/* D06858 80241128 AE020074 */   sw       $v0, 0x74($s0)
-.L8024112C:
-/* D0685C 8024112C 8E030074 */  lw        $v1, 0x74($s0)
-/* D06860 80241130 24020001 */  addiu     $v0, $zero, 1
-/* D06864 80241134 14620031 */  bne       $v1, $v0, .L802411FC
-/* D06868 80241138 0000102D */   daddu    $v0, $zero, $zero
-/* D0686C 8024113C 0C04760B */  jal       func_8011D82C
-/* D06870 80241140 0000202D */   daddu    $a0, $zero, $zero
-/* D06874 80241144 0000802D */  daddu     $s0, $zero, $zero
-/* D06878 80241148 2413FFFC */  addiu     $s3, $zero, -4
-/* D0687C 8024114C 24120008 */  addiu     $s2, $zero, 8
-/* D06880 80241150 3C11FF7F */  lui       $s1, 0xff7f
-/* D06884 80241154 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* D06888 80241158 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* D0688C 8024115C 3631FFFF */  ori       $s1, $s1, 0xffff
-/* D06890 80241160 A0400000 */  sb        $zero, ($v0)
-.L80241164:
-/* D06894 80241164 0C00E2B7 */  jal       get_npc_by_index
-/* D06898 80241168 0200202D */   daddu    $a0, $s0, $zero
-/* D0689C 8024116C 0040202D */  daddu     $a0, $v0, $zero
-/* D068A0 80241170 5080000B */  beql      $a0, $zero, .L802411A0
-/* D068A4 80241174 26100001 */   addiu    $s0, $s0, 1
-/* D068A8 80241178 8C820000 */  lw        $v0, ($a0)
-/* D068AC 8024117C 50400008 */  beql      $v0, $zero, .L802411A0
-/* D068B0 80241180 26100001 */   addiu    $s0, $s0, 1
-/* D068B4 80241184 808300A4 */  lb        $v1, 0xa4($a0)
-/* D068B8 80241188 10730005 */  beq       $v1, $s3, .L802411A0
-/* D068BC 8024118C 26100001 */   addiu    $s0, $s0, 1
-/* D068C0 80241190 10720003 */  beq       $v1, $s2, .L802411A0
-/* D068C4 80241194 00000000 */   nop
-/* D068C8 80241198 00511024 */  and       $v0, $v0, $s1
-/* D068CC 8024119C AC820000 */  sw        $v0, ($a0)
-.L802411A0:
-/* D068D0 802411A0 2A020040 */  slti      $v0, $s0, 0x40
-/* D068D4 802411A4 1440FFEF */  bnez      $v0, .L80241164
-/* D068D8 802411A8 00000000 */   nop
-/* D068DC 802411AC 0000802D */  daddu     $s0, $zero, $zero
-/* D068E0 802411B0 3C11F7FF */  lui       $s1, 0xf7ff
-/* D068E4 802411B4 3631FFFF */  ori       $s1, $s1, 0xffff
-.L802411B8:
-/* D068E8 802411B8 0C04C3D6 */  jal       get_item_entity
-/* D068EC 802411BC 0200202D */   daddu    $a0, $s0, $zero
-/* D068F0 802411C0 0040182D */  daddu     $v1, $v0, $zero
-/* D068F4 802411C4 10600007 */  beqz      $v1, .L802411E4
-/* D068F8 802411C8 26100001 */   addiu    $s0, $s0, 1
-/* D068FC 802411CC 8C640000 */  lw        $a0, ($v1)
-/* D06900 802411D0 30820010 */  andi      $v0, $a0, 0x10
-/* D06904 802411D4 10400003 */  beqz      $v0, .L802411E4
-/* D06908 802411D8 00000000 */   nop
-/* D0690C 802411DC 00911024 */  and       $v0, $a0, $s1
-/* D06910 802411E0 AC620000 */  sw        $v0, ($v1)
-.L802411E4:
-/* D06914 802411E4 2A020100 */  slti      $v0, $s0, 0x100
-/* D06918 802411E8 1440FFF3 */  bnez      $v0, .L802411B8
-/* D0691C 802411EC 24020002 */   addiu    $v0, $zero, 2
-/* D06920 802411F0 0809047F */  j         .L802411FC
-/* D06924 802411F4 00000000 */   nop
-.L802411F8:
-/* D06928 802411F8 0000102D */  daddu     $v0, $zero, $zero
-.L802411FC:
-/* D0692C 802411FC 8FBF0020 */  lw        $ra, 0x20($sp)
-/* D06930 80241200 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D06934 80241204 8FB20018 */  lw        $s2, 0x18($sp)
-/* D06938 80241208 8FB10014 */  lw        $s1, 0x14($sp)
-/* D0693C 8024120C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D06940 80241210 03E00008 */  jr        $ra
-/* D06944 80241214 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s
deleted file mode 100644
index 9479108da4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F98_D21E28.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F98_D21E28
-/* D21E28 80241F98 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D21E2C 80241F9C AFB10014 */  sw        $s1, 0x14($sp)
-/* D21E30 80241FA0 0080882D */  daddu     $s1, $a0, $zero
-/* D21E34 80241FA4 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D21E38 80241FA8 AFB00010 */  sw        $s0, 0x10($sp)
-/* D21E3C 80241FAC 8E30000C */  lw        $s0, 0xc($s1)
-/* D21E40 80241FB0 8E050000 */  lw        $a1, ($s0)
-/* D21E44 80241FB4 0C0B1EAF */  jal       get_variable
-/* D21E48 80241FB8 26100004 */   addiu    $s0, $s0, 4
-/* D21E4C 80241FBC 0220202D */  daddu     $a0, $s1, $zero
-/* D21E50 80241FC0 8E050000 */  lw        $a1, ($s0)
-/* D21E54 80241FC4 0C0B1EAF */  jal       get_variable
-/* D21E58 80241FC8 0040882D */   daddu    $s1, $v0, $zero
-/* D21E5C 80241FCC 0000202D */  daddu     $a0, $zero, $zero
-/* D21E60 80241FD0 0080282D */  daddu     $a1, $a0, $zero
-/* D21E64 80241FD4 0040802D */  daddu     $s0, $v0, $zero
-/* D21E68 80241FD8 240600BE */  addiu     $a2, $zero, 0xbe
-/* D21E6C 80241FDC 0C04DF93 */  jal       set_transition_stencil_center
-/* D21E70 80241FE0 24070091 */   addiu    $a3, $zero, 0x91
-/* D21E74 80241FE4 44900000 */  mtc1      $s0, $f0
-/* D21E78 80241FE8 00000000 */  nop
-/* D21E7C 80241FEC 46800020 */  cvt.s.w   $f0, $f0
-/* D21E80 80241FF0 44050000 */  mfc1      $a1, $f0
-/* D21E84 80241FF4 0C04DF62 */  jal       set_transition_stencil_zoom_0
-/* D21E88 80241FF8 322400FF */   andi     $a0, $s1, 0xff
-/* D21E8C 80241FFC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D21E90 80242000 8FB10014 */  lw        $s1, 0x14($sp)
-/* D21E94 80242004 8FB00010 */  lw        $s0, 0x10($sp)
-/* D21E98 80242008 24020002 */  addiu     $v0, $zero, 2
-/* D21E9C 8024200C 03E00008 */  jr        $ra
-/* D21EA0 80242010 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s
deleted file mode 100644
index ef5d44d749..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242014_D21EA4
-/* D21EA4 80242014 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D21EA8 80242018 AFB10014 */  sw        $s1, 0x14($sp)
-/* D21EAC 8024201C 0080882D */  daddu     $s1, $a0, $zero
-/* D21EB0 80242020 AFBF0018 */  sw        $ra, 0x18($sp)
-/* D21EB4 80242024 AFB00010 */  sw        $s0, 0x10($sp)
-/* D21EB8 80242028 8E30000C */  lw        $s0, 0xc($s1)
-/* D21EBC 8024202C 8E050000 */  lw        $a1, ($s0)
-/* D21EC0 80242030 0C0B1EAF */  jal       get_variable
-/* D21EC4 80242034 26100004 */   addiu    $s0, $s0, 4
-/* D21EC8 80242038 0220202D */  daddu     $a0, $s1, $zero
-/* D21ECC 8024203C 8E050000 */  lw        $a1, ($s0)
-/* D21ED0 80242040 0C0B1EAF */  jal       get_variable
-/* D21ED4 80242044 0040802D */   daddu    $s0, $v0, $zero
-/* D21ED8 80242048 44820000 */  mtc1      $v0, $f0
-/* D21EDC 8024204C 00000000 */  nop
-/* D21EE0 80242050 46800020 */  cvt.s.w   $f0, $f0
-/* D21EE4 80242054 24020002 */  addiu     $v0, $zero, 2
-/* D21EE8 80242058 00501804 */  sllv      $v1, $s0, $v0
-/* D21EEC 8024205C 00701821 */  addu      $v1, $v1, $s0
-/* D21EF0 80242060 00431804 */  sllv      $v1, $v1, $v0
-/* D21EF4 80242064 00701823 */  subu      $v1, $v1, $s0
-/* D21EF8 80242068 000320C0 */  sll       $a0, $v1, 3
-/* D21EFC 8024206C 00641821 */  addu      $v1, $v1, $a0
-/* D21F00 80242070 000318C0 */  sll       $v1, $v1, 3
-/* D21F04 80242074 3C01800B */  lui       $at, %hi(gCameras+0x18)
-/* D21F08 80242078 00230821 */  addu      $at, $at, $v1
-/* D21F0C 8024207C E4201D98 */  swc1      $f0, %lo(gCameras+0x18)($at)
-/* D21F10 80242080 8FBF0018 */  lw        $ra, 0x18($sp)
-/* D21F14 80242084 8FB10014 */  lw        $s1, 0x14($sp)
-/* D21F18 80242088 8FB00010 */  lw        $s0, 0x10($sp)
-/* D21F1C 8024208C 03E00008 */  jr        $ra
-/* D21F20 80242090 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s
deleted file mode 100644
index e9855183ad..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242110_D21FA0
-/* D21FA0 80242110 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* D21FA4 80242114 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* D21FA8 80242118 AC800088 */  sw        $zero, 0x88($a0)
-/* D21FAC 8024211C 80A30003 */  lb        $v1, 3($a1)
-/* D21FB0 80242120 80A20002 */  lb        $v0, 2($a1)
-/* D21FB4 80242124 1462000B */  bne       $v1, $v0, .L80242154
-/* D21FB8 80242128 00A0302D */   daddu    $a2, $a1, $zero
-/* D21FBC 8024212C 80A30006 */  lb        $v1, 6($a1)
-/* D21FC0 80242130 80A20005 */  lb        $v0, 5($a1)
-/* D21FC4 80242134 14620007 */  bne       $v1, $v0, .L80242154
-/* D21FC8 80242138 00000000 */   nop
-/* D21FCC 8024213C 80C2028E */  lb        $v0, 0x28e($a2)
-/* D21FD0 80242140 84C30290 */  lh        $v1, 0x290($a2)
-/* D21FD4 80242144 00021200 */  sll       $v0, $v0, 8
-/* D21FD8 80242148 14620004 */  bne       $v1, $v0, .L8024215C
-/* D21FDC 8024214C 24020001 */   addiu    $v0, $zero, 1
-/* D21FE0 80242150 AC820088 */  sw        $v0, 0x88($a0)
-.L80242154:
-/* D21FE4 80242154 03E00008 */  jr        $ra
-/* D21FE8 80242158 24020002 */   addiu    $v0, $zero, 2
-.L8024215C:
-/* D21FEC 8024215C 03E00008 */  jr        $ra
-/* D21FF0 80242160 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s
deleted file mode 100644
index bdf07befa3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s
+++ /dev/null
@@ -1,35 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242164_D21FF4
-/* D21FF4 80242164 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* D21FF8 80242168 AFB10014 */  sw        $s1, 0x14($sp)
-/* D21FFC 8024216C 0080882D */  daddu     $s1, $a0, $zero
-/* D22000 80242170 AFBF001C */  sw        $ra, 0x1c($sp)
-/* D22004 80242174 AFB20018 */  sw        $s2, 0x18($sp)
-/* D22008 80242178 AFB00010 */  sw        $s0, 0x10($sp)
-/* D2200C 8024217C 8E30000C */  lw        $s0, 0xc($s1)
-/* D22010 80242180 8E050000 */  lw        $a1, ($s0)
-/* D22014 80242184 0C0B1EAF */  jal       get_variable
-/* D22018 80242188 26100004 */   addiu    $s0, $s0, 4
-/* D2201C 8024218C 8E050000 */  lw        $a1, ($s0)
-/* D22020 80242190 26100004 */  addiu     $s0, $s0, 4
-/* D22024 80242194 0220202D */  daddu     $a0, $s1, $zero
-/* D22028 80242198 0C0B1EAF */  jal       get_variable
-/* D2202C 8024219C 0040902D */   daddu    $s2, $v0, $zero
-/* D22030 802421A0 0220202D */  daddu     $a0, $s1, $zero
-/* D22034 802421A4 8E050000 */  lw        $a1, ($s0)
-/* D22038 802421A8 0C0B1EAF */  jal       get_variable
-/* D2203C 802421AC 0040802D */   daddu    $s0, $v0, $zero
-/* D22040 802421B0 0000202D */  daddu     $a0, $zero, $zero
-/* D22044 802421B4 324500FF */  andi      $a1, $s2, 0xff
-/* D22048 802421B8 320600FF */  andi      $a2, $s0, 0xff
-/* D2204C 802421BC 0C04DF84 */  jal       set_transition_stencil_color
-/* D22050 802421C0 304700FF */   andi     $a3, $v0, 0xff
-/* D22054 802421C4 8FBF001C */  lw        $ra, 0x1c($sp)
-/* D22058 802421C8 8FB20018 */  lw        $s2, 0x18($sp)
-/* D2205C 802421CC 8FB10014 */  lw        $s1, 0x14($sp)
-/* D22060 802421D0 8FB00010 */  lw        $s0, 0x10($sp)
-/* D22064 802421D4 24020002 */  addiu     $v0, $zero, 2
-/* D22068 802421D8 03E00008 */  jr        $ra
-/* D2206C 802421DC 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244_D220D4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244_D220D4.s
deleted file mode 100644
index 8d3b467bb1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244_D220D4.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242244_D220D4
-/* D220D4 80242244 03E00008 */  jr        $ra
-/* D220D8 80242248 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802400D4_D2FD54.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802400D4_D2FD54.s
deleted file mode 100644
index 908c1f2f39..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802400D4_D2FD54.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802400D4_D2FD54
-/* D2FD54 802400D4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* D2FD58 802400D8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* D2FD5C 802400DC 000420C0 */  sll       $a0, $a0, 3
-/* D2FD60 802400E0 00822021 */  addu      $a0, $a0, $v0
-/* D2FD64 802400E4 90820014 */  lbu       $v0, 0x14($a0)
-/* D2FD68 802400E8 10400009 */  beqz      $v0, .L80240110
-/* D2FD6C 802400EC 00000000 */   nop
-/* D2FD70 802400F0 90820015 */  lbu       $v0, 0x15($a0)
-/* D2FD74 802400F4 00022600 */  sll       $a0, $v0, 0x18
-/* D2FD78 802400F8 00041E03 */  sra       $v1, $a0, 0x18
-/* D2FD7C 802400FC 00051400 */  sll       $v0, $a1, 0x10
-/* D2FD80 80240100 00021403 */  sra       $v0, $v0, 0x10
-/* D2FD84 80240104 0043102A */  slt       $v0, $v0, $v1
-/* D2FD88 80240108 10400003 */  beqz      $v0, .L80240118
-/* D2FD8C 8024010C 00000000 */   nop
-.L80240110:
-/* D2FD90 80240110 03E00008 */  jr        $ra
-/* D2FD94 80240114 2402FFFF */   addiu    $v0, $zero, -1
-.L80240118:
-/* D2FD98 80240118 03E00008 */  jr        $ra
-/* D2FD9C 8024011C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s
deleted file mode 100644
index 1ca8e08a15..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240120_D2FDA0
-/* D2FDA0 80240120 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* D2FDA4 80240124 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D2FDA8 80240128 0080982D */  daddu     $s3, $a0, $zero
-/* D2FDAC 8024012C AFB00010 */  sw        $s0, 0x10($sp)
-/* D2FDB0 80240130 24100001 */  addiu     $s0, $zero, 1
-/* D2FDB4 80240134 AFB40020 */  sw        $s4, 0x20($sp)
-/* D2FDB8 80240138 2414FFFF */  addiu     $s4, $zero, -1
-/* D2FDBC 8024013C AFB50024 */  sw        $s5, 0x24($sp)
-/* D2FDC0 80240140 0200A82D */  daddu     $s5, $s0, $zero
-/* D2FDC4 80240144 AFB10014 */  sw        $s1, 0x14($sp)
-/* D2FDC8 80240148 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* D2FDCC 8024014C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* D2FDD0 80240150 AFBF0028 */  sw        $ra, 0x28($sp)
-/* D2FDD4 80240154 AFB20018 */  sw        $s2, 0x18($sp)
-/* D2FDD8 80240158 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* D2FDDC 8024015C 0280182D */  daddu     $v1, $s4, $zero
-/* D2FDE0 80240160 AE630084 */  sw        $v1, 0x84($s3)
-/* D2FDE4 80240164 00021027 */  nor       $v0, $zero, $v0
-/* D2FDE8 80240168 000217C2 */  srl       $v0, $v0, 0x1f
-/* D2FDEC 8024016C 00029400 */  sll       $s2, $v0, 0x10
-.L80240170:
-/* D2FDF0 80240170 92220014 */  lbu       $v0, 0x14($s1)
-/* D2FDF4 80240174 50400008 */  beql      $v0, $zero, .L80240198
-/* D2FDF8 80240178 26100001 */   addiu    $s0, $s0, 1
-/* D2FDFC 8024017C 0200202D */  daddu     $a0, $s0, $zero
-/* D2FE00 80240180 0C090035 */  jal       func_802400D4_D2FD54
-/* D2FE04 80240184 00122C03 */   sra      $a1, $s2, 0x10
-/* D2FE08 80240188 10540003 */  beq       $v0, $s4, .L80240198
-/* D2FE0C 8024018C 26100001 */   addiu    $s0, $s0, 1
-/* D2FE10 80240190 08090069 */  j         .L802401A4
-/* D2FE14 80240194 AE750084 */   sw       $s5, 0x84($s3)
-.L80240198:
-/* D2FE18 80240198 2A02000C */  slti      $v0, $s0, 0xc
-/* D2FE1C 8024019C 1440FFF4 */  bnez      $v0, .L80240170
-/* D2FE20 802401A0 26310008 */   addiu    $s1, $s1, 8
-.L802401A4:
-/* D2FE24 802401A4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* D2FE28 802401A8 8FB50024 */  lw        $s5, 0x24($sp)
-/* D2FE2C 802401AC 8FB40020 */  lw        $s4, 0x20($sp)
-/* D2FE30 802401B0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D2FE34 802401B4 8FB20018 */  lw        $s2, 0x18($sp)
-/* D2FE38 802401B8 8FB10014 */  lw        $s1, 0x14($sp)
-/* D2FE3C 802401BC 8FB00010 */  lw        $s0, 0x10($sp)
-/* D2FE40 802401C0 24020002 */  addiu     $v0, $zero, 2
-/* D2FE44 802401C4 03E00008 */  jr        $ra
-/* D2FE48 802401C8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s
index e904326d04..ff8cb9ff9d 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s
@@ -49,7 +49,7 @@ glabel func_802401CC_D2FE4C
 /* D2FEF8 80240278 AE300108 */  sw        $s0, 0x108($s1)
 /* D2FEFC 8024027C 8C420000 */  lw        $v0, ($v0)
 /* D2FF00 80240280 02E0282D */  daddu     $a1, $s7, $zero
-/* D2FF04 80240284 0C090035 */  jal       func_802400D4_D2FD54
+/* D2FF04 80240284 0C090035 */  jal       sam_08_UnkFunc37
 /* D2FF08 80240288 AE220084 */   sw       $v0, 0x84($s1)
 /* D2FF0C 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* D2FF10 80240290 04800011 */  bltz      $a0, .L802402D8
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240510_D30190.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240510_D30190.s
deleted file mode 100644
index 1438b879de..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240510_D30190.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240510_D30190
-/* D30190 80240510 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D30194 80240514 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D30198 80240518 8C82000C */  lw        $v0, 0xc($a0)
-/* D3019C 8024051C 0C0B1EAF */  jal       get_variable
-/* D301A0 80240520 8C450000 */   lw       $a1, ($v0)
-/* D301A4 80240524 0040202D */  daddu     $a0, $v0, $zero
-/* D301A8 80240528 8C830000 */  lw        $v1, ($a0)
-/* D301AC 8024052C 34630010 */  ori       $v1, $v1, 0x10
-/* D301B0 80240530 AC830000 */  sw        $v1, ($a0)
-/* D301B4 80240534 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D301B8 80240538 24020002 */  addiu     $v0, $zero, 2
-/* D301BC 8024053C 03E00008 */  jr        $ra
-/* D301C0 80240540 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240D08_D30988.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240D08_D30988.s
deleted file mode 100644
index 1cb34cda2c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240D08_D30988.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D08_D30988
-/* D30988 80240D08 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* D3098C 80240D0C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* D30990 80240D10 AC800084 */  sw        $zero, 0x84($a0)
-/* D30994 80240D14 80620000 */  lb        $v0, ($v1)
-/* D30998 80240D18 10400005 */  beqz      $v0, .L80240D30
-/* D3099C 80240D1C 24020003 */   addiu    $v0, $zero, 3
-/* D309A0 80240D20 80630003 */  lb        $v1, 3($v1)
-/* D309A4 80240D24 14620002 */  bne       $v1, $v0, .L80240D30
-/* D309A8 80240D28 24020001 */   addiu    $v0, $zero, 1
-/* D309AC 80240D2C AC820084 */  sw        $v0, 0x84($a0)
-.L80240D30:
-/* D309B0 80240D30 03E00008 */  jr        $ra
-/* D309B4 80240D34 24020002 */   addiu    $v0, $zero, 2
-/* D309B8 80240D38 00000000 */  nop
-/* D309BC 80240D3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s
deleted file mode 100644
index 744ebcdb81..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B30_D3B100
-/* D3B100 80240B30 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3B104 80240B34 AFBF0014 */  sw        $ra, 0x14($sp)
-/* D3B108 80240B38 AFB00010 */  sw        $s0, 0x10($sp)
-/* D3B10C 80240B3C 0C00EABB */  jal       get_npc_unsafe
-/* D3B110 80240B40 8C84014C */   lw       $a0, 0x14c($a0)
-/* D3B114 80240B44 24040008 */  addiu     $a0, $zero, 8
-/* D3B118 80240B48 0040802D */  daddu     $s0, $v0, $zero
-/* D3B11C 80240B4C 3C028024 */  lui       $v0, %hi(func_80240B9C_D3B16C)
-/* D3B120 80240B50 24420B9C */  addiu     $v0, $v0, %lo(func_80240B9C_D3B16C)
-/* D3B124 80240B54 0C00AB39 */  jal       heap_malloc
-/* D3B128 80240B58 AE020008 */   sw       $v0, 8($s0)
-/* D3B12C 80240B5C 0040182D */  daddu     $v1, $v0, $zero
-/* D3B130 80240B60 AE030020 */  sw        $v1, 0x20($s0)
-/* D3B134 80240B64 AC600000 */  sw        $zero, ($v1)
-/* D3B138 80240B68 8FBF0014 */  lw        $ra, 0x14($sp)
-/* D3B13C 80240B6C 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3B140 80240B70 24020001 */  addiu     $v0, $zero, 1
-/* D3B144 80240B74 03E00008 */  jr        $ra
-/* D3B148 80240B78 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B9C_D3B16C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B9C_D3B16C.s
deleted file mode 100644
index b02b3326fb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B9C_D3B16C.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B9C_D3B16C
-/* D3B16C 80240B9C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3B170 80240BA0 3C03800A */  lui       $v1, %hi(gCurrentCamID)
-/* D3B174 80240BA4 8463A634 */  lh        $v1, %lo(gCurrentCamID)($v1)
-/* D3B178 80240BA8 3C05800B */  lui       $a1, %hi(gCameras)
-/* D3B17C 80240BAC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D3B180 80240BB0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D3B184 80240BB4 00031080 */  sll       $v0, $v1, 2
-/* D3B188 80240BB8 00431021 */  addu      $v0, $v0, $v1
-/* D3B18C 80240BBC 00021080 */  sll       $v0, $v0, 2
-/* D3B190 80240BC0 00431023 */  subu      $v0, $v0, $v1
-/* D3B194 80240BC4 000218C0 */  sll       $v1, $v0, 3
-/* D3B198 80240BC8 00431021 */  addu      $v0, $v0, $v1
-/* D3B19C 80240BCC 8C830020 */  lw        $v1, 0x20($a0)
-/* D3B1A0 80240BD0 000210C0 */  sll       $v0, $v0, 3
-/* D3B1A4 80240BD4 8C630000 */  lw        $v1, ($v1)
-/* D3B1A8 80240BD8 30630001 */  andi      $v1, $v1, 1
-/* D3B1AC 80240BDC 10600004 */  beqz      $v1, .L80240BF0
-/* D3B1B0 80240BE0 00451021 */   addu     $v0, $v0, $a1
-/* D3B1B4 80240BE4 C44C006C */  lwc1      $f12, 0x6c($v0)
-/* D3B1B8 80240BE8 0C00A6C9 */  jal       clamp_angle
-/* D3B1BC 80240BEC 46006307 */   neg.s    $f12, $f12
-.L80240BF0:
-/* D3B1C0 80240BF0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D3B1C4 80240BF4 03E00008 */  jr        $ra
-/* D3B1C8 80240BF8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s
deleted file mode 100644
index df292e43ba..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D48_D3B318
-/* D3B318 80240D48 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* D3B31C 80240D4C AFB00010 */  sw        $s0, 0x10($sp)
-/* D3B320 80240D50 0080802D */  daddu     $s0, $a0, $zero
-/* D3B324 80240D54 AFBF0020 */  sw        $ra, 0x20($sp)
-/* D3B328 80240D58 AFB3001C */  sw        $s3, 0x1c($sp)
-/* D3B32C 80240D5C AFB20018 */  sw        $s2, 0x18($sp)
-/* D3B330 80240D60 10A00009 */  beqz      $a1, .L80240D88
-/* D3B334 80240D64 AFB10014 */   sw       $s1, 0x14($sp)
-/* D3B338 80240D68 0000202D */  daddu     $a0, $zero, $zero
-/* D3B33C 80240D6C 0080282D */  daddu     $a1, $a0, $zero
-/* D3B340 80240D70 0080302D */  daddu     $a2, $a0, $zero
-/* D3B344 80240D74 0C046F97 */  jal       set_background_color_blend
-/* D3B348 80240D78 240700FF */   addiu    $a3, $zero, 0xff
-/* D3B34C 80240D7C 240200FF */  addiu     $v0, $zero, 0xff
-/* D3B350 80240D80 AE020070 */  sw        $v0, 0x70($s0)
-/* D3B354 80240D84 AE000074 */  sw        $zero, 0x74($s0)
-.L80240D88:
-/* D3B358 80240D88 8E020070 */  lw        $v0, 0x70($s0)
-/* D3B35C 80240D8C 2442FFF8 */  addiu     $v0, $v0, -8
-/* D3B360 80240D90 04410002 */  bgez      $v0, .L80240D9C
-/* D3B364 80240D94 AE020070 */   sw       $v0, 0x70($s0)
-/* D3B368 80240D98 AE000070 */  sw        $zero, 0x70($s0)
-.L80240D9C:
-/* D3B36C 80240D9C 0000202D */  daddu     $a0, $zero, $zero
-/* D3B370 80240DA0 0080282D */  daddu     $a1, $a0, $zero
-/* D3B374 80240DA4 92070073 */  lbu       $a3, 0x73($s0)
-/* D3B378 80240DA8 0C046F97 */  jal       set_background_color_blend
-/* D3B37C 80240DAC 0080302D */   daddu    $a2, $a0, $zero
-/* D3B380 80240DB0 8E020070 */  lw        $v0, 0x70($s0)
-/* D3B384 80240DB4 14400006 */  bnez      $v0, .L80240DD0
-/* D3B388 80240DB8 00000000 */   nop
-/* D3B38C 80240DBC 8E020074 */  lw        $v0, 0x74($s0)
-/* D3B390 80240DC0 14400003 */  bnez      $v0, .L80240DD0
-/* D3B394 80240DC4 24020001 */   addiu    $v0, $zero, 1
-/* D3B398 80240DC8 080903A7 */  j         .L80240E9C
-/* D3B39C 80240DCC AE020074 */   sw       $v0, 0x74($s0)
-.L80240DD0:
-/* D3B3A0 80240DD0 8E030074 */  lw        $v1, 0x74($s0)
-/* D3B3A4 80240DD4 24020001 */  addiu     $v0, $zero, 1
-/* D3B3A8 80240DD8 14620031 */  bne       $v1, $v0, .L80240EA0
-/* D3B3AC 80240DDC 0000102D */   daddu    $v0, $zero, $zero
-/* D3B3B0 80240DE0 0C04760B */  jal       func_8011D82C
-/* D3B3B4 80240DE4 0000202D */   daddu    $a0, $zero, $zero
-/* D3B3B8 80240DE8 0000802D */  daddu     $s0, $zero, $zero
-/* D3B3BC 80240DEC 2413FFFC */  addiu     $s3, $zero, -4
-/* D3B3C0 80240DF0 24120011 */  addiu     $s2, $zero, 0x11
-/* D3B3C4 80240DF4 3C11FF7F */  lui       $s1, 0xff7f
-/* D3B3C8 80240DF8 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* D3B3CC 80240DFC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* D3B3D0 80240E00 3631FFFF */  ori       $s1, $s1, 0xffff
-/* D3B3D4 80240E04 A0400000 */  sb        $zero, ($v0)
-.L80240E08:
-/* D3B3D8 80240E08 0C00E2B7 */  jal       get_npc_by_index
-/* D3B3DC 80240E0C 0200202D */   daddu    $a0, $s0, $zero
-/* D3B3E0 80240E10 0040202D */  daddu     $a0, $v0, $zero
-/* D3B3E4 80240E14 5080000B */  beql      $a0, $zero, .L80240E44
-/* D3B3E8 80240E18 26100001 */   addiu    $s0, $s0, 1
-/* D3B3EC 80240E1C 8C820000 */  lw        $v0, ($a0)
-/* D3B3F0 80240E20 50400008 */  beql      $v0, $zero, .L80240E44
-/* D3B3F4 80240E24 26100001 */   addiu    $s0, $s0, 1
-/* D3B3F8 80240E28 808300A4 */  lb        $v1, 0xa4($a0)
-/* D3B3FC 80240E2C 10730005 */  beq       $v1, $s3, .L80240E44
-/* D3B400 80240E30 26100001 */   addiu    $s0, $s0, 1
-/* D3B404 80240E34 10720003 */  beq       $v1, $s2, .L80240E44
-/* D3B408 80240E38 00000000 */   nop
-/* D3B40C 80240E3C 00511024 */  and       $v0, $v0, $s1
-/* D3B410 80240E40 AC820000 */  sw        $v0, ($a0)
-.L80240E44:
-/* D3B414 80240E44 2A020040 */  slti      $v0, $s0, 0x40
-/* D3B418 80240E48 1440FFEF */  bnez      $v0, .L80240E08
-/* D3B41C 80240E4C 00000000 */   nop
-/* D3B420 80240E50 0000802D */  daddu     $s0, $zero, $zero
-/* D3B424 80240E54 3C11F7FF */  lui       $s1, 0xf7ff
-/* D3B428 80240E58 3631FFFF */  ori       $s1, $s1, 0xffff
-.L80240E5C:
-/* D3B42C 80240E5C 0C04C3D6 */  jal       get_item_entity
-/* D3B430 80240E60 0200202D */   daddu    $a0, $s0, $zero
-/* D3B434 80240E64 0040182D */  daddu     $v1, $v0, $zero
-/* D3B438 80240E68 10600007 */  beqz      $v1, .L80240E88
-/* D3B43C 80240E6C 26100001 */   addiu    $s0, $s0, 1
-/* D3B440 80240E70 8C640000 */  lw        $a0, ($v1)
-/* D3B444 80240E74 30820010 */  andi      $v0, $a0, 0x10
-/* D3B448 80240E78 10400003 */  beqz      $v0, .L80240E88
-/* D3B44C 80240E7C 00000000 */   nop
-/* D3B450 80240E80 00911024 */  and       $v0, $a0, $s1
-/* D3B454 80240E84 AC620000 */  sw        $v0, ($v1)
-.L80240E88:
-/* D3B458 80240E88 2A020100 */  slti      $v0, $s0, 0x100
-/* D3B45C 80240E8C 1440FFF3 */  bnez      $v0, .L80240E5C
-/* D3B460 80240E90 24020002 */   addiu    $v0, $zero, 2
-/* D3B464 80240E94 080903A8 */  j         .L80240EA0
-/* D3B468 80240E98 00000000 */   nop
-.L80240E9C:
-/* D3B46C 80240E9C 0000102D */  daddu     $v0, $zero, $zero
-.L80240EA0:
-/* D3B470 80240EA0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* D3B474 80240EA4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* D3B478 80240EA8 8FB20018 */  lw        $s2, 0x18($sp)
-/* D3B47C 80240EAC 8FB10014 */  lw        $s1, 0x14($sp)
-/* D3B480 80240EB0 8FB00010 */  lw        $s0, 0x10($sp)
-/* D3B484 80240EB4 03E00008 */  jr        $ra
-/* D3B488 80240EB8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s
deleted file mode 100644
index b54745cd99..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_92A2F0
-/* 92A2F0 80240040 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 92A2F4 80240044 AFB10014 */  sw        $s1, 0x14($sp)
-/* 92A2F8 80240048 0080882D */  daddu     $s1, $a0, $zero
-/* 92A2FC 8024004C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 92A300 80240050 AFB20018 */  sw        $s2, 0x18($sp)
-/* 92A304 80240054 AFB00010 */  sw        $s0, 0x10($sp)
-/* 92A308 80240058 8E30000C */  lw        $s0, 0xc($s1)
-/* 92A30C 8024005C 8E050000 */  lw        $a1, ($s0)
-/* 92A310 80240060 0C0B1EAF */  jal       get_variable
-/* 92A314 80240064 26100004 */   addiu    $s0, $s0, 4
-/* 92A318 80240068 8E050000 */  lw        $a1, ($s0)
-/* 92A31C 8024006C 26100004 */  addiu     $s0, $s0, 4
-/* 92A320 80240070 0220202D */  daddu     $a0, $s1, $zero
-/* 92A324 80240074 0C0B1EAF */  jal       get_variable
-/* 92A328 80240078 0040902D */   daddu    $s2, $v0, $zero
-/* 92A32C 8024007C 0220202D */  daddu     $a0, $s1, $zero
-/* 92A330 80240080 8E050000 */  lw        $a1, ($s0)
-/* 92A334 80240084 0C0B1EAF */  jal       get_variable
-/* 92A338 80240088 0040802D */   daddu    $s0, $v0, $zero
-/* 92A33C 8024008C 0040882D */  daddu     $s1, $v0, $zero
-/* 92A340 80240090 2402FFFF */  addiu     $v0, $zero, -1
-/* 92A344 80240094 16020005 */  bne       $s0, $v0, .L802400AC
-/* 92A348 80240098 24020001 */   addiu    $v0, $zero, 1
-/* 92A34C 8024009C 0C04760B */  jal       func_8011D82C
-/* 92A350 802400A0 0220202D */   daddu    $a0, $s1, $zero
-/* 92A354 802400A4 08090053 */  j         .L8024014C
-/* 92A358 802400A8 24020002 */   addiu    $v0, $zero, 2
-.L802400AC:
-/* 92A35C 802400AC 12420018 */  beq       $s2, $v0, .L80240110
-/* 92A360 802400B0 2A420002 */   slti     $v0, $s2, 2
-/* 92A364 802400B4 10400005 */  beqz      $v0, .L802400CC
-/* 92A368 802400B8 24020002 */   addiu    $v0, $zero, 2
-/* 92A36C 802400BC 12400007 */  beqz      $s2, .L802400DC
-/* 92A370 802400C0 3412FFFF */   ori      $s2, $zero, 0xffff
-/* 92A374 802400C4 08090053 */  j         .L8024014C
-/* 92A378 802400C8 00000000 */   nop
-.L802400CC:
-/* 92A37C 802400CC 1242001B */  beq       $s2, $v0, .L8024013C
-/* 92A380 802400D0 24020002 */   addiu    $v0, $zero, 2
-/* 92A384 802400D4 08090053 */  j         .L8024014C
-/* 92A388 802400D8 00000000 */   nop
-.L802400DC:
-/* 92A38C 802400DC 8E040000 */  lw        $a0, ($s0)
-/* 92A390 802400E0 1092001A */  beq       $a0, $s2, .L8024014C
-/* 92A394 802400E4 24020002 */   addiu    $v0, $zero, 2
-/* 92A398 802400E8 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 92A39C 802400EC 26100004 */   addiu    $s0, $s0, 4
-/* 92A3A0 802400F0 0C046B4C */  jal       get_model_from_list_index
-/* 92A3A4 802400F4 0040202D */   daddu    $a0, $v0, $zero
-/* 92A3A8 802400F8 0040202D */  daddu     $a0, $v0, $zero
-/* 92A3AC 802400FC 2405FFFF */  addiu     $a1, $zero, -1
-/* 92A3B0 80240100 0C046F1F */  jal       func_8011BC7C
-/* 92A3B4 80240104 0220302D */   daddu    $a2, $s1, $zero
-/* 92A3B8 80240108 08090037 */  j         .L802400DC
-/* 92A3BC 8024010C 00000000 */   nop
-.L80240110:
-/* 92A3C0 80240110 3412FFFF */  ori       $s2, $zero, 0xffff
-.L80240114:
-/* 92A3C4 80240114 8E020000 */  lw        $v0, ($s0)
-/* 92A3C8 80240118 1052000B */  beq       $v0, $s2, .L80240148
-/* 92A3CC 8024011C 2405FFFF */   addiu    $a1, $zero, -1
-/* 92A3D0 80240120 96040002 */  lhu       $a0, 2($s0)
-/* 92A3D4 80240124 0220302D */  daddu     $a2, $s1, $zero
-/* 92A3D8 80240128 26100004 */  addiu     $s0, $s0, 4
-/* 92A3DC 8024012C 0C046E54 */  jal       func_8011B950
-/* 92A3E0 80240130 0000382D */   daddu    $a3, $zero, $zero
-/* 92A3E4 80240134 08090045 */  j         .L80240114
-/* 92A3E8 80240138 00000000 */   nop
-.L8024013C:
-/* 92A3EC 8024013C 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 92A3F0 80240140 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 92A3F4 80240144 A0510000 */  sb        $s1, ($v0)
-.L80240148:
-/* 92A3F8 80240148 24020002 */  addiu     $v0, $zero, 2
-.L8024014C:
-/* 92A3FC 8024014C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 92A400 80240150 8FB20018 */  lw        $s2, 0x18($sp)
-/* 92A404 80240154 8FB10014 */  lw        $s1, 0x14($sp)
-/* 92A408 80240158 8FB00010 */  lw        $s0, 0x10($sp)
-/* 92A40C 8024015C 03E00008 */  jr        $ra
-/* 92A410 80240160 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s
deleted file mode 100644
index 5445265745..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s
+++ /dev/null
@@ -1,126 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240164_92A414
-/* 92A414 80240164 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 92A418 80240168 AFB10034 */  sw        $s1, 0x34($sp)
-/* 92A41C 8024016C 0080882D */  daddu     $s1, $a0, $zero
-/* 92A420 80240170 AFBF0054 */  sw        $ra, 0x54($sp)
-/* 92A424 80240174 AFBE0050 */  sw        $fp, 0x50($sp)
-/* 92A428 80240178 AFB7004C */  sw        $s7, 0x4c($sp)
-/* 92A42C 8024017C AFB60048 */  sw        $s6, 0x48($sp)
-/* 92A430 80240180 AFB50044 */  sw        $s5, 0x44($sp)
-/* 92A434 80240184 AFB40040 */  sw        $s4, 0x40($sp)
-/* 92A438 80240188 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 92A43C 8024018C AFB20038 */  sw        $s2, 0x38($sp)
-/* 92A440 80240190 AFB00030 */  sw        $s0, 0x30($sp)
-/* 92A444 80240194 8E30000C */  lw        $s0, 0xc($s1)
-/* 92A448 80240198 8E050000 */  lw        $a1, ($s0)
-/* 92A44C 8024019C 0C0B1EAF */  jal       get_variable
-/* 92A450 802401A0 26100004 */   addiu    $s0, $s0, 4
-/* 92A454 802401A4 8E050000 */  lw        $a1, ($s0)
-/* 92A458 802401A8 26100004 */  addiu     $s0, $s0, 4
-/* 92A45C 802401AC 0220202D */  daddu     $a0, $s1, $zero
-/* 92A460 802401B0 0C0B1EAF */  jal       get_variable
-/* 92A464 802401B4 0040982D */   daddu    $s3, $v0, $zero
-/* 92A468 802401B8 8E050000 */  lw        $a1, ($s0)
-/* 92A46C 802401BC 26100004 */  addiu     $s0, $s0, 4
-/* 92A470 802401C0 0220202D */  daddu     $a0, $s1, $zero
-/* 92A474 802401C4 0C0B1EAF */  jal       get_variable
-/* 92A478 802401C8 0040B02D */   daddu    $s6, $v0, $zero
-/* 92A47C 802401CC 8E050000 */  lw        $a1, ($s0)
-/* 92A480 802401D0 26100004 */  addiu     $s0, $s0, 4
-/* 92A484 802401D4 0220202D */  daddu     $a0, $s1, $zero
-/* 92A488 802401D8 0C0B1EAF */  jal       get_variable
-/* 92A48C 802401DC 0040A82D */   daddu    $s5, $v0, $zero
-/* 92A490 802401E0 8E050000 */  lw        $a1, ($s0)
-/* 92A494 802401E4 26100004 */  addiu     $s0, $s0, 4
-/* 92A498 802401E8 0220202D */  daddu     $a0, $s1, $zero
-/* 92A49C 802401EC 0C0B1EAF */  jal       get_variable
-/* 92A4A0 802401F0 0040A02D */   daddu    $s4, $v0, $zero
-/* 92A4A4 802401F4 8E050000 */  lw        $a1, ($s0)
-/* 92A4A8 802401F8 26100004 */  addiu     $s0, $s0, 4
-/* 92A4AC 802401FC 0220202D */  daddu     $a0, $s1, $zero
-/* 92A4B0 80240200 0C0B1EAF */  jal       get_variable
-/* 92A4B4 80240204 0040902D */   daddu    $s2, $v0, $zero
-/* 92A4B8 80240208 8E050000 */  lw        $a1, ($s0)
-/* 92A4BC 8024020C 26100004 */  addiu     $s0, $s0, 4
-/* 92A4C0 80240210 0220202D */  daddu     $a0, $s1, $zero
-/* 92A4C4 80240214 0C0B1EAF */  jal       get_variable
-/* 92A4C8 80240218 AFA20028 */   sw       $v0, 0x28($sp)
-/* 92A4CC 8024021C 8E050000 */  lw        $a1, ($s0)
-/* 92A4D0 80240220 26100004 */  addiu     $s0, $s0, 4
-/* 92A4D4 80240224 0220202D */  daddu     $a0, $s1, $zero
-/* 92A4D8 80240228 0C0B1EAF */  jal       get_variable
-/* 92A4DC 8024022C 0040F02D */   daddu    $fp, $v0, $zero
-/* 92A4E0 80240230 8E050000 */  lw        $a1, ($s0)
-/* 92A4E4 80240234 26100004 */  addiu     $s0, $s0, 4
-/* 92A4E8 80240238 0220202D */  daddu     $a0, $s1, $zero
-/* 92A4EC 8024023C 0C0B1EAF */  jal       get_variable
-/* 92A4F0 80240240 0040B82D */   daddu    $s7, $v0, $zero
-/* 92A4F4 80240244 0220202D */  daddu     $a0, $s1, $zero
-/* 92A4F8 80240248 8E050000 */  lw        $a1, ($s0)
-/* 92A4FC 8024024C 0C0B1EAF */  jal       get_variable
-/* 92A500 80240250 0040802D */   daddu    $s0, $v0, $zero
-/* 92A504 80240254 0040182D */  daddu     $v1, $v0, $zero
-/* 92A508 80240258 24020002 */  addiu     $v0, $zero, 2
-/* 92A50C 8024025C 12620012 */  beq       $s3, $v0, .L802402A8
-/* 92A510 80240260 2A620003 */   slti     $v0, $s3, 3
-/* 92A514 80240264 10400005 */  beqz      $v0, .L8024027C
-/* 92A518 80240268 24020001 */   addiu    $v0, $zero, 1
-/* 92A51C 8024026C 12620008 */  beq       $s3, $v0, .L80240290
-/* 92A520 80240270 32C400FF */   andi     $a0, $s6, 0xff
-/* 92A524 80240274 080900C1 */  j         .L80240304
-/* 92A528 80240278 00000000 */   nop
-.L8024027C:
-/* 92A52C 8024027C 24020003 */  addiu     $v0, $zero, 3
-/* 92A530 80240280 12620018 */  beq       $s3, $v0, .L802402E4
-/* 92A534 80240284 32C400FF */   andi     $a0, $s6, 0xff
-/* 92A538 80240288 080900C1 */  j         .L80240304
-/* 92A53C 8024028C 00000000 */   nop
-.L80240290:
-/* 92A540 80240290 32A500FF */  andi      $a1, $s5, 0xff
-/* 92A544 80240294 328600FF */  andi      $a2, $s4, 0xff
-/* 92A548 80240298 0C046F97 */  jal       set_background_color_blend
-/* 92A54C 8024029C 324700FF */   andi     $a3, $s2, 0xff
-/* 92A550 802402A0 080900C1 */  j         .L80240304
-/* 92A554 802402A4 00000000 */   nop
-.L802402A8:
-/* 92A558 802402A8 32C400FF */  andi      $a0, $s6, 0xff
-/* 92A55C 802402AC 32A500FF */  andi      $a1, $s5, 0xff
-/* 92A560 802402B0 328600FF */  andi      $a2, $s4, 0xff
-/* 92A564 802402B4 324700FF */  andi      $a3, $s2, 0xff
-/* 92A568 802402B8 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 92A56C 802402BC AFB0001C */  sw        $s0, 0x1c($sp)
-/* 92A570 802402C0 AFA30020 */  sw        $v1, 0x20($sp)
-/* 92A574 802402C4 AFA20010 */  sw        $v0, 0x10($sp)
-/* 92A578 802402C8 33C200FF */  andi      $v0, $fp, 0xff
-/* 92A57C 802402CC AFA20014 */  sw        $v0, 0x14($sp)
-/* 92A580 802402D0 32E200FF */  andi      $v0, $s7, 0xff
-/* 92A584 802402D4 0C046FAD */  jal       func_8011BEB4
-/* 92A588 802402D8 AFA20018 */   sw       $v0, 0x18($sp)
-/* 92A58C 802402DC 080900C1 */  j         .L80240304
-/* 92A590 802402E0 00000000 */   nop
-.L802402E4:
-/* 92A594 802402E4 32A500FF */  andi      $a1, $s5, 0xff
-/* 92A598 802402E8 328600FF */  andi      $a2, $s4, 0xff
-/* 92A59C 802402EC 324700FF */  andi      $a3, $s2, 0xff
-/* 92A5A0 802402F0 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 92A5A4 802402F4 AFA20010 */  sw        $v0, 0x10($sp)
-/* 92A5A8 802402F8 33C200FF */  andi      $v0, $fp, 0xff
-/* 92A5AC 802402FC 0C046FE6 */  jal       func_8011BF98
-/* 92A5B0 80240300 AFA20014 */   sw       $v0, 0x14($sp)
-.L80240304:
-/* 92A5B4 80240304 8FBF0054 */  lw        $ra, 0x54($sp)
-/* 92A5B8 80240308 8FBE0050 */  lw        $fp, 0x50($sp)
-/* 92A5BC 8024030C 8FB7004C */  lw        $s7, 0x4c($sp)
-/* 92A5C0 80240310 8FB60048 */  lw        $s6, 0x48($sp)
-/* 92A5C4 80240314 8FB50044 */  lw        $s5, 0x44($sp)
-/* 92A5C8 80240318 8FB40040 */  lw        $s4, 0x40($sp)
-/* 92A5CC 8024031C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 92A5D0 80240320 8FB20038 */  lw        $s2, 0x38($sp)
-/* 92A5D4 80240324 8FB10034 */  lw        $s1, 0x34($sp)
-/* 92A5D8 80240328 8FB00030 */  lw        $s0, 0x30($sp)
-/* 92A5DC 8024032C 24020002 */  addiu     $v0, $zero, 2
-/* 92A5E0 80240330 03E00008 */  jr        $ra
-/* 92A5E4 80240334 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s
index 9cb4fd8924..8d9d101100 100644
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s
+++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s
@@ -65,16 +65,16 @@ glabel func_80240364_92A614
 /* 92A704 80240454 0220202D */   daddu    $a0, $s1, $zero
 /* 92A708 80240458 3C018024 */  lui       $at, %hi(D_80245620)
 /* 92A70C 8024045C AC225620 */  sw        $v0, %lo(D_80245620)($at)
-/* 92A710 80240460 3C018024 */  lui       $at, %hi(D_80245624)
-/* 92A714 80240464 AC205624 */  sw        $zero, %lo(D_80245624)($at)
+/* 92A710 80240460 3C018024 */  lui       $at, %hi(flo_18_80245624)
+/* 92A714 80240464 AC205624 */  sw        $zero, %lo(flo_18_80245624)($at)
 .L80240468:
 /* 92A718 80240468 3C118024 */  lui       $s1, %hi(D_80245620)
 /* 92A71C 8024046C 26315620 */  addiu     $s1, $s1, %lo(D_80245620)
 /* 92A720 80240470 8E2F0000 */  lw        $t7, ($s1)
 /* 92A724 80240474 19E00088 */  blez      $t7, .L80240698
 /* 92A728 80240478 00000000 */   nop
-/* 92A72C 8024047C 3C108024 */  lui       $s0, %hi(D_80245624)
-/* 92A730 80240480 26105624 */  addiu     $s0, $s0, %lo(D_80245624)
+/* 92A72C 8024047C 3C108024 */  lui       $s0, %hi(flo_18_80245624)
+/* 92A730 80240480 26105624 */  addiu     $s0, $s0, %lo(flo_18_80245624)
 /* 92A734 80240484 8E030000 */  lw        $v1, ($s0)
 /* 92A738 80240488 3C048024 */  lui       $a0, %hi(D_80245600_DB78C0)
 /* 92A73C 8024048C 90845600 */  lbu       $a0, %lo(D_80245600_DB78C0)($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s
index 9d47a33a58..aaf90bd57b 100644
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s
+++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s
@@ -13,8 +13,8 @@ glabel func_802409A8_92AC58
 /* 92AC78 802409C8 8C620000 */  lw        $v0, ($v1)
 /* 92AC7C 802409CC 5040000A */  beql      $v0, $zero, .L802409F8
 /* 92AC80 802409D0 00041080 */   sll      $v0, $a0, 2
-/* 92AC84 802409D4 3C058024 */  lui       $a1, %hi(D_80245630)
-/* 92AC88 802409D8 24A55630 */  addiu     $a1, $a1, %lo(D_80245630)
+/* 92AC84 802409D4 3C058024 */  lui       $a1, %hi(dro_01_80245630)
+/* 92AC88 802409D8 24A55630 */  addiu     $a1, $a1, %lo(dro_01_80245630)
 .L802409DC:
 /* 92AC8C 802409DC 24630004 */  addiu     $v1, $v1, 4
 /* 92AC90 802409E0 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802409A8_92AC58
 /* 92ACA0 802409F0 24A50004 */   addiu    $a1, $a1, 4
 /* 92ACA4 802409F4 00041080 */  sll       $v0, $a0, 2
 .L802409F8:
-/* 92ACA8 802409F8 3C018024 */  lui       $at, %hi(D_80245630)
+/* 92ACA8 802409F8 3C018024 */  lui       $at, %hi(dro_01_80245630)
 /* 92ACAC 802409FC 00220821 */  addu      $at, $at, $v0
-/* 92ACB0 80240A00 AC205630 */  sw        $zero, %lo(D_80245630)($at)
+/* 92ACB0 80240A00 AC205630 */  sw        $zero, %lo(dro_01_80245630)($at)
 /* 92ACB4 80240A04 0809028D */  j         .L80240A34
 /* 92ACB8 80240A08 00000000 */   nop
 .L80240A0C:
-/* 92ACBC 80240A0C 3C038024 */  lui       $v1, %hi(D_80245630)
-/* 92ACC0 80240A10 24635630 */  addiu     $v1, $v1, %lo(D_80245630)
+/* 92ACBC 80240A0C 3C038024 */  lui       $v1, %hi(dro_01_80245630)
+/* 92ACC0 80240A10 24635630 */  addiu     $v1, $v1, %lo(dro_01_80245630)
 /* 92ACC4 80240A14 0060282D */  daddu     $a1, $v1, $zero
 .L80240A18:
 /* 92ACC8 80240A18 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s
deleted file mode 100644
index 79132e18f0..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s
+++ /dev/null
@@ -1,85 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240040_93F5F0
-/* 93F5F0 80240040 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 93F5F4 80240044 AFB10014 */  sw        $s1, 0x14($sp)
-/* 93F5F8 80240048 0080882D */  daddu     $s1, $a0, $zero
-/* 93F5FC 8024004C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 93F600 80240050 AFB20018 */  sw        $s2, 0x18($sp)
-/* 93F604 80240054 AFB00010 */  sw        $s0, 0x10($sp)
-/* 93F608 80240058 8E30000C */  lw        $s0, 0xc($s1)
-/* 93F60C 8024005C 8E050000 */  lw        $a1, ($s0)
-/* 93F610 80240060 0C0B1EAF */  jal       get_variable
-/* 93F614 80240064 26100004 */   addiu    $s0, $s0, 4
-/* 93F618 80240068 8E050000 */  lw        $a1, ($s0)
-/* 93F61C 8024006C 26100004 */  addiu     $s0, $s0, 4
-/* 93F620 80240070 0220202D */  daddu     $a0, $s1, $zero
-/* 93F624 80240074 0C0B1EAF */  jal       get_variable
-/* 93F628 80240078 0040902D */   daddu    $s2, $v0, $zero
-/* 93F62C 8024007C 0220202D */  daddu     $a0, $s1, $zero
-/* 93F630 80240080 8E050000 */  lw        $a1, ($s0)
-/* 93F634 80240084 0C0B1EAF */  jal       get_variable
-/* 93F638 80240088 0040802D */   daddu    $s0, $v0, $zero
-/* 93F63C 8024008C 0040882D */  daddu     $s1, $v0, $zero
-/* 93F640 80240090 2402FFFF */  addiu     $v0, $zero, -1
-/* 93F644 80240094 16020005 */  bne       $s0, $v0, .L802400AC
-/* 93F648 80240098 24020001 */   addiu    $v0, $zero, 1
-/* 93F64C 8024009C 0C04760B */  jal       func_8011D82C
-/* 93F650 802400A0 0220202D */   daddu    $a0, $s1, $zero
-/* 93F654 802400A4 08090053 */  j         .L8024014C
-/* 93F658 802400A8 24020002 */   addiu    $v0, $zero, 2
-.L802400AC:
-/* 93F65C 802400AC 12420018 */  beq       $s2, $v0, .L80240110
-/* 93F660 802400B0 2A420002 */   slti     $v0, $s2, 2
-/* 93F664 802400B4 10400005 */  beqz      $v0, .L802400CC
-/* 93F668 802400B8 24020002 */   addiu    $v0, $zero, 2
-/* 93F66C 802400BC 12400007 */  beqz      $s2, .L802400DC
-/* 93F670 802400C0 3412FFFF */   ori      $s2, $zero, 0xffff
-/* 93F674 802400C4 08090053 */  j         .L8024014C
-/* 93F678 802400C8 00000000 */   nop
-.L802400CC:
-/* 93F67C 802400CC 1242001B */  beq       $s2, $v0, .L8024013C
-/* 93F680 802400D0 24020002 */   addiu    $v0, $zero, 2
-/* 93F684 802400D4 08090053 */  j         .L8024014C
-/* 93F688 802400D8 00000000 */   nop
-.L802400DC:
-/* 93F68C 802400DC 8E040000 */  lw        $a0, ($s0)
-/* 93F690 802400E0 1092001A */  beq       $a0, $s2, .L8024014C
-/* 93F694 802400E4 24020002 */   addiu    $v0, $zero, 2
-/* 93F698 802400E8 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* 93F69C 802400EC 26100004 */   addiu    $s0, $s0, 4
-/* 93F6A0 802400F0 0C046B4C */  jal       get_model_from_list_index
-/* 93F6A4 802400F4 0040202D */   daddu    $a0, $v0, $zero
-/* 93F6A8 802400F8 0040202D */  daddu     $a0, $v0, $zero
-/* 93F6AC 802400FC 2405FFFF */  addiu     $a1, $zero, -1
-/* 93F6B0 80240100 0C046F1F */  jal       func_8011BC7C
-/* 93F6B4 80240104 0220302D */   daddu    $a2, $s1, $zero
-/* 93F6B8 80240108 08090037 */  j         .L802400DC
-/* 93F6BC 8024010C 00000000 */   nop
-.L80240110:
-/* 93F6C0 80240110 3412FFFF */  ori       $s2, $zero, 0xffff
-.L80240114:
-/* 93F6C4 80240114 8E020000 */  lw        $v0, ($s0)
-/* 93F6C8 80240118 1052000B */  beq       $v0, $s2, .L80240148
-/* 93F6CC 8024011C 2405FFFF */   addiu    $a1, $zero, -1
-/* 93F6D0 80240120 96040002 */  lhu       $a0, 2($s0)
-/* 93F6D4 80240124 0220302D */  daddu     $a2, $s1, $zero
-/* 93F6D8 80240128 26100004 */  addiu     $s0, $s0, 4
-/* 93F6DC 8024012C 0C046E54 */  jal       func_8011B950
-/* 93F6E0 80240130 0000382D */   daddu    $a3, $zero, $zero
-/* 93F6E4 80240134 08090045 */  j         .L80240114
-/* 93F6E8 80240138 00000000 */   nop
-.L8024013C:
-/* 93F6EC 8024013C 3C028015 */  lui       $v0, %hi(D_801512F0)
-/* 93F6F0 80240140 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
-/* 93F6F4 80240144 A0510000 */  sb        $s1, ($v0)
-.L80240148:
-/* 93F6F8 80240148 24020002 */  addiu     $v0, $zero, 2
-.L8024014C:
-/* 93F6FC 8024014C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 93F700 80240150 8FB20018 */  lw        $s2, 0x18($sp)
-/* 93F704 80240154 8FB10014 */  lw        $s1, 0x14($sp)
-/* 93F708 80240158 8FB00010 */  lw        $s0, 0x10($sp)
-/* 93F70C 8024015C 03E00008 */  jr        $ra
-/* 93F710 80240160 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240164_93F714.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240164_93F714.s
deleted file mode 100644
index 6dc627f9eb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240164_93F714.s
+++ /dev/null
@@ -1,126 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240164_93F714
-/* 93F714 80240164 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 93F718 80240168 AFB10034 */  sw        $s1, 0x34($sp)
-/* 93F71C 8024016C 0080882D */  daddu     $s1, $a0, $zero
-/* 93F720 80240170 AFBF0054 */  sw        $ra, 0x54($sp)
-/* 93F724 80240174 AFBE0050 */  sw        $fp, 0x50($sp)
-/* 93F728 80240178 AFB7004C */  sw        $s7, 0x4c($sp)
-/* 93F72C 8024017C AFB60048 */  sw        $s6, 0x48($sp)
-/* 93F730 80240180 AFB50044 */  sw        $s5, 0x44($sp)
-/* 93F734 80240184 AFB40040 */  sw        $s4, 0x40($sp)
-/* 93F738 80240188 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 93F73C 8024018C AFB20038 */  sw        $s2, 0x38($sp)
-/* 93F740 80240190 AFB00030 */  sw        $s0, 0x30($sp)
-/* 93F744 80240194 8E30000C */  lw        $s0, 0xc($s1)
-/* 93F748 80240198 8E050000 */  lw        $a1, ($s0)
-/* 93F74C 8024019C 0C0B1EAF */  jal       get_variable
-/* 93F750 802401A0 26100004 */   addiu    $s0, $s0, 4
-/* 93F754 802401A4 8E050000 */  lw        $a1, ($s0)
-/* 93F758 802401A8 26100004 */  addiu     $s0, $s0, 4
-/* 93F75C 802401AC 0220202D */  daddu     $a0, $s1, $zero
-/* 93F760 802401B0 0C0B1EAF */  jal       get_variable
-/* 93F764 802401B4 0040982D */   daddu    $s3, $v0, $zero
-/* 93F768 802401B8 8E050000 */  lw        $a1, ($s0)
-/* 93F76C 802401BC 26100004 */  addiu     $s0, $s0, 4
-/* 93F770 802401C0 0220202D */  daddu     $a0, $s1, $zero
-/* 93F774 802401C4 0C0B1EAF */  jal       get_variable
-/* 93F778 802401C8 0040B02D */   daddu    $s6, $v0, $zero
-/* 93F77C 802401CC 8E050000 */  lw        $a1, ($s0)
-/* 93F780 802401D0 26100004 */  addiu     $s0, $s0, 4
-/* 93F784 802401D4 0220202D */  daddu     $a0, $s1, $zero
-/* 93F788 802401D8 0C0B1EAF */  jal       get_variable
-/* 93F78C 802401DC 0040A82D */   daddu    $s5, $v0, $zero
-/* 93F790 802401E0 8E050000 */  lw        $a1, ($s0)
-/* 93F794 802401E4 26100004 */  addiu     $s0, $s0, 4
-/* 93F798 802401E8 0220202D */  daddu     $a0, $s1, $zero
-/* 93F79C 802401EC 0C0B1EAF */  jal       get_variable
-/* 93F7A0 802401F0 0040A02D */   daddu    $s4, $v0, $zero
-/* 93F7A4 802401F4 8E050000 */  lw        $a1, ($s0)
-/* 93F7A8 802401F8 26100004 */  addiu     $s0, $s0, 4
-/* 93F7AC 802401FC 0220202D */  daddu     $a0, $s1, $zero
-/* 93F7B0 80240200 0C0B1EAF */  jal       get_variable
-/* 93F7B4 80240204 0040902D */   daddu    $s2, $v0, $zero
-/* 93F7B8 80240208 8E050000 */  lw        $a1, ($s0)
-/* 93F7BC 8024020C 26100004 */  addiu     $s0, $s0, 4
-/* 93F7C0 80240210 0220202D */  daddu     $a0, $s1, $zero
-/* 93F7C4 80240214 0C0B1EAF */  jal       get_variable
-/* 93F7C8 80240218 AFA20028 */   sw       $v0, 0x28($sp)
-/* 93F7CC 8024021C 8E050000 */  lw        $a1, ($s0)
-/* 93F7D0 80240220 26100004 */  addiu     $s0, $s0, 4
-/* 93F7D4 80240224 0220202D */  daddu     $a0, $s1, $zero
-/* 93F7D8 80240228 0C0B1EAF */  jal       get_variable
-/* 93F7DC 8024022C 0040F02D */   daddu    $fp, $v0, $zero
-/* 93F7E0 80240230 8E050000 */  lw        $a1, ($s0)
-/* 93F7E4 80240234 26100004 */  addiu     $s0, $s0, 4
-/* 93F7E8 80240238 0220202D */  daddu     $a0, $s1, $zero
-/* 93F7EC 8024023C 0C0B1EAF */  jal       get_variable
-/* 93F7F0 80240240 0040B82D */   daddu    $s7, $v0, $zero
-/* 93F7F4 80240244 0220202D */  daddu     $a0, $s1, $zero
-/* 93F7F8 80240248 8E050000 */  lw        $a1, ($s0)
-/* 93F7FC 8024024C 0C0B1EAF */  jal       get_variable
-/* 93F800 80240250 0040802D */   daddu    $s0, $v0, $zero
-/* 93F804 80240254 0040182D */  daddu     $v1, $v0, $zero
-/* 93F808 80240258 24020002 */  addiu     $v0, $zero, 2
-/* 93F80C 8024025C 12620012 */  beq       $s3, $v0, .L802402A8
-/* 93F810 80240260 2A620003 */   slti     $v0, $s3, 3
-/* 93F814 80240264 10400005 */  beqz      $v0, .L8024027C
-/* 93F818 80240268 24020001 */   addiu    $v0, $zero, 1
-/* 93F81C 8024026C 12620008 */  beq       $s3, $v0, .L80240290
-/* 93F820 80240270 32C400FF */   andi     $a0, $s6, 0xff
-/* 93F824 80240274 080900C1 */  j         .L80240304
-/* 93F828 80240278 00000000 */   nop
-.L8024027C:
-/* 93F82C 8024027C 24020003 */  addiu     $v0, $zero, 3
-/* 93F830 80240280 12620018 */  beq       $s3, $v0, .L802402E4
-/* 93F834 80240284 32C400FF */   andi     $a0, $s6, 0xff
-/* 93F838 80240288 080900C1 */  j         .L80240304
-/* 93F83C 8024028C 00000000 */   nop
-.L80240290:
-/* 93F840 80240290 32A500FF */  andi      $a1, $s5, 0xff
-/* 93F844 80240294 328600FF */  andi      $a2, $s4, 0xff
-/* 93F848 80240298 0C046F97 */  jal       set_background_color_blend
-/* 93F84C 8024029C 324700FF */   andi     $a3, $s2, 0xff
-/* 93F850 802402A0 080900C1 */  j         .L80240304
-/* 93F854 802402A4 00000000 */   nop
-.L802402A8:
-/* 93F858 802402A8 32C400FF */  andi      $a0, $s6, 0xff
-/* 93F85C 802402AC 32A500FF */  andi      $a1, $s5, 0xff
-/* 93F860 802402B0 328600FF */  andi      $a2, $s4, 0xff
-/* 93F864 802402B4 324700FF */  andi      $a3, $s2, 0xff
-/* 93F868 802402B8 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 93F86C 802402BC AFB0001C */  sw        $s0, 0x1c($sp)
-/* 93F870 802402C0 AFA30020 */  sw        $v1, 0x20($sp)
-/* 93F874 802402C4 AFA20010 */  sw        $v0, 0x10($sp)
-/* 93F878 802402C8 33C200FF */  andi      $v0, $fp, 0xff
-/* 93F87C 802402CC AFA20014 */  sw        $v0, 0x14($sp)
-/* 93F880 802402D0 32E200FF */  andi      $v0, $s7, 0xff
-/* 93F884 802402D4 0C046FAD */  jal       func_8011BEB4
-/* 93F888 802402D8 AFA20018 */   sw       $v0, 0x18($sp)
-/* 93F88C 802402DC 080900C1 */  j         .L80240304
-/* 93F890 802402E0 00000000 */   nop
-.L802402E4:
-/* 93F894 802402E4 32A500FF */  andi      $a1, $s5, 0xff
-/* 93F898 802402E8 328600FF */  andi      $a2, $s4, 0xff
-/* 93F89C 802402EC 324700FF */  andi      $a3, $s2, 0xff
-/* 93F8A0 802402F0 93A2002B */  lbu       $v0, 0x2b($sp)
-/* 93F8A4 802402F4 AFA20010 */  sw        $v0, 0x10($sp)
-/* 93F8A8 802402F8 33C200FF */  andi      $v0, $fp, 0xff
-/* 93F8AC 802402FC 0C046FE6 */  jal       func_8011BF98
-/* 93F8B0 80240300 AFA20014 */   sw       $v0, 0x14($sp)
-.L80240304:
-/* 93F8B4 80240304 8FBF0054 */  lw        $ra, 0x54($sp)
-/* 93F8B8 80240308 8FBE0050 */  lw        $fp, 0x50($sp)
-/* 93F8BC 8024030C 8FB7004C */  lw        $s7, 0x4c($sp)
-/* 93F8C0 80240310 8FB60048 */  lw        $s6, 0x48($sp)
-/* 93F8C4 80240314 8FB50044 */  lw        $s5, 0x44($sp)
-/* 93F8C8 80240318 8FB40040 */  lw        $s4, 0x40($sp)
-/* 93F8CC 8024031C 8FB3003C */  lw        $s3, 0x3c($sp)
-/* 93F8D0 80240320 8FB20038 */  lw        $s2, 0x38($sp)
-/* 93F8D4 80240324 8FB10034 */  lw        $s1, 0x34($sp)
-/* 93F8D8 80240328 8FB00030 */  lw        $s0, 0x30($sp)
-/* 93F8DC 8024032C 24020002 */  addiu     $v0, $zero, 2
-/* 93F8E0 80240330 03E00008 */  jr        $ra
-/* 93F8E4 80240334 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240154_954114.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240154_954114.s
deleted file mode 100644
index 45b45df988..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240154_954114.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240154_954114
-/* 954114 80240154 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 954118 80240158 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 95411C 8024015C 000420C0 */  sll       $a0, $a0, 3
-/* 954120 80240160 00822021 */  addu      $a0, $a0, $v0
-/* 954124 80240164 90820014 */  lbu       $v0, 0x14($a0)
-/* 954128 80240168 10400009 */  beqz      $v0, .L80240190
-/* 95412C 8024016C 00000000 */   nop
-/* 954130 80240170 90820015 */  lbu       $v0, 0x15($a0)
-/* 954134 80240174 00022600 */  sll       $a0, $v0, 0x18
-/* 954138 80240178 00041E03 */  sra       $v1, $a0, 0x18
-/* 95413C 8024017C 00051400 */  sll       $v0, $a1, 0x10
-/* 954140 80240180 00021403 */  sra       $v0, $v0, 0x10
-/* 954144 80240184 0043102A */  slt       $v0, $v0, $v1
-/* 954148 80240188 10400003 */  beqz      $v0, .L80240198
-/* 95414C 8024018C 00000000 */   nop
-.L80240190:
-/* 954150 80240190 03E00008 */  jr        $ra
-/* 954154 80240194 2402FFFF */   addiu    $v0, $zero, -1
-.L80240198:
-/* 954158 80240198 03E00008 */  jr        $ra
-/* 95415C 8024019C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s
deleted file mode 100644
index f8c1b51d98..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802401A0_954160
-/* 954160 802401A0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 954164 802401A4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 954168 802401A8 0080982D */  daddu     $s3, $a0, $zero
-/* 95416C 802401AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 954170 802401B0 24100001 */  addiu     $s0, $zero, 1
-/* 954174 802401B4 AFB40020 */  sw        $s4, 0x20($sp)
-/* 954178 802401B8 2414FFFF */  addiu     $s4, $zero, -1
-/* 95417C 802401BC AFB50024 */  sw        $s5, 0x24($sp)
-/* 954180 802401C0 0200A82D */  daddu     $s5, $s0, $zero
-/* 954184 802401C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 954188 802401C8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 95418C 802401CC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 954190 802401D0 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 954194 802401D4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 954198 802401D8 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 95419C 802401DC 0280182D */  daddu     $v1, $s4, $zero
-/* 9541A0 802401E0 AE630084 */  sw        $v1, 0x84($s3)
-/* 9541A4 802401E4 00021027 */  nor       $v0, $zero, $v0
-/* 9541A8 802401E8 000217C2 */  srl       $v0, $v0, 0x1f
-/* 9541AC 802401EC 00029400 */  sll       $s2, $v0, 0x10
-.L802401F0:
-/* 9541B0 802401F0 92220014 */  lbu       $v0, 0x14($s1)
-/* 9541B4 802401F4 50400008 */  beql      $v0, $zero, .L80240218
-/* 9541B8 802401F8 26100001 */   addiu    $s0, $s0, 1
-/* 9541BC 802401FC 0200202D */  daddu     $a0, $s0, $zero
-/* 9541C0 80240200 0C090055 */  jal       func_80240154_954114
-/* 9541C4 80240204 00122C03 */   sra      $a1, $s2, 0x10
-/* 9541C8 80240208 10540003 */  beq       $v0, $s4, .L80240218
-/* 9541CC 8024020C 26100001 */   addiu    $s0, $s0, 1
-/* 9541D0 80240210 08090089 */  j         .L80240224
-/* 9541D4 80240214 AE750084 */   sw       $s5, 0x84($s3)
-.L80240218:
-/* 9541D8 80240218 2A02000C */  slti      $v0, $s0, 0xc
-/* 9541DC 8024021C 1440FFF4 */  bnez      $v0, .L802401F0
-/* 9541E0 80240220 26310008 */   addiu    $s1, $s1, 8
-.L80240224:
-/* 9541E4 80240224 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 9541E8 80240228 8FB50024 */  lw        $s5, 0x24($sp)
-/* 9541EC 8024022C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 9541F0 80240230 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9541F4 80240234 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9541F8 80240238 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9541FC 8024023C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 954200 80240240 24020002 */  addiu     $v0, $zero, 2
-/* 954204 80240244 03E00008 */  jr        $ra
-/* 954208 80240248 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s
index c004b88fbd..9183be02a2 100644
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s
+++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s
@@ -49,7 +49,7 @@ glabel func_8024024C_95420C
 /* 9542B8 802402F8 AE300108 */  sw        $s0, 0x108($s1)
 /* 9542BC 802402FC 8C420000 */  lw        $v0, ($v0)
 /* 9542C0 80240300 02E0282D */  daddu     $a1, $s7, $zero
-/* 9542C4 80240304 0C090055 */  jal       func_80240154_954114
+/* 9542C4 80240304 0C090055 */  jal       sbk_56_UnkFunc37
 /* 9542C8 80240308 AE220084 */   sw       $v0, 0x84($s1)
 /* 9542CC 8024030C 0040202D */  daddu     $a0, $v0, $zero
 /* 9542D0 80240310 04800011 */  bltz      $a0, .L80240358
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590_954550.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590_954550.s
deleted file mode 100644
index f653e2edc6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590_954550.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240590_954550
-/* 954550 80240590 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 954554 80240594 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 954558 80240598 8C82000C */  lw        $v0, 0xc($a0)
-/* 95455C 8024059C 0C0B1EAF */  jal       get_variable
-/* 954560 802405A0 8C450000 */   lw       $a1, ($v0)
-/* 954564 802405A4 0040202D */  daddu     $a0, $v0, $zero
-/* 954568 802405A8 8C830000 */  lw        $v1, ($a0)
-/* 95456C 802405AC 34630010 */  ori       $v1, $v1, 0x10
-/* 954570 802405B0 AC830000 */  sw        $v1, ($a0)
-/* 954574 802405B4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 954578 802405B8 24020002 */  addiu     $v0, $zero, 2
-/* 95457C 802405BC 03E00008 */  jr        $ra
-/* 954580 802405C0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s
deleted file mode 100644
index ab112a1ea8..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D88_954D48
-/* 954D48 80240D88 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 954D4C 80240D8C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 954D50 80240D90 AC800084 */  sw        $zero, 0x84($a0)
-/* 954D54 80240D94 80620000 */  lb        $v0, ($v1)
-/* 954D58 80240D98 10400005 */  beqz      $v0, .L80240DB0
-/* 954D5C 80240D9C 24020003 */   addiu    $v0, $zero, 3
-/* 954D60 80240DA0 80630003 */  lb        $v1, 3($v1)
-/* 954D64 80240DA4 14620002 */  bne       $v1, $v0, .L80240DB0
-/* 954D68 80240DA8 24020001 */   addiu    $v0, $zero, 1
-/* 954D6C 80240DAC AC820084 */  sw        $v0, 0x84($a0)
-.L80240DB0:
-/* 954D70 80240DB0 03E00008 */  jr        $ra
-/* 954D74 80240DB4 24020002 */   addiu    $v0, $zero, 2
-/* 954D78 80240DB8 00000000 */  nop
-/* 954D7C 80240DBC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s
deleted file mode 100644
index adf516b74f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_8697F0
-/* 8697F0 80240340 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8697F4 80240344 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8697F8 80240348 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8697FC 8024034C AFB00010 */  sw        $s0, 0x10($sp)
-/* 869800 80240350 0080802D */  daddu     $s0, $a0, $zero
-/* 869804 80240354 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 869808 80240358 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 86980C 8024035C 10620003 */  beq       $v1, $v0, .L8024036C
-/* 869810 80240360 24020002 */   addiu    $v0, $zero, 2
-/* 869814 80240364 080900FB */  j         .L802403EC
-/* 869818 80240368 AE000084 */   sw       $zero, 0x84($s0)
-.L8024036C:
-/* 86981C 8024036C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 869820 80240370 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 869824 80240374 80620040 */  lb        $v0, 0x40($v1)
-/* 869828 80240378 80670044 */  lb        $a3, 0x44($v1)
-/* 86982C 8024037C 04420001 */  bltzl     $v0, .L80240384
-/* 869830 80240380 00021023 */   negu     $v0, $v0
-.L80240384:
-/* 869834 80240384 14400003 */  bnez      $v0, .L80240394
-/* 869838 80240388 00000000 */   nop
-/* 86983C 8024038C 50E00017 */  beql      $a3, $zero, .L802403EC
-/* 869840 80240390 0000102D */   daddu    $v0, $zero, $zero
-.L80240394:
-/* 869844 80240394 44822000 */  mtc1      $v0, $f4
-/* 869848 80240398 00000000 */  nop
-/* 86984C 8024039C 46802120 */  cvt.s.w   $f4, $f4
-/* 869850 802403A0 44062000 */  mfc1      $a2, $f4
-/* 869854 802403A4 44872000 */  mtc1      $a3, $f4
-/* 869858 802403A8 00000000 */  nop
-/* 86985C 802403AC 46802120 */  cvt.s.w   $f4, $f4
-/* 869860 802403B0 44806000 */  mtc1      $zero, $f12
-/* 869864 802403B4 44072000 */  mfc1      $a3, $f4
-/* 869868 802403B8 0C00A720 */  jal       atan2
-/* 86986C 802403BC 46006386 */   mov.s    $f14, $f12
-/* 869870 802403C0 3C014270 */  lui       $at, 0x4270
-/* 869874 802403C4 44811000 */  mtc1      $at, $f2
-/* 869878 802403C8 00000000 */  nop
-/* 86987C 802403CC 4602003C */  c.lt.s    $f0, $f2
-/* 869880 802403D0 00000000 */  nop
-/* 869884 802403D4 45000004 */  bc1f      .L802403E8
-/* 869888 802403D8 24020001 */   addiu    $v0, $zero, 1
-/* 86988C 802403DC AE020084 */  sw        $v0, 0x84($s0)
-/* 869890 802403E0 080900FB */  j         .L802403EC
-/* 869894 802403E4 24020002 */   addiu    $v0, $zero, 2
-.L802403E8:
-/* 869898 802403E8 0000102D */  daddu     $v0, $zero, $zero
-.L802403EC:
-/* 86989C 802403EC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8698A0 802403F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8698A4 802403F4 03E00008 */  jr        $ra
-/* 8698A8 802403F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240034_86EB34.s b/ver/us/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240034_86EB34.s
deleted file mode 100644
index 194f683259..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240034_86EB34.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_86EB34
-/* 86EB34 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 86EB38 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 86EB3C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 86EB40 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 86EB44 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 86EB48 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 86EB4C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 86EB50 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 86EB54 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 86EB58 80240058 08090038 */  j         .L802400E0
-/* 86EB5C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 86EB60 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 86EB64 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 86EB68 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 86EB6C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 86EB70 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 86EB74 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 86EB78 80240078 14400003 */  bnez      $v0, .L80240088
-/* 86EB7C 8024007C 00000000 */   nop
-/* 86EB80 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 86EB84 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 86EB88 80240088 44822000 */  mtc1      $v0, $f4
-/* 86EB8C 8024008C 00000000 */  nop
-/* 86EB90 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 86EB94 80240094 44062000 */  mfc1      $a2, $f4
-/* 86EB98 80240098 44872000 */  mtc1      $a3, $f4
-/* 86EB9C 8024009C 00000000 */  nop
-/* 86EBA0 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 86EBA4 802400A4 44806000 */  mtc1      $zero, $f12
-/* 86EBA8 802400A8 44072000 */  mfc1      $a3, $f4
-/* 86EBAC 802400AC 0C00A720 */  jal       atan2
-/* 86EBB0 802400B0 46006386 */   mov.s    $f14, $f12
-/* 86EBB4 802400B4 3C014270 */  lui       $at, 0x4270
-/* 86EBB8 802400B8 44811000 */  mtc1      $at, $f2
-/* 86EBBC 802400BC 00000000 */  nop
-/* 86EBC0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 86EBC4 802400C4 00000000 */  nop
-/* 86EBC8 802400C8 45000004 */  bc1f      .L802400DC
-/* 86EBCC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 86EBD0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 86EBD4 802400D4 08090038 */  j         .L802400E0
-/* 86EBD8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 86EBDC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 86EBE0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 86EBE4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 86EBE8 802400E8 03E00008 */  jr        $ra
-/* 86EBEC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240340_871D70.s b/ver/us/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240340_871D70.s
deleted file mode 100644
index 25dc2d36c4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_04/871A30/func_80240340_871D70.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_871D70
-/* 871D70 80240340 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 871D74 80240344 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 871D78 80240348 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 871D7C 8024034C AFB00010 */  sw        $s0, 0x10($sp)
-/* 871D80 80240350 0080802D */  daddu     $s0, $a0, $zero
-/* 871D84 80240354 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 871D88 80240358 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 871D8C 8024035C 10620003 */  beq       $v1, $v0, .L8024036C
-/* 871D90 80240360 24020002 */   addiu    $v0, $zero, 2
-/* 871D94 80240364 080900FB */  j         .L802403EC
-/* 871D98 80240368 AE000084 */   sw       $zero, 0x84($s0)
-.L8024036C:
-/* 871D9C 8024036C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 871DA0 80240370 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 871DA4 80240374 80620040 */  lb        $v0, 0x40($v1)
-/* 871DA8 80240378 80670044 */  lb        $a3, 0x44($v1)
-/* 871DAC 8024037C 04420001 */  bltzl     $v0, .L80240384
-/* 871DB0 80240380 00021023 */   negu     $v0, $v0
-.L80240384:
-/* 871DB4 80240384 14400003 */  bnez      $v0, .L80240394
-/* 871DB8 80240388 00000000 */   nop
-/* 871DBC 8024038C 50E00017 */  beql      $a3, $zero, .L802403EC
-/* 871DC0 80240390 0000102D */   daddu    $v0, $zero, $zero
-.L80240394:
-/* 871DC4 80240394 44822000 */  mtc1      $v0, $f4
-/* 871DC8 80240398 00000000 */  nop
-/* 871DCC 8024039C 46802120 */  cvt.s.w   $f4, $f4
-/* 871DD0 802403A0 44062000 */  mfc1      $a2, $f4
-/* 871DD4 802403A4 44872000 */  mtc1      $a3, $f4
-/* 871DD8 802403A8 00000000 */  nop
-/* 871DDC 802403AC 46802120 */  cvt.s.w   $f4, $f4
-/* 871DE0 802403B0 44806000 */  mtc1      $zero, $f12
-/* 871DE4 802403B4 44072000 */  mfc1      $a3, $f4
-/* 871DE8 802403B8 0C00A720 */  jal       atan2
-/* 871DEC 802403BC 46006386 */   mov.s    $f14, $f12
-/* 871DF0 802403C0 3C014270 */  lui       $at, 0x4270
-/* 871DF4 802403C4 44811000 */  mtc1      $at, $f2
-/* 871DF8 802403C8 00000000 */  nop
-/* 871DFC 802403CC 4602003C */  c.lt.s    $f0, $f2
-/* 871E00 802403D0 00000000 */  nop
-/* 871E04 802403D4 45000004 */  bc1f      .L802403E8
-/* 871E08 802403D8 24020001 */   addiu    $v0, $zero, 1
-/* 871E0C 802403DC AE020084 */  sw        $v0, 0x84($s0)
-/* 871E10 802403E0 080900FB */  j         .L802403EC
-/* 871E14 802403E4 24020002 */   addiu    $v0, $zero, 2
-.L802403E8:
-/* 871E18 802403E8 0000102D */  daddu     $v0, $zero, $zero
-.L802403EC:
-/* 871E1C 802403EC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 871E20 802403F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 871E24 802403F4 03E00008 */  jr        $ra
-/* 871E28 802403F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4_872624.s b/ver/us/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4_872624.s
deleted file mode 100644
index 65ac69e2cd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4_872624.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240BF4_872624
-/* 872624 80240BF4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 872628 80240BF8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 87262C 80240BFC 8C82000C */  lw        $v0, 0xc($a0)
-/* 872630 80240C00 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* 872634 80240C04 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* 872638 80240C08 0C0B2026 */  jal       set_variable
-/* 87263C 80240C0C 8C450000 */   lw       $a1, ($v0)
-/* 872640 80240C10 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 872644 80240C14 24020002 */  addiu     $v0, $zero, 2
-/* 872648 80240C18 03E00008 */  jr        $ra
-/* 87264C 80240C1C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240034_876F14.s b/ver/us/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240034_876F14.s
deleted file mode 100644
index 890b6d2f6f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240034_876F14.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_876F14
-/* 876F14 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 876F18 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 876F1C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 876F20 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 876F24 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 876F28 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 876F2C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 876F30 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 876F34 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 876F38 80240058 08090038 */  j         .L802400E0
-/* 876F3C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 876F40 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 876F44 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 876F48 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 876F4C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 876F50 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 876F54 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 876F58 80240078 14400003 */  bnez      $v0, .L80240088
-/* 876F5C 8024007C 00000000 */   nop
-/* 876F60 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 876F64 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 876F68 80240088 44822000 */  mtc1      $v0, $f4
-/* 876F6C 8024008C 00000000 */  nop
-/* 876F70 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 876F74 80240094 44062000 */  mfc1      $a2, $f4
-/* 876F78 80240098 44872000 */  mtc1      $a3, $f4
-/* 876F7C 8024009C 00000000 */  nop
-/* 876F80 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 876F84 802400A4 44806000 */  mtc1      $zero, $f12
-/* 876F88 802400A8 44072000 */  mfc1      $a3, $f4
-/* 876F8C 802400AC 0C00A720 */  jal       atan2
-/* 876F90 802400B0 46006386 */   mov.s    $f14, $f12
-/* 876F94 802400B4 3C014270 */  lui       $at, 0x4270
-/* 876F98 802400B8 44811000 */  mtc1      $at, $f2
-/* 876F9C 802400BC 00000000 */  nop
-/* 876FA0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 876FA4 802400C4 00000000 */  nop
-/* 876FA8 802400C8 45000004 */  bc1f      .L802400DC
-/* 876FAC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 876FB0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 876FB4 802400D4 08090038 */  j         .L802400E0
-/* 876FB8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 876FBC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 876FC0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 876FC4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 876FC8 802400E8 03E00008 */  jr        $ra
-/* 876FCC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240034_879C14.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240034_879C14.s
deleted file mode 100644
index 65edb32f72..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240034_879C14.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_879C14
-/* 879C14 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 879C18 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 879C1C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 879C20 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 879C24 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 879C28 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 879C2C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 879C30 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 879C34 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 879C38 80240058 08090038 */  j         .L802400E0
-/* 879C3C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 879C40 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 879C44 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 879C48 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 879C4C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 879C50 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 879C54 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 879C58 80240078 14400003 */  bnez      $v0, .L80240088
-/* 879C5C 8024007C 00000000 */   nop
-/* 879C60 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 879C64 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 879C68 80240088 44822000 */  mtc1      $v0, $f4
-/* 879C6C 8024008C 00000000 */  nop
-/* 879C70 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 879C74 80240094 44062000 */  mfc1      $a2, $f4
-/* 879C78 80240098 44872000 */  mtc1      $a3, $f4
-/* 879C7C 8024009C 00000000 */  nop
-/* 879C80 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 879C84 802400A4 44806000 */  mtc1      $zero, $f12
-/* 879C88 802400A8 44072000 */  mfc1      $a3, $f4
-/* 879C8C 802400AC 0C00A720 */  jal       atan2
-/* 879C90 802400B0 46006386 */   mov.s    $f14, $f12
-/* 879C94 802400B4 3C014270 */  lui       $at, 0x4270
-/* 879C98 802400B8 44811000 */  mtc1      $at, $f2
-/* 879C9C 802400BC 00000000 */  nop
-/* 879CA0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 879CA4 802400C4 00000000 */  nop
-/* 879CA8 802400C8 45000004 */  bc1f      .L802400DC
-/* 879CAC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 879CB0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 879CB4 802400D4 08090038 */  j         .L802400E0
-/* 879CB8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 879CBC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 879CC0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 879CC4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 879CC8 802400E8 03E00008 */  jr        $ra
-/* 879CCC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s
deleted file mode 100644
index a31dba1273..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802403B4_879F94
-/* 879F94 802403B4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 879F98 802403B8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 879F9C 802403BC 000420C0 */  sll       $a0, $a0, 3
-/* 879FA0 802403C0 00822021 */  addu      $a0, $a0, $v0
-/* 879FA4 802403C4 90820014 */  lbu       $v0, 0x14($a0)
-/* 879FA8 802403C8 10400009 */  beqz      $v0, .L802403F0
-/* 879FAC 802403CC 00000000 */   nop
-/* 879FB0 802403D0 90820015 */  lbu       $v0, 0x15($a0)
-/* 879FB4 802403D4 00022600 */  sll       $a0, $v0, 0x18
-/* 879FB8 802403D8 00041E03 */  sra       $v1, $a0, 0x18
-/* 879FBC 802403DC 00051400 */  sll       $v0, $a1, 0x10
-/* 879FC0 802403E0 00021403 */  sra       $v0, $v0, 0x10
-/* 879FC4 802403E4 0043102A */  slt       $v0, $v0, $v1
-/* 879FC8 802403E8 10400003 */  beqz      $v0, .L802403F8
-/* 879FCC 802403EC 00000000 */   nop
-.L802403F0:
-/* 879FD0 802403F0 03E00008 */  jr        $ra
-/* 879FD4 802403F4 2402FFFF */   addiu    $v0, $zero, -1
-.L802403F8:
-/* 879FD8 802403F8 03E00008 */  jr        $ra
-/* 879FDC 802403FC 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s
deleted file mode 100644
index 0456b51d0e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240400_879FE0
-/* 879FE0 80240400 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 879FE4 80240404 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 879FE8 80240408 0080982D */  daddu     $s3, $a0, $zero
-/* 879FEC 8024040C AFB00010 */  sw        $s0, 0x10($sp)
-/* 879FF0 80240410 24100001 */  addiu     $s0, $zero, 1
-/* 879FF4 80240414 AFB40020 */  sw        $s4, 0x20($sp)
-/* 879FF8 80240418 2414FFFF */  addiu     $s4, $zero, -1
-/* 879FFC 8024041C AFB50024 */  sw        $s5, 0x24($sp)
-/* 87A000 80240420 0200A82D */  daddu     $s5, $s0, $zero
-/* 87A004 80240424 AFB10014 */  sw        $s1, 0x14($sp)
-/* 87A008 80240428 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 87A00C 8024042C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 87A010 80240430 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 87A014 80240434 AFB20018 */  sw        $s2, 0x18($sp)
-/* 87A018 80240438 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 87A01C 8024043C 0280182D */  daddu     $v1, $s4, $zero
-/* 87A020 80240440 AE630084 */  sw        $v1, 0x84($s3)
-/* 87A024 80240444 00021027 */  nor       $v0, $zero, $v0
-/* 87A028 80240448 000217C2 */  srl       $v0, $v0, 0x1f
-/* 87A02C 8024044C 00029400 */  sll       $s2, $v0, 0x10
-.L80240450:
-/* 87A030 80240450 92220014 */  lbu       $v0, 0x14($s1)
-/* 87A034 80240454 50400008 */  beql      $v0, $zero, .L80240478
-/* 87A038 80240458 26100001 */   addiu    $s0, $s0, 1
-/* 87A03C 8024045C 0200202D */  daddu     $a0, $s0, $zero
-/* 87A040 80240460 0C0900ED */  jal       func_802403B4_879F94
-/* 87A044 80240464 00122C03 */   sra      $a1, $s2, 0x10
-/* 87A048 80240468 10540003 */  beq       $v0, $s4, .L80240478
-/* 87A04C 8024046C 26100001 */   addiu    $s0, $s0, 1
-/* 87A050 80240470 08090121 */  j         .L80240484
-/* 87A054 80240474 AE750084 */   sw       $s5, 0x84($s3)
-.L80240478:
-/* 87A058 80240478 2A02000C */  slti      $v0, $s0, 0xc
-/* 87A05C 8024047C 1440FFF4 */  bnez      $v0, .L80240450
-/* 87A060 80240480 26310008 */   addiu    $s1, $s1, 8
-.L80240484:
-/* 87A064 80240484 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 87A068 80240488 8FB50024 */  lw        $s5, 0x24($sp)
-/* 87A06C 8024048C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 87A070 80240490 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 87A074 80240494 8FB20018 */  lw        $s2, 0x18($sp)
-/* 87A078 80240498 8FB10014 */  lw        $s1, 0x14($sp)
-/* 87A07C 8024049C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 87A080 802404A0 24020002 */  addiu     $v0, $zero, 2
-/* 87A084 802404A4 03E00008 */  jr        $ra
-/* 87A088 802404A8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s
index 50830b8969..af124e3eaa 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s
@@ -49,7 +49,7 @@ glabel func_802404AC_87A08C
 /* 87A138 80240558 AE300108 */  sw        $s0, 0x108($s1)
 /* 87A13C 8024055C 8C420000 */  lw        $v0, ($v0)
 /* 87A140 80240560 02E0282D */  daddu     $a1, $s7, $zero
-/* 87A144 80240564 0C0900ED */  jal       func_802403B4_879F94
+/* 87A144 80240564 0C0900ED */  jal       tik_07_UnkFunc37
 /* 87A148 80240568 AE220084 */   sw       $v0, 0x84($s1)
 /* 87A14C 8024056C 0040202D */  daddu     $a0, $v0, $zero
 /* 87A150 80240570 04800011 */  bltz      $a0, .L802405B8
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0_87A3D0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0_87A3D0.s
deleted file mode 100644
index d5c575a662..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0_87A3D0.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802407F0_87A3D0
-/* 87A3D0 802407F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 87A3D4 802407F4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 87A3D8 802407F8 8C82000C */  lw        $v0, 0xc($a0)
-/* 87A3DC 802407FC 0C0B1EAF */  jal       get_variable
-/* 87A3E0 80240800 8C450000 */   lw       $a1, ($v0)
-/* 87A3E4 80240804 0040202D */  daddu     $a0, $v0, $zero
-/* 87A3E8 80240808 8C830000 */  lw        $v1, ($a0)
-/* 87A3EC 8024080C 34630010 */  ori       $v1, $v1, 0x10
-/* 87A3F0 80240810 AC830000 */  sw        $v1, ($a0)
-/* 87A3F4 80240814 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 87A3F8 80240818 24020002 */  addiu     $v0, $zero, 2
-/* 87A3FC 8024081C 03E00008 */  jr        $ra
-/* 87A400 80240820 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s
deleted file mode 100644
index 5bf7384ffd..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FE8_87ABC8
-/* 87ABC8 80240FE8 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 87ABCC 80240FEC 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 87ABD0 80240FF0 AC800084 */  sw        $zero, 0x84($a0)
-/* 87ABD4 80240FF4 80620000 */  lb        $v0, ($v1)
-/* 87ABD8 80240FF8 10400005 */  beqz      $v0, .L80241010
-/* 87ABDC 80240FFC 24020003 */   addiu    $v0, $zero, 3
-/* 87ABE0 80241000 80630003 */  lb        $v1, 3($v1)
-/* 87ABE4 80241004 14620002 */  bne       $v1, $v0, .L80241010
-/* 87ABE8 80241008 24020001 */   addiu    $v0, $zero, 1
-/* 87ABEC 8024100C AC820084 */  sw        $v0, 0x84($a0)
-.L80241010:
-/* 87ABF0 80241010 03E00008 */  jr        $ra
-/* 87ABF4 80241014 24020002 */   addiu    $v0, $zero, 2
-/* 87ABF8 80241018 00000000 */  nop
-/* 87ABFC 8024101C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240034_87EE24.s b/ver/us/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240034_87EE24.s
deleted file mode 100644
index b6d89ad2fb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240034_87EE24.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_87EE24
-/* 87EE24 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 87EE28 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 87EE2C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 87EE30 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 87EE34 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 87EE38 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 87EE3C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 87EE40 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 87EE44 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 87EE48 80240058 08090038 */  j         .L802400E0
-/* 87EE4C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 87EE50 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 87EE54 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 87EE58 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 87EE5C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 87EE60 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 87EE64 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 87EE68 80240078 14400003 */  bnez      $v0, .L80240088
-/* 87EE6C 8024007C 00000000 */   nop
-/* 87EE70 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 87EE74 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 87EE78 80240088 44822000 */  mtc1      $v0, $f4
-/* 87EE7C 8024008C 00000000 */  nop
-/* 87EE80 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 87EE84 80240094 44062000 */  mfc1      $a2, $f4
-/* 87EE88 80240098 44872000 */  mtc1      $a3, $f4
-/* 87EE8C 8024009C 00000000 */  nop
-/* 87EE90 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 87EE94 802400A4 44806000 */  mtc1      $zero, $f12
-/* 87EE98 802400A8 44072000 */  mfc1      $a3, $f4
-/* 87EE9C 802400AC 0C00A720 */  jal       atan2
-/* 87EEA0 802400B0 46006386 */   mov.s    $f14, $f12
-/* 87EEA4 802400B4 3C014270 */  lui       $at, 0x4270
-/* 87EEA8 802400B8 44811000 */  mtc1      $at, $f2
-/* 87EEAC 802400BC 00000000 */  nop
-/* 87EEB0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 87EEB4 802400C4 00000000 */  nop
-/* 87EEB8 802400C8 45000004 */  bc1f      .L802400DC
-/* 87EEBC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 87EEC0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 87EEC4 802400D4 08090038 */  j         .L802400E0
-/* 87EEC8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 87EECC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 87EED0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 87EED4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 87EED8 802400E8 03E00008 */  jr        $ra
-/* 87EEDC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A30_87F820.s b/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A30_87F820.s
deleted file mode 100644
index 46244b75df..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A30_87F820.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240A30_87F820
-/* 87F820 80240A30 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 87F824 80240A34 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 87F828 80240A38 8C82000C */  lw        $v0, 0xc($a0)
-/* 87F82C 80240A3C 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
-/* 87F830 80240A40 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
-/* 87F834 80240A44 0C0B2026 */  jal       set_variable
-/* 87F838 80240A48 8C450000 */   lw       $a1, ($v0)
-/* 87F83C 80240A4C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 87F840 80240A50 24020002 */  addiu     $v0, $zero, 2
-/* 87F844 80240A54 03E00008 */  jr        $ra
-/* 87F848 80240A58 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240034_8821F4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240034_8821F4.s
deleted file mode 100644
index 4c58a44b77..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240034_8821F4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_8821F4
-/* 8821F4 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8821F8 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8821FC 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 882200 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 882204 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 882208 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 88220C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 882210 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 882214 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 882218 80240058 08090038 */  j         .L802400E0
-/* 88221C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 882220 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 882224 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 882228 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 88222C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 882230 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 882234 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 882238 80240078 14400003 */  bnez      $v0, .L80240088
-/* 88223C 8024007C 00000000 */   nop
-/* 882240 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 882244 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 882248 80240088 44822000 */  mtc1      $v0, $f4
-/* 88224C 8024008C 00000000 */  nop
-/* 882250 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 882254 80240094 44062000 */  mfc1      $a2, $f4
-/* 882258 80240098 44872000 */  mtc1      $a3, $f4
-/* 88225C 8024009C 00000000 */  nop
-/* 882260 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 882264 802400A4 44806000 */  mtc1      $zero, $f12
-/* 882268 802400A8 44072000 */  mfc1      $a3, $f4
-/* 88226C 802400AC 0C00A720 */  jal       atan2
-/* 882270 802400B0 46006386 */   mov.s    $f14, $f12
-/* 882274 802400B4 3C014270 */  lui       $at, 0x4270
-/* 882278 802400B8 44811000 */  mtc1      $at, $f2
-/* 88227C 802400BC 00000000 */  nop
-/* 882280 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 882284 802400C4 00000000 */  nop
-/* 882288 802400C8 45000004 */  bc1f      .L802400DC
-/* 88228C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 882290 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 882294 802400D4 08090038 */  j         .L802400E0
-/* 882298 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 88229C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 8822A0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8822A4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8822A8 802400E8 03E00008 */  jr        $ra
-/* 8822AC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s
deleted file mode 100644
index d456e0334d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240754_886B14
-/* 886B14 80240754 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 886B18 80240758 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 886B1C 8024075C 000420C0 */  sll       $a0, $a0, 3
-/* 886B20 80240760 00822021 */  addu      $a0, $a0, $v0
-/* 886B24 80240764 90820014 */  lbu       $v0, 0x14($a0)
-/* 886B28 80240768 10400009 */  beqz      $v0, .L80240790
-/* 886B2C 8024076C 00000000 */   nop
-/* 886B30 80240770 90820015 */  lbu       $v0, 0x15($a0)
-/* 886B34 80240774 00022600 */  sll       $a0, $v0, 0x18
-/* 886B38 80240778 00041E03 */  sra       $v1, $a0, 0x18
-/* 886B3C 8024077C 00051400 */  sll       $v0, $a1, 0x10
-/* 886B40 80240780 00021403 */  sra       $v0, $v0, 0x10
-/* 886B44 80240784 0043102A */  slt       $v0, $v0, $v1
-/* 886B48 80240788 10400003 */  beqz      $v0, .L80240798
-/* 886B4C 8024078C 00000000 */   nop
-.L80240790:
-/* 886B50 80240790 03E00008 */  jr        $ra
-/* 886B54 80240794 2402FFFF */   addiu    $v0, $zero, -1
-.L80240798:
-/* 886B58 80240798 03E00008 */  jr        $ra
-/* 886B5C 8024079C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s
deleted file mode 100644
index 4316a071b1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802407A0_886B60
-/* 886B60 802407A0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 886B64 802407A4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 886B68 802407A8 0080982D */  daddu     $s3, $a0, $zero
-/* 886B6C 802407AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 886B70 802407B0 24100001 */  addiu     $s0, $zero, 1
-/* 886B74 802407B4 AFB40020 */  sw        $s4, 0x20($sp)
-/* 886B78 802407B8 2414FFFF */  addiu     $s4, $zero, -1
-/* 886B7C 802407BC AFB50024 */  sw        $s5, 0x24($sp)
-/* 886B80 802407C0 0200A82D */  daddu     $s5, $s0, $zero
-/* 886B84 802407C4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 886B88 802407C8 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 886B8C 802407CC 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 886B90 802407D0 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 886B94 802407D4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 886B98 802407D8 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 886B9C 802407DC 0280182D */  daddu     $v1, $s4, $zero
-/* 886BA0 802407E0 AE630084 */  sw        $v1, 0x84($s3)
-/* 886BA4 802407E4 00021027 */  nor       $v0, $zero, $v0
-/* 886BA8 802407E8 000217C2 */  srl       $v0, $v0, 0x1f
-/* 886BAC 802407EC 00029400 */  sll       $s2, $v0, 0x10
-.L802407F0:
-/* 886BB0 802407F0 92220014 */  lbu       $v0, 0x14($s1)
-/* 886BB4 802407F4 50400008 */  beql      $v0, $zero, .L80240818
-/* 886BB8 802407F8 26100001 */   addiu    $s0, $s0, 1
-/* 886BBC 802407FC 0200202D */  daddu     $a0, $s0, $zero
-/* 886BC0 80240800 0C0901D5 */  jal       func_80240754_886B14
-/* 886BC4 80240804 00122C03 */   sra      $a1, $s2, 0x10
-/* 886BC8 80240808 10540003 */  beq       $v0, $s4, .L80240818
-/* 886BCC 8024080C 26100001 */   addiu    $s0, $s0, 1
-/* 886BD0 80240810 08090209 */  j         .L80240824
-/* 886BD4 80240814 AE750084 */   sw       $s5, 0x84($s3)
-.L80240818:
-/* 886BD8 80240818 2A02000C */  slti      $v0, $s0, 0xc
-/* 886BDC 8024081C 1440FFF4 */  bnez      $v0, .L802407F0
-/* 886BE0 80240820 26310008 */   addiu    $s1, $s1, 8
-.L80240824:
-/* 886BE4 80240824 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 886BE8 80240828 8FB50024 */  lw        $s5, 0x24($sp)
-/* 886BEC 8024082C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 886BF0 80240830 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 886BF4 80240834 8FB20018 */  lw        $s2, 0x18($sp)
-/* 886BF8 80240838 8FB10014 */  lw        $s1, 0x14($sp)
-/* 886BFC 8024083C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 886C00 80240840 24020002 */  addiu     $v0, $zero, 2
-/* 886C04 80240844 03E00008 */  jr        $ra
-/* 886C08 80240848 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s
index 51aaffd83f..bbcbc13902 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s
@@ -49,7 +49,7 @@ glabel func_8024084C_886C0C
 /* 886CB8 802408F8 AE300108 */  sw        $s0, 0x108($s1)
 /* 886CBC 802408FC 8C420000 */  lw        $v0, ($v0)
 /* 886CC0 80240900 02E0282D */  daddu     $a1, $s7, $zero
-/* 886CC4 80240904 0C0901D5 */  jal       func_80240754_886B14
+/* 886CC4 80240904 0C0901D5 */  jal       tik_10_UnkFunc37
 /* 886CC8 80240908 AE220084 */   sw       $v0, 0x84($s1)
 /* 886CCC 8024090C 0040202D */  daddu     $a0, $v0, $zero
 /* 886CD0 80240910 04800011 */  bltz      $a0, .L80240958
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90_886F50.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90_886F50.s
deleted file mode 100644
index 219df6bd7e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90_886F50.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B90_886F50
-/* 886F50 80240B90 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 886F54 80240B94 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 886F58 80240B98 8C82000C */  lw        $v0, 0xc($a0)
-/* 886F5C 80240B9C 0C0B1EAF */  jal       get_variable
-/* 886F60 80240BA0 8C450000 */   lw       $a1, ($v0)
-/* 886F64 80240BA4 0040202D */  daddu     $a0, $v0, $zero
-/* 886F68 80240BA8 8C830000 */  lw        $v1, ($a0)
-/* 886F6C 80240BAC 34630010 */  ori       $v1, $v1, 0x10
-/* 886F70 80240BB0 AC830000 */  sw        $v1, ($a0)
-/* 886F74 80240BB4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 886F78 80240BB8 24020002 */  addiu     $v0, $zero, 2
-/* 886F7C 80240BBC 03E00008 */  jr        $ra
-/* 886F80 80240BC0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241388_887748.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241388_887748.s
deleted file mode 100644
index e5a1156443..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241388_887748.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241388_887748
-/* 887748 80241388 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 88774C 8024138C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 887750 80241390 AC800084 */  sw        $zero, 0x84($a0)
-/* 887754 80241394 80620000 */  lb        $v0, ($v1)
-/* 887758 80241398 10400005 */  beqz      $v0, .L802413B0
-/* 88775C 8024139C 24020003 */   addiu    $v0, $zero, 3
-/* 887760 802413A0 80630003 */  lb        $v1, 3($v1)
-/* 887764 802413A4 14620002 */  bne       $v1, $v0, .L802413B0
-/* 887768 802413A8 24020001 */   addiu    $v0, $zero, 1
-/* 88776C 802413AC AC820084 */  sw        $v0, 0x84($a0)
-.L802413B0:
-/* 887770 802413B0 03E00008 */  jr        $ra
-/* 887774 802413B4 24020002 */   addiu    $v0, $zero, 2
-/* 887778 802413B8 00000000 */  nop
-/* 88777C 802413BC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240034_888C04.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240034_888C04.s
deleted file mode 100644
index 711ed27b7d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240034_888C04.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_888C04
-/* 888C04 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 888C08 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 888C0C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 888C10 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 888C14 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 888C18 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 888C1C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 888C20 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 888C24 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 888C28 80240058 08090038 */  j         .L802400E0
-/* 888C2C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 888C30 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 888C34 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 888C38 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 888C3C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 888C40 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 888C44 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 888C48 80240078 14400003 */  bnez      $v0, .L80240088
-/* 888C4C 8024007C 00000000 */   nop
-/* 888C50 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 888C54 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 888C58 80240088 44822000 */  mtc1      $v0, $f4
-/* 888C5C 8024008C 00000000 */  nop
-/* 888C60 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 888C64 80240094 44062000 */  mfc1      $a2, $f4
-/* 888C68 80240098 44872000 */  mtc1      $a3, $f4
-/* 888C6C 8024009C 00000000 */  nop
-/* 888C70 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 888C74 802400A4 44806000 */  mtc1      $zero, $f12
-/* 888C78 802400A8 44072000 */  mfc1      $a3, $f4
-/* 888C7C 802400AC 0C00A720 */  jal       atan2
-/* 888C80 802400B0 46006386 */   mov.s    $f14, $f12
-/* 888C84 802400B4 3C014270 */  lui       $at, 0x4270
-/* 888C88 802400B8 44811000 */  mtc1      $at, $f2
-/* 888C8C 802400BC 00000000 */  nop
-/* 888C90 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 888C94 802400C4 00000000 */  nop
-/* 888C98 802400C8 45000004 */  bc1f      .L802400DC
-/* 888C9C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 888CA0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 888CA4 802400D4 08090038 */  j         .L802400E0
-/* 888CA8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 888CAC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 888CB0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 888CB4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 888CB8 802400E8 03E00008 */  jr        $ra
-/* 888CBC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s
deleted file mode 100644
index 0027852ead..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240CF0_8898C0
-/* 8898C0 80240CF0 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 8898C4 80240CF4 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 8898C8 80240CF8 000420C0 */  sll       $a0, $a0, 3
-/* 8898CC 80240CFC 00822021 */  addu      $a0, $a0, $v0
-/* 8898D0 80240D00 90820014 */  lbu       $v0, 0x14($a0)
-/* 8898D4 80240D04 10400009 */  beqz      $v0, .L80240D2C
-/* 8898D8 80240D08 00000000 */   nop
-/* 8898DC 80240D0C 90820015 */  lbu       $v0, 0x15($a0)
-/* 8898E0 80240D10 00022600 */  sll       $a0, $v0, 0x18
-/* 8898E4 80240D14 00041E03 */  sra       $v1, $a0, 0x18
-/* 8898E8 80240D18 00051400 */  sll       $v0, $a1, 0x10
-/* 8898EC 80240D1C 00021403 */  sra       $v0, $v0, 0x10
-/* 8898F0 80240D20 0043102A */  slt       $v0, $v0, $v1
-/* 8898F4 80240D24 10400003 */  beqz      $v0, .L80240D34
-/* 8898F8 80240D28 00000000 */   nop
-.L80240D2C:
-/* 8898FC 80240D2C 03E00008 */  jr        $ra
-/* 889900 80240D30 2402FFFF */   addiu    $v0, $zero, -1
-.L80240D34:
-/* 889904 80240D34 03E00008 */  jr        $ra
-/* 889908 80240D38 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s
deleted file mode 100644
index 3b5c3812b5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D3C_88990C
-/* 88990C 80240D3C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 889910 80240D40 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 889914 80240D44 0080982D */  daddu     $s3, $a0, $zero
-/* 889918 80240D48 AFB00010 */  sw        $s0, 0x10($sp)
-/* 88991C 80240D4C 24100001 */  addiu     $s0, $zero, 1
-/* 889920 80240D50 AFB40020 */  sw        $s4, 0x20($sp)
-/* 889924 80240D54 2414FFFF */  addiu     $s4, $zero, -1
-/* 889928 80240D58 AFB50024 */  sw        $s5, 0x24($sp)
-/* 88992C 80240D5C 0200A82D */  daddu     $s5, $s0, $zero
-/* 889930 80240D60 AFB10014 */  sw        $s1, 0x14($sp)
-/* 889934 80240D64 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 889938 80240D68 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 88993C 80240D6C AFBF0028 */  sw        $ra, 0x28($sp)
-/* 889940 80240D70 AFB20018 */  sw        $s2, 0x18($sp)
-/* 889944 80240D74 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 889948 80240D78 0280182D */  daddu     $v1, $s4, $zero
-/* 88994C 80240D7C AE630084 */  sw        $v1, 0x84($s3)
-/* 889950 80240D80 00021027 */  nor       $v0, $zero, $v0
-/* 889954 80240D84 000217C2 */  srl       $v0, $v0, 0x1f
-/* 889958 80240D88 00029400 */  sll       $s2, $v0, 0x10
-.L80240D8C:
-/* 88995C 80240D8C 92220014 */  lbu       $v0, 0x14($s1)
-/* 889960 80240D90 50400008 */  beql      $v0, $zero, .L80240DB4
-/* 889964 80240D94 26100001 */   addiu    $s0, $s0, 1
-/* 889968 80240D98 0200202D */  daddu     $a0, $s0, $zero
-/* 88996C 80240D9C 0C09033C */  jal       func_80240CF0_8898C0
-/* 889970 80240DA0 00122C03 */   sra      $a1, $s2, 0x10
-/* 889974 80240DA4 10540003 */  beq       $v0, $s4, .L80240DB4
-/* 889978 80240DA8 26100001 */   addiu    $s0, $s0, 1
-/* 88997C 80240DAC 08090370 */  j         .L80240DC0
-/* 889980 80240DB0 AE750084 */   sw       $s5, 0x84($s3)
-.L80240DB4:
-/* 889984 80240DB4 2A02000C */  slti      $v0, $s0, 0xc
-/* 889988 80240DB8 1440FFF4 */  bnez      $v0, .L80240D8C
-/* 88998C 80240DBC 26310008 */   addiu    $s1, $s1, 8
-.L80240DC0:
-/* 889990 80240DC0 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 889994 80240DC4 8FB50024 */  lw        $s5, 0x24($sp)
-/* 889998 80240DC8 8FB40020 */  lw        $s4, 0x20($sp)
-/* 88999C 80240DCC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8899A0 80240DD0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8899A4 80240DD4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8899A8 80240DD8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8899AC 80240DDC 24020002 */  addiu     $v0, $zero, 2
-/* 8899B0 80240DE0 03E00008 */  jr        $ra
-/* 8899B4 80240DE4 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s
index 8d73cfdea1..1efc451cdb 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s
@@ -49,7 +49,7 @@ glabel func_80240DE8_8899B8
 /* 889A64 80240E94 AE300108 */  sw        $s0, 0x108($s1)
 /* 889A68 80240E98 8C420000 */  lw        $v0, ($v0)
 /* 889A6C 80240E9C 02E0282D */  daddu     $a1, $s7, $zero
-/* 889A70 80240EA0 0C09033C */  jal       func_80240CF0_8898C0
+/* 889A70 80240EA0 0C09033C */  jal       tik_12_UnkFunc37
 /* 889A74 80240EA4 AE220084 */   sw       $v0, 0x84($s1)
 /* 889A78 80240EA8 0040202D */  daddu     $a0, $v0, $zero
 /* 889A7C 80240EAC 04800011 */  bltz      $a0, .L80240EF4
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C_889CFC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C_889CFC.s
deleted file mode 100644
index 6456972912..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C_889CFC.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024112C_889CFC
-/* 889CFC 8024112C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 889D00 80241130 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 889D04 80241134 8C82000C */  lw        $v0, 0xc($a0)
-/* 889D08 80241138 0C0B1EAF */  jal       get_variable
-/* 889D0C 8024113C 8C450000 */   lw       $a1, ($v0)
-/* 889D10 80241140 0040202D */  daddu     $a0, $v0, $zero
-/* 889D14 80241144 8C830000 */  lw        $v1, ($a0)
-/* 889D18 80241148 34630010 */  ori       $v1, $v1, 0x10
-/* 889D1C 8024114C AC830000 */  sw        $v1, ($a0)
-/* 889D20 80241150 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 889D24 80241154 24020002 */  addiu     $v0, $zero, 2
-/* 889D28 80241158 03E00008 */  jr        $ra
-/* 889D2C 8024115C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s
deleted file mode 100644
index 9e55c96760..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241924_88A4F4
-/* 88A4F4 80241924 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 88A4F8 80241928 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 88A4FC 8024192C AC800084 */  sw        $zero, 0x84($a0)
-/* 88A500 80241930 80620000 */  lb        $v0, ($v1)
-/* 88A504 80241934 10400005 */  beqz      $v0, .L8024194C
-/* 88A508 80241938 24020003 */   addiu    $v0, $zero, 3
-/* 88A50C 8024193C 80630003 */  lb        $v1, 3($v1)
-/* 88A510 80241940 14620002 */  bne       $v1, $v0, .L8024194C
-/* 88A514 80241944 24020001 */   addiu    $v0, $zero, 1
-/* 88A518 80241948 AC820084 */  sw        $v0, 0x84($a0)
-.L8024194C:
-/* 88A51C 8024194C 03E00008 */  jr        $ra
-/* 88A520 80241950 24020002 */   addiu    $v0, $zero, 2
-/* 88A524 80241954 00000000 */  nop
-/* 88A528 80241958 00000000 */  nop
-/* 88A52C 8024195C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240034_88D634.s b/ver/us/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240034_88D634.s
deleted file mode 100644
index ea07ecd60b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240034_88D634.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_88D634
-/* 88D634 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 88D638 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 88D63C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 88D640 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 88D644 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 88D648 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 88D64C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 88D650 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 88D654 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 88D658 80240058 08090038 */  j         .L802400E0
-/* 88D65C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 88D660 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 88D664 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 88D668 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 88D66C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 88D670 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 88D674 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 88D678 80240078 14400003 */  bnez      $v0, .L80240088
-/* 88D67C 8024007C 00000000 */   nop
-/* 88D680 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 88D684 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 88D688 80240088 44822000 */  mtc1      $v0, $f4
-/* 88D68C 8024008C 00000000 */  nop
-/* 88D690 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 88D694 80240094 44062000 */  mfc1      $a2, $f4
-/* 88D698 80240098 44872000 */  mtc1      $a3, $f4
-/* 88D69C 8024009C 00000000 */  nop
-/* 88D6A0 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 88D6A4 802400A4 44806000 */  mtc1      $zero, $f12
-/* 88D6A8 802400A8 44072000 */  mfc1      $a3, $f4
-/* 88D6AC 802400AC 0C00A720 */  jal       atan2
-/* 88D6B0 802400B0 46006386 */   mov.s    $f14, $f12
-/* 88D6B4 802400B4 3C014270 */  lui       $at, 0x4270
-/* 88D6B8 802400B8 44811000 */  mtc1      $at, $f2
-/* 88D6BC 802400BC 00000000 */  nop
-/* 88D6C0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 88D6C4 802400C4 00000000 */  nop
-/* 88D6C8 802400C8 45000004 */  bc1f      .L802400DC
-/* 88D6CC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 88D6D0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 88D6D4 802400D4 08090038 */  j         .L802400E0
-/* 88D6D8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 88D6DC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 88D6E0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 88D6E4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 88D6E8 802400E8 03E00008 */  jr        $ra
-/* 88D6EC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240034_88FBD4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240034_88FBD4.s
deleted file mode 100644
index a6a14d1c4c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240034_88FBD4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_88FBD4
-/* 88FBD4 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 88FBD8 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 88FBDC 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 88FBE0 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 88FBE4 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 88FBE8 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 88FBEC 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 88FBF0 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 88FBF4 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 88FBF8 80240058 08090038 */  j         .L802400E0
-/* 88FBFC 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 88FC00 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 88FC04 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 88FC08 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 88FC0C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 88FC10 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 88FC14 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 88FC18 80240078 14400003 */  bnez      $v0, .L80240088
-/* 88FC1C 8024007C 00000000 */   nop
-/* 88FC20 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 88FC24 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 88FC28 80240088 44822000 */  mtc1      $v0, $f4
-/* 88FC2C 8024008C 00000000 */  nop
-/* 88FC30 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 88FC34 80240094 44062000 */  mfc1      $a2, $f4
-/* 88FC38 80240098 44872000 */  mtc1      $a3, $f4
-/* 88FC3C 8024009C 00000000 */  nop
-/* 88FC40 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 88FC44 802400A4 44806000 */  mtc1      $zero, $f12
-/* 88FC48 802400A8 44072000 */  mfc1      $a3, $f4
-/* 88FC4C 802400AC 0C00A720 */  jal       atan2
-/* 88FC50 802400B0 46006386 */   mov.s    $f14, $f12
-/* 88FC54 802400B4 3C014270 */  lui       $at, 0x4270
-/* 88FC58 802400B8 44811000 */  mtc1      $at, $f2
-/* 88FC5C 802400BC 00000000 */  nop
-/* 88FC60 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 88FC64 802400C4 00000000 */  nop
-/* 88FC68 802400C8 45000004 */  bc1f      .L802400DC
-/* 88FC6C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 88FC70 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 88FC74 802400D4 08090038 */  j         .L802400E0
-/* 88FC78 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 88FC7C 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 88FC80 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 88FC84 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 88FC88 802400E8 03E00008 */  jr        $ra
-/* 88FC8C 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s
deleted file mode 100644
index 93e500a28b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240104_892B24
-/* 892B24 80240104 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 892B28 80240108 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 892B2C 8024010C 000420C0 */  sll       $a0, $a0, 3
-/* 892B30 80240110 00822021 */  addu      $a0, $a0, $v0
-/* 892B34 80240114 90820014 */  lbu       $v0, 0x14($a0)
-/* 892B38 80240118 10400009 */  beqz      $v0, .L80240140
-/* 892B3C 8024011C 00000000 */   nop
-/* 892B40 80240120 90820015 */  lbu       $v0, 0x15($a0)
-/* 892B44 80240124 00022600 */  sll       $a0, $v0, 0x18
-/* 892B48 80240128 00041E03 */  sra       $v1, $a0, 0x18
-/* 892B4C 8024012C 00051400 */  sll       $v0, $a1, 0x10
-/* 892B50 80240130 00021403 */  sra       $v0, $v0, 0x10
-/* 892B54 80240134 0043102A */  slt       $v0, $v0, $v1
-/* 892B58 80240138 10400003 */  beqz      $v0, .L80240148
-/* 892B5C 8024013C 00000000 */   nop
-.L80240140:
-/* 892B60 80240140 03E00008 */  jr        $ra
-/* 892B64 80240144 2402FFFF */   addiu    $v0, $zero, -1
-.L80240148:
-/* 892B68 80240148 03E00008 */  jr        $ra
-/* 892B6C 8024014C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s
deleted file mode 100644
index c35cdb854f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240150_892B70
-/* 892B70 80240150 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 892B74 80240154 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 892B78 80240158 0080982D */  daddu     $s3, $a0, $zero
-/* 892B7C 8024015C AFB00010 */  sw        $s0, 0x10($sp)
-/* 892B80 80240160 24100001 */  addiu     $s0, $zero, 1
-/* 892B84 80240164 AFB40020 */  sw        $s4, 0x20($sp)
-/* 892B88 80240168 2414FFFF */  addiu     $s4, $zero, -1
-/* 892B8C 8024016C AFB50024 */  sw        $s5, 0x24($sp)
-/* 892B90 80240170 0200A82D */  daddu     $s5, $s0, $zero
-/* 892B94 80240174 AFB10014 */  sw        $s1, 0x14($sp)
-/* 892B98 80240178 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 892B9C 8024017C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 892BA0 80240180 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 892BA4 80240184 AFB20018 */  sw        $s2, 0x18($sp)
-/* 892BA8 80240188 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 892BAC 8024018C 0280182D */  daddu     $v1, $s4, $zero
-/* 892BB0 80240190 AE630084 */  sw        $v1, 0x84($s3)
-/* 892BB4 80240194 00021027 */  nor       $v0, $zero, $v0
-/* 892BB8 80240198 000217C2 */  srl       $v0, $v0, 0x1f
-/* 892BBC 8024019C 00029400 */  sll       $s2, $v0, 0x10
-.L802401A0:
-/* 892BC0 802401A0 92220014 */  lbu       $v0, 0x14($s1)
-/* 892BC4 802401A4 50400008 */  beql      $v0, $zero, .L802401C8
-/* 892BC8 802401A8 26100001 */   addiu    $s0, $s0, 1
-/* 892BCC 802401AC 0200202D */  daddu     $a0, $s0, $zero
-/* 892BD0 802401B0 0C090041 */  jal       func_80240104_892B24
-/* 892BD4 802401B4 00122C03 */   sra      $a1, $s2, 0x10
-/* 892BD8 802401B8 10540003 */  beq       $v0, $s4, .L802401C8
-/* 892BDC 802401BC 26100001 */   addiu    $s0, $s0, 1
-/* 892BE0 802401C0 08090075 */  j         .L802401D4
-/* 892BE4 802401C4 AE750084 */   sw       $s5, 0x84($s3)
-.L802401C8:
-/* 892BE8 802401C8 2A02000C */  slti      $v0, $s0, 0xc
-/* 892BEC 802401CC 1440FFF4 */  bnez      $v0, .L802401A0
-/* 892BF0 802401D0 26310008 */   addiu    $s1, $s1, 8
-.L802401D4:
-/* 892BF4 802401D4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 892BF8 802401D8 8FB50024 */  lw        $s5, 0x24($sp)
-/* 892BFC 802401DC 8FB40020 */  lw        $s4, 0x20($sp)
-/* 892C00 802401E0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 892C04 802401E4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 892C08 802401E8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 892C0C 802401EC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 892C10 802401F0 24020002 */  addiu     $v0, $zero, 2
-/* 892C14 802401F4 03E00008 */  jr        $ra
-/* 892C18 802401F8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s
index a5e39fa8b4..8114001046 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s
@@ -49,7 +49,7 @@ glabel func_802401FC_892C1C
 /* 892CC8 802402A8 AE300108 */  sw        $s0, 0x108($s1)
 /* 892CCC 802402AC 8C420000 */  lw        $v0, ($v0)
 /* 892CD0 802402B0 02E0282D */  daddu     $a1, $s7, $zero
-/* 892CD4 802402B4 0C090041 */  jal       func_80240104_892B24
+/* 892CD4 802402B4 0C090041 */  jal       tik_17_UnkFunc37
 /* 892CD8 802402B8 AE220084 */   sw       $v0, 0x84($s1)
 /* 892CDC 802402BC 0040202D */  daddu     $a0, $v0, $zero
 /* 892CE0 802402C0 04800011 */  bltz      $a0, .L80240308
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540_892F60.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540_892F60.s
deleted file mode 100644
index 52a28601fa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540_892F60.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240540_892F60
-/* 892F60 80240540 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 892F64 80240544 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 892F68 80240548 8C82000C */  lw        $v0, 0xc($a0)
-/* 892F6C 8024054C 0C0B1EAF */  jal       get_variable
-/* 892F70 80240550 8C450000 */   lw       $a1, ($v0)
-/* 892F74 80240554 0040202D */  daddu     $a0, $v0, $zero
-/* 892F78 80240558 8C830000 */  lw        $v1, ($a0)
-/* 892F7C 8024055C 34630010 */  ori       $v1, $v1, 0x10
-/* 892F80 80240560 AC830000 */  sw        $v1, ($a0)
-/* 892F84 80240564 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 892F88 80240568 24020002 */  addiu     $v0, $zero, 2
-/* 892F8C 8024056C 03E00008 */  jr        $ra
-/* 892F90 80240570 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s
deleted file mode 100644
index 80628c822e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240D38_893758
-/* 893758 80240D38 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 89375C 80240D3C 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 893760 80240D40 AC800084 */  sw        $zero, 0x84($a0)
-/* 893764 80240D44 80620000 */  lb        $v0, ($v1)
-/* 893768 80240D48 10400005 */  beqz      $v0, .L80240D60
-/* 89376C 80240D4C 24020003 */   addiu    $v0, $zero, 3
-/* 893770 80240D50 80630003 */  lb        $v1, 3($v1)
-/* 893774 80240D54 14620002 */  bne       $v1, $v0, .L80240D60
-/* 893778 80240D58 24020001 */   addiu    $v0, $zero, 1
-/* 89377C 80240D5C AC820084 */  sw        $v0, 0x84($a0)
-.L80240D60:
-/* 893780 80240D60 03E00008 */  jr        $ra
-/* 893784 80240D64 24020002 */   addiu    $v0, $zero, 2
-/* 893788 80240D68 00000000 */  nop
-/* 89378C 80240D6C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240DA4_8937C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240DA4_8937C4.s
deleted file mode 100644
index 21265db8e5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240DA4_8937C4.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240DA4_8937C4
-/* 8937C4 80240DA4 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8937C8 80240DA8 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8937CC 80240DAC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8937D0 80240DB0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8937D4 80240DB4 0080802D */  daddu     $s0, $a0, $zero
-/* 8937D8 80240DB8 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8937DC 80240DBC 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 8937E0 80240DC0 10620003 */  beq       $v1, $v0, .L80240DD0
-/* 8937E4 80240DC4 24020002 */   addiu    $v0, $zero, 2
-/* 8937E8 80240DC8 08090394 */  j         .L80240E50
-/* 8937EC 80240DCC AE000084 */   sw       $zero, 0x84($s0)
-.L80240DD0:
-/* 8937F0 80240DD0 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8937F4 80240DD4 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8937F8 80240DD8 80620040 */  lb        $v0, 0x40($v1)
-/* 8937FC 80240DDC 80670044 */  lb        $a3, 0x44($v1)
-/* 893800 80240DE0 04420001 */  bltzl     $v0, .L80240DE8
-/* 893804 80240DE4 00021023 */   negu     $v0, $v0
-.L80240DE8:
-/* 893808 80240DE8 14400003 */  bnez      $v0, .L80240DF8
-/* 89380C 80240DEC 00000000 */   nop
-/* 893810 80240DF0 50E00017 */  beql      $a3, $zero, .L80240E50
-/* 893814 80240DF4 0000102D */   daddu    $v0, $zero, $zero
-.L80240DF8:
-/* 893818 80240DF8 44822000 */  mtc1      $v0, $f4
-/* 89381C 80240DFC 00000000 */  nop
-/* 893820 80240E00 46802120 */  cvt.s.w   $f4, $f4
-/* 893824 80240E04 44062000 */  mfc1      $a2, $f4
-/* 893828 80240E08 44872000 */  mtc1      $a3, $f4
-/* 89382C 80240E0C 00000000 */  nop
-/* 893830 80240E10 46802120 */  cvt.s.w   $f4, $f4
-/* 893834 80240E14 44806000 */  mtc1      $zero, $f12
-/* 893838 80240E18 44072000 */  mfc1      $a3, $f4
-/* 89383C 80240E1C 0C00A720 */  jal       atan2
-/* 893840 80240E20 46006386 */   mov.s    $f14, $f12
-/* 893844 80240E24 3C014270 */  lui       $at, 0x4270
-/* 893848 80240E28 44811000 */  mtc1      $at, $f2
-/* 89384C 80240E2C 00000000 */  nop
-/* 893850 80240E30 4602003C */  c.lt.s    $f0, $f2
-/* 893854 80240E34 00000000 */  nop
-/* 893858 80240E38 45000004 */  bc1f      .L80240E4C
-/* 89385C 80240E3C 24020001 */   addiu    $v0, $zero, 1
-/* 893860 80240E40 AE020084 */  sw        $v0, 0x84($s0)
-/* 893864 80240E44 08090394 */  j         .L80240E50
-/* 893868 80240E48 24020002 */   addiu    $v0, $zero, 2
-.L80240E4C:
-/* 89386C 80240E4C 0000102D */  daddu     $v0, $zero, $zero
-.L80240E50:
-/* 893870 80240E50 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 893874 80240E54 8FB00010 */  lw        $s0, 0x10($sp)
-/* 893878 80240E58 03E00008 */  jr        $ra
-/* 89387C 80240E5C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240034_897614.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240034_897614.s
deleted file mode 100644
index 37fbf79dbf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240034_897614.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_897614
-/* 897614 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 897618 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 89761C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 897620 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 897624 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 897628 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 89762C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 897630 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 897634 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 897638 80240058 08090038 */  j         .L802400E0
-/* 89763C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 897640 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 897644 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 897648 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 89764C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 897650 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 897654 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 897658 80240078 14400003 */  bnez      $v0, .L80240088
-/* 89765C 8024007C 00000000 */   nop
-/* 897660 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 897664 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 897668 80240088 44822000 */  mtc1      $v0, $f4
-/* 89766C 8024008C 00000000 */  nop
-/* 897670 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 897674 80240094 44062000 */  mfc1      $a2, $f4
-/* 897678 80240098 44872000 */  mtc1      $a3, $f4
-/* 89767C 8024009C 00000000 */  nop
-/* 897680 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 897684 802400A4 44806000 */  mtc1      $zero, $f12
-/* 897688 802400A8 44072000 */  mfc1      $a3, $f4
-/* 89768C 802400AC 0C00A720 */  jal       atan2
-/* 897690 802400B0 46006386 */   mov.s    $f14, $f12
-/* 897694 802400B4 3C014270 */  lui       $at, 0x4270
-/* 897698 802400B8 44811000 */  mtc1      $at, $f2
-/* 89769C 802400BC 00000000 */  nop
-/* 8976A0 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 8976A4 802400C4 00000000 */  nop
-/* 8976A8 802400C8 45000004 */  bc1f      .L802400DC
-/* 8976AC 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 8976B0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 8976B4 802400D4 08090038 */  j         .L802400E0
-/* 8976B8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 8976BC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 8976C0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8976C4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8976C8 802400E8 03E00008 */  jr        $ra
-/* 8976CC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s
deleted file mode 100644
index 7c36a03853..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s
+++ /dev/null
@@ -1,25 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406C4_897CA4
-/* 897CA4 802406C4 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 897CA8 802406C8 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 897CAC 802406CC 000420C0 */  sll       $a0, $a0, 3
-/* 897CB0 802406D0 00822021 */  addu      $a0, $a0, $v0
-/* 897CB4 802406D4 90820014 */  lbu       $v0, 0x14($a0)
-/* 897CB8 802406D8 10400009 */  beqz      $v0, .L80240700
-/* 897CBC 802406DC 00000000 */   nop
-/* 897CC0 802406E0 90820015 */  lbu       $v0, 0x15($a0)
-/* 897CC4 802406E4 00022600 */  sll       $a0, $v0, 0x18
-/* 897CC8 802406E8 00041E03 */  sra       $v1, $a0, 0x18
-/* 897CCC 802406EC 00051400 */  sll       $v0, $a1, 0x10
-/* 897CD0 802406F0 00021403 */  sra       $v0, $v0, 0x10
-/* 897CD4 802406F4 0043102A */  slt       $v0, $v0, $v1
-/* 897CD8 802406F8 10400003 */  beqz      $v0, .L80240708
-/* 897CDC 802406FC 00000000 */   nop
-.L80240700:
-/* 897CE0 80240700 03E00008 */  jr        $ra
-/* 897CE4 80240704 2402FFFF */   addiu    $v0, $zero, -1
-.L80240708:
-/* 897CE8 80240708 03E00008 */  jr        $ra
-/* 897CEC 8024070C 00041603 */   sra      $v0, $a0, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s
deleted file mode 100644
index 9d6fab67d9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240710_897CF0
-/* 897CF0 80240710 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 897CF4 80240714 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 897CF8 80240718 0080982D */  daddu     $s3, $a0, $zero
-/* 897CFC 8024071C AFB00010 */  sw        $s0, 0x10($sp)
-/* 897D00 80240720 24100001 */  addiu     $s0, $zero, 1
-/* 897D04 80240724 AFB40020 */  sw        $s4, 0x20($sp)
-/* 897D08 80240728 2414FFFF */  addiu     $s4, $zero, -1
-/* 897D0C 8024072C AFB50024 */  sw        $s5, 0x24($sp)
-/* 897D10 80240730 0200A82D */  daddu     $s5, $s0, $zero
-/* 897D14 80240734 AFB10014 */  sw        $s1, 0x14($sp)
-/* 897D18 80240738 3C118011 */  lui       $s1, %hi(gPlayerData+0x8)
-/* 897D1C 8024073C 2631F298 */  addiu     $s1, $s1, %lo(gPlayerData+0x8)
-/* 897D20 80240740 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 897D24 80240744 AFB20018 */  sw        $s2, 0x18($sp)
-/* 897D28 80240748 8E6200B4 */  lw        $v0, 0xb4($s3)
-/* 897D2C 8024074C 0280182D */  daddu     $v1, $s4, $zero
-/* 897D30 80240750 AE630084 */  sw        $v1, 0x84($s3)
-/* 897D34 80240754 00021027 */  nor       $v0, $zero, $v0
-/* 897D38 80240758 000217C2 */  srl       $v0, $v0, 0x1f
-/* 897D3C 8024075C 00029400 */  sll       $s2, $v0, 0x10
-.L80240760:
-/* 897D40 80240760 92220014 */  lbu       $v0, 0x14($s1)
-/* 897D44 80240764 50400008 */  beql      $v0, $zero, .L80240788
-/* 897D48 80240768 26100001 */   addiu    $s0, $s0, 1
-/* 897D4C 8024076C 0200202D */  daddu     $a0, $s0, $zero
-/* 897D50 80240770 0C0901B1 */  jal       func_802406C4_897CA4
-/* 897D54 80240774 00122C03 */   sra      $a1, $s2, 0x10
-/* 897D58 80240778 10540003 */  beq       $v0, $s4, .L80240788
-/* 897D5C 8024077C 26100001 */   addiu    $s0, $s0, 1
-/* 897D60 80240780 080901E5 */  j         .L80240794
-/* 897D64 80240784 AE750084 */   sw       $s5, 0x84($s3)
-.L80240788:
-/* 897D68 80240788 2A02000C */  slti      $v0, $s0, 0xc
-/* 897D6C 8024078C 1440FFF4 */  bnez      $v0, .L80240760
-/* 897D70 80240790 26310008 */   addiu    $s1, $s1, 8
-.L80240794:
-/* 897D74 80240794 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 897D78 80240798 8FB50024 */  lw        $s5, 0x24($sp)
-/* 897D7C 8024079C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 897D80 802407A0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 897D84 802407A4 8FB20018 */  lw        $s2, 0x18($sp)
-/* 897D88 802407A8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 897D8C 802407AC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 897D90 802407B0 24020002 */  addiu     $v0, $zero, 2
-/* 897D94 802407B4 03E00008 */  jr        $ra
-/* 897D98 802407B8 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s
index 075ffe0fdd..f8e66a48ba 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s
@@ -49,7 +49,7 @@ glabel func_802407BC_897D9C
 /* 897E48 80240868 AE300108 */  sw        $s0, 0x108($s1)
 /* 897E4C 8024086C 8C420000 */  lw        $v0, ($v0)
 /* 897E50 80240870 02E0282D */  daddu     $a1, $s7, $zero
-/* 897E54 80240874 0C0901B1 */  jal       func_802406C4_897CA4
+/* 897E54 80240874 0C0901B1 */  jal       tik_19_UnkFunc37
 /* 897E58 80240878 AE220084 */   sw       $v0, 0x84($s1)
 /* 897E5C 8024087C 0040202D */  daddu     $a0, $v0, $zero
 /* 897E60 80240880 04800011 */  bltz      $a0, .L802408C8
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B00_8980E0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B00_8980E0.s
deleted file mode 100644
index 5049e69ae4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B00_8980E0.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B00_8980E0
-/* 8980E0 80240B00 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8980E4 80240B04 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8980E8 80240B08 8C82000C */  lw        $v0, 0xc($a0)
-/* 8980EC 80240B0C 0C0B1EAF */  jal       get_variable
-/* 8980F0 80240B10 8C450000 */   lw       $a1, ($v0)
-/* 8980F4 80240B14 0040202D */  daddu     $a0, $v0, $zero
-/* 8980F8 80240B18 8C830000 */  lw        $v1, ($a0)
-/* 8980FC 80240B1C 34630010 */  ori       $v1, $v1, 0x10
-/* 898100 80240B20 AC830000 */  sw        $v1, ($a0)
-/* 898104 80240B24 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 898108 80240B28 24020002 */  addiu     $v0, $zero, 2
-/* 89810C 80240B2C 03E00008 */  jr        $ra
-/* 898110 80240B30 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412F8_8988D8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412F8_8988D8.s
deleted file mode 100644
index 2f928503a5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802412F8_8988D8.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802412F8_8988D8
-/* 8988D8 802412F8 3C038011 */  lui       $v1, %hi(D_8010EBB0)
-/* 8988DC 802412FC 2463EBB0 */  addiu     $v1, $v1, %lo(D_8010EBB0)
-/* 8988E0 80241300 AC800084 */  sw        $zero, 0x84($a0)
-/* 8988E4 80241304 80620000 */  lb        $v0, ($v1)
-/* 8988E8 80241308 10400005 */  beqz      $v0, .L80241320
-/* 8988EC 8024130C 24020003 */   addiu    $v0, $zero, 3
-/* 8988F0 80241310 80630003 */  lb        $v1, 3($v1)
-/* 8988F4 80241314 14620002 */  bne       $v1, $v0, .L80241320
-/* 8988F8 80241318 24020001 */   addiu    $v0, $zero, 1
-/* 8988FC 8024131C AC820084 */  sw        $v0, 0x84($a0)
-.L80241320:
-/* 898900 80241320 03E00008 */  jr        $ra
-/* 898904 80241324 24020002 */   addiu    $v0, $zero, 2
-/* 898908 80241328 00000000 */  nop
-/* 89890C 8024132C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240340_89A690.s b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240340_89A690.s
deleted file mode 100644
index 1a8869062b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89A350/func_80240340_89A690.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_89A690
-/* 89A690 80240340 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 89A694 80240344 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 89A698 80240348 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 89A69C 8024034C AFB00010 */  sw        $s0, 0x10($sp)
-/* 89A6A0 80240350 0080802D */  daddu     $s0, $a0, $zero
-/* 89A6A4 80240354 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 89A6A8 80240358 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 89A6AC 8024035C 10620003 */  beq       $v1, $v0, .L8024036C
-/* 89A6B0 80240360 24020002 */   addiu    $v0, $zero, 2
-/* 89A6B4 80240364 080900FB */  j         .L802403EC
-/* 89A6B8 80240368 AE000084 */   sw       $zero, 0x84($s0)
-.L8024036C:
-/* 89A6BC 8024036C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 89A6C0 80240370 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 89A6C4 80240374 80620040 */  lb        $v0, 0x40($v1)
-/* 89A6C8 80240378 80670044 */  lb        $a3, 0x44($v1)
-/* 89A6CC 8024037C 04420001 */  bltzl     $v0, .L80240384
-/* 89A6D0 80240380 00021023 */   negu     $v0, $v0
-.L80240384:
-/* 89A6D4 80240384 14400003 */  bnez      $v0, .L80240394
-/* 89A6D8 80240388 00000000 */   nop
-/* 89A6DC 8024038C 50E00017 */  beql      $a3, $zero, .L802403EC
-/* 89A6E0 80240390 0000102D */   daddu    $v0, $zero, $zero
-.L80240394:
-/* 89A6E4 80240394 44822000 */  mtc1      $v0, $f4
-/* 89A6E8 80240398 00000000 */  nop
-/* 89A6EC 8024039C 46802120 */  cvt.s.w   $f4, $f4
-/* 89A6F0 802403A0 44062000 */  mfc1      $a2, $f4
-/* 89A6F4 802403A4 44872000 */  mtc1      $a3, $f4
-/* 89A6F8 802403A8 00000000 */  nop
-/* 89A6FC 802403AC 46802120 */  cvt.s.w   $f4, $f4
-/* 89A700 802403B0 44806000 */  mtc1      $zero, $f12
-/* 89A704 802403B4 44072000 */  mfc1      $a3, $f4
-/* 89A708 802403B8 0C00A720 */  jal       atan2
-/* 89A70C 802403BC 46006386 */   mov.s    $f14, $f12
-/* 89A710 802403C0 3C014270 */  lui       $at, 0x4270
-/* 89A714 802403C4 44811000 */  mtc1      $at, $f2
-/* 89A718 802403C8 00000000 */  nop
-/* 89A71C 802403CC 4602003C */  c.lt.s    $f0, $f2
-/* 89A720 802403D0 00000000 */  nop
-/* 89A724 802403D4 45000004 */  bc1f      .L802403E8
-/* 89A728 802403D8 24020001 */   addiu    $v0, $zero, 1
-/* 89A72C 802403DC AE020084 */  sw        $v0, 0x84($s0)
-/* 89A730 802403E0 080900FB */  j         .L802403EC
-/* 89A734 802403E4 24020002 */   addiu    $v0, $zero, 2
-.L802403E8:
-/* 89A738 802403E8 0000102D */  daddu     $v0, $zero, $zero
-.L802403EC:
-/* 89A73C 802403EC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 89A740 802403F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 89A744 802403F4 03E00008 */  jr        $ra
-/* 89A748 802403F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240340_89DAE0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240340_89DAE0.s
deleted file mode 100644
index 59e36aca2b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_80240340_89DAE0.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240340_89DAE0
-/* 89DAE0 80240340 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 89DAE4 80240344 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 89DAE8 80240348 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 89DAEC 8024034C AFB00010 */  sw        $s0, 0x10($sp)
-/* 89DAF0 80240350 0080802D */  daddu     $s0, $a0, $zero
-/* 89DAF4 80240354 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 89DAF8 80240358 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 89DAFC 8024035C 10620003 */  beq       $v1, $v0, .L8024036C
-/* 89DB00 80240360 24020002 */   addiu    $v0, $zero, 2
-/* 89DB04 80240364 080900FB */  j         .L802403EC
-/* 89DB08 80240368 AE000084 */   sw       $zero, 0x84($s0)
-.L8024036C:
-/* 89DB0C 8024036C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 89DB10 80240370 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 89DB14 80240374 80620040 */  lb        $v0, 0x40($v1)
-/* 89DB18 80240378 80670044 */  lb        $a3, 0x44($v1)
-/* 89DB1C 8024037C 04420001 */  bltzl     $v0, .L80240384
-/* 89DB20 80240380 00021023 */   negu     $v0, $v0
-.L80240384:
-/* 89DB24 80240384 14400003 */  bnez      $v0, .L80240394
-/* 89DB28 80240388 00000000 */   nop
-/* 89DB2C 8024038C 50E00017 */  beql      $a3, $zero, .L802403EC
-/* 89DB30 80240390 0000102D */   daddu    $v0, $zero, $zero
-.L80240394:
-/* 89DB34 80240394 44822000 */  mtc1      $v0, $f4
-/* 89DB38 80240398 00000000 */  nop
-/* 89DB3C 8024039C 46802120 */  cvt.s.w   $f4, $f4
-/* 89DB40 802403A0 44062000 */  mfc1      $a2, $f4
-/* 89DB44 802403A4 44872000 */  mtc1      $a3, $f4
-/* 89DB48 802403A8 00000000 */  nop
-/* 89DB4C 802403AC 46802120 */  cvt.s.w   $f4, $f4
-/* 89DB50 802403B0 44806000 */  mtc1      $zero, $f12
-/* 89DB54 802403B4 44072000 */  mfc1      $a3, $f4
-/* 89DB58 802403B8 0C00A720 */  jal       atan2
-/* 89DB5C 802403BC 46006386 */   mov.s    $f14, $f12
-/* 89DB60 802403C0 3C014270 */  lui       $at, 0x4270
-/* 89DB64 802403C4 44811000 */  mtc1      $at, $f2
-/* 89DB68 802403C8 00000000 */  nop
-/* 89DB6C 802403CC 4602003C */  c.lt.s    $f0, $f2
-/* 89DB70 802403D0 00000000 */  nop
-/* 89DB74 802403D4 45000004 */  bc1f      .L802403E8
-/* 89DB78 802403D8 24020001 */   addiu    $v0, $zero, 1
-/* 89DB7C 802403DC AE020084 */  sw        $v0, 0x84($s0)
-/* 89DB80 802403E0 080900FB */  j         .L802403EC
-/* 89DB84 802403E4 24020002 */   addiu    $v0, $zero, 2
-.L802403E8:
-/* 89DB88 802403E8 0000102D */  daddu     $v0, $zero, $zero
-.L802403EC:
-/* 89DB8C 802403EC 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 89DB90 802403F0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 89DB94 802403F4 03E00008 */  jr        $ra
-/* 89DB98 802403F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s b/ver/us/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s
deleted file mode 100644
index 58900717d5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240370_8A0230
-/* 8A0230 80240370 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8A0234 80240374 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8A0238 80240378 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8A023C 8024037C AFB00010 */  sw        $s0, 0x10($sp)
-/* 8A0240 80240380 0080802D */  daddu     $s0, $a0, $zero
-/* 8A0244 80240384 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8A0248 80240388 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 8A024C 8024038C 10620003 */  beq       $v1, $v0, .L8024039C
-/* 8A0250 80240390 24020002 */   addiu    $v0, $zero, 2
-/* 8A0254 80240394 08090107 */  j         .L8024041C
-/* 8A0258 80240398 AE000084 */   sw       $zero, 0x84($s0)
-.L8024039C:
-/* 8A025C 8024039C 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8A0260 802403A0 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8A0264 802403A4 80620040 */  lb        $v0, 0x40($v1)
-/* 8A0268 802403A8 80670044 */  lb        $a3, 0x44($v1)
-/* 8A026C 802403AC 04420001 */  bltzl     $v0, .L802403B4
-/* 8A0270 802403B0 00021023 */   negu     $v0, $v0
-.L802403B4:
-/* 8A0274 802403B4 14400003 */  bnez      $v0, .L802403C4
-/* 8A0278 802403B8 00000000 */   nop
-/* 8A027C 802403BC 50E00017 */  beql      $a3, $zero, .L8024041C
-/* 8A0280 802403C0 0000102D */   daddu    $v0, $zero, $zero
-.L802403C4:
-/* 8A0284 802403C4 44822000 */  mtc1      $v0, $f4
-/* 8A0288 802403C8 00000000 */  nop
-/* 8A028C 802403CC 46802120 */  cvt.s.w   $f4, $f4
-/* 8A0290 802403D0 44062000 */  mfc1      $a2, $f4
-/* 8A0294 802403D4 44872000 */  mtc1      $a3, $f4
-/* 8A0298 802403D8 00000000 */  nop
-/* 8A029C 802403DC 46802120 */  cvt.s.w   $f4, $f4
-/* 8A02A0 802403E0 44806000 */  mtc1      $zero, $f12
-/* 8A02A4 802403E4 44072000 */  mfc1      $a3, $f4
-/* 8A02A8 802403E8 0C00A720 */  jal       atan2
-/* 8A02AC 802403EC 46006386 */   mov.s    $f14, $f12
-/* 8A02B0 802403F0 3C014270 */  lui       $at, 0x4270
-/* 8A02B4 802403F4 44811000 */  mtc1      $at, $f2
-/* 8A02B8 802403F8 00000000 */  nop
-/* 8A02BC 802403FC 4602003C */  c.lt.s    $f0, $f2
-/* 8A02C0 80240400 00000000 */  nop
-/* 8A02C4 80240404 45000004 */  bc1f      .L80240418
-/* 8A02C8 80240408 24020001 */   addiu    $v0, $zero, 1
-/* 8A02CC 8024040C AE020084 */  sw        $v0, 0x84($s0)
-/* 8A02D0 80240410 08090107 */  j         .L8024041C
-/* 8A02D4 80240414 24020002 */   addiu    $v0, $zero, 2
-.L80240418:
-/* 8A02D8 80240418 0000102D */  daddu     $v0, $zero, $zero
-.L8024041C:
-/* 8A02DC 8024041C 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8A02E0 80240420 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8A02E4 80240424 03E00008 */  jr        $ra
-/* 8A02E8 80240428 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240034_8A2404.s b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240034_8A2404.s
deleted file mode 100644
index ff5056d83c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240034_8A2404.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240034_8A2404
-/* 8A2404 80240034 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
-/* 8A2408 80240038 8463A552 */  lh        $v1, %lo(gCollisionStatus+0x2)($v1)
-/* 8A240C 8024003C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8A2410 80240040 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8A2414 80240044 0080802D */  daddu     $s0, $a0, $zero
-/* 8A2418 80240048 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 8A241C 8024004C 8E0200B0 */  lw        $v0, 0xb0($s0)
-/* 8A2420 80240050 10620003 */  beq       $v1, $v0, .L80240060
-/* 8A2424 80240054 24020002 */   addiu    $v0, $zero, 2
-/* 8A2428 80240058 08090038 */  j         .L802400E0
-/* 8A242C 8024005C AE000084 */   sw       $zero, 0x84($s0)
-.L80240060:
-/* 8A2430 80240060 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 8A2434 80240064 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 8A2438 80240068 80620040 */  lb        $v0, 0x40($v1)
-/* 8A243C 8024006C 80670044 */  lb        $a3, 0x44($v1)
-/* 8A2440 80240070 04420001 */  bltzl     $v0, .L80240078
-/* 8A2444 80240074 00021023 */   negu     $v0, $v0
-.L80240078:
-/* 8A2448 80240078 14400003 */  bnez      $v0, .L80240088
-/* 8A244C 8024007C 00000000 */   nop
-/* 8A2450 80240080 50E00017 */  beql      $a3, $zero, .L802400E0
-/* 8A2454 80240084 0000102D */   daddu    $v0, $zero, $zero
-.L80240088:
-/* 8A2458 80240088 44822000 */  mtc1      $v0, $f4
-/* 8A245C 8024008C 00000000 */  nop
-/* 8A2460 80240090 46802120 */  cvt.s.w   $f4, $f4
-/* 8A2464 80240094 44062000 */  mfc1      $a2, $f4
-/* 8A2468 80240098 44872000 */  mtc1      $a3, $f4
-/* 8A246C 8024009C 00000000 */  nop
-/* 8A2470 802400A0 46802120 */  cvt.s.w   $f4, $f4
-/* 8A2474 802400A4 44806000 */  mtc1      $zero, $f12
-/* 8A2478 802400A8 44072000 */  mfc1      $a3, $f4
-/* 8A247C 802400AC 0C00A720 */  jal       atan2
-/* 8A2480 802400B0 46006386 */   mov.s    $f14, $f12
-/* 8A2484 802400B4 3C014270 */  lui       $at, 0x4270
-/* 8A2488 802400B8 44811000 */  mtc1      $at, $f2
-/* 8A248C 802400BC 00000000 */  nop
-/* 8A2490 802400C0 4602003C */  c.lt.s    $f0, $f2
-/* 8A2494 802400C4 00000000 */  nop
-/* 8A2498 802400C8 45000004 */  bc1f      .L802400DC
-/* 8A249C 802400CC 24020001 */   addiu    $v0, $zero, 1
-/* 8A24A0 802400D0 AE020084 */  sw        $v0, 0x84($s0)
-/* 8A24A4 802400D4 08090038 */  j         .L802400E0
-/* 8A24A8 802400D8 24020002 */   addiu    $v0, $zero, 2
-.L802400DC:
-/* 8A24AC 802400DC 0000102D */  daddu     $v0, $zero, $zero
-.L802400E0:
-/* 8A24B0 802400E0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 8A24B4 802400E4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8A24B8 802400E8 03E00008 */  jr        $ra
-/* 8A24BC 802400EC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s
deleted file mode 100644
index 2f3e02ad47..0000000000
--- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s
+++ /dev/null
@@ -1,112 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240AF0_9B2280
-/* 9B2280 80240AF0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9B2284 80240AF4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 9B2288 80240AF8 0080902D */  daddu     $s2, $a0, $zero
-/* 9B228C 80240AFC AFB10014 */  sw        $s1, 0x14($sp)
-/* 9B2290 80240B00 00A0882D */  daddu     $s1, $a1, $zero
-/* 9B2294 80240B04 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 9B2298 80240B08 AFB40020 */  sw        $s4, 0x20($sp)
-/* 9B229C 80240B0C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9B22A0 80240B10 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9B22A4 80240B14 8E50000C */  lw        $s0, 0xc($s2)
-/* 9B22A8 80240B18 8E050000 */  lw        $a1, ($s0)
-/* 9B22AC 80240B1C 0C0B1EAF */  jal       get_variable
-/* 9B22B0 80240B20 26100004 */   addiu    $s0, $s0, 4
-/* 9B22B4 80240B24 0240202D */  daddu     $a0, $s2, $zero
-/* 9B22B8 80240B28 8E050000 */  lw        $a1, ($s0)
-/* 9B22BC 80240B2C 0C0B1EAF */  jal       get_variable
-/* 9B22C0 80240B30 0040802D */   daddu    $s0, $v0, $zero
-/* 9B22C4 80240B34 0200202D */  daddu     $a0, $s0, $zero
-/* 9B22C8 80240B38 0C00EAD2 */  jal       get_npc_safe
-/* 9B22CC 80240B3C 0040A02D */   daddu    $s4, $v0, $zero
-/* 9B22D0 80240B40 3C138011 */  lui       $s3, %hi(gPlayerData)
-/* 9B22D4 80240B44 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
-/* 9B22D8 80240B48 12200006 */  beqz      $s1, .L80240B64
-/* 9B22DC 80240B4C 0040802D */   daddu    $s0, $v0, $zero
-/* 9B22E0 80240B50 82620012 */  lb        $v0, 0x12($s3)
-/* 9B22E4 80240B54 54400003 */  bnel      $v0, $zero, .L80240B64
-/* 9B22E8 80240B58 AE400070 */   sw       $zero, 0x70($s2)
-/* 9B22EC 80240B5C 24020002 */  addiu     $v0, $zero, 2
-/* 9B22F0 80240B60 AE420070 */  sw        $v0, 0x70($s2)
-.L80240B64:
-/* 9B22F4 80240B64 8E430070 */  lw        $v1, 0x70($s2)
-/* 9B22F8 80240B68 24110001 */  addiu     $s1, $zero, 1
-/* 9B22FC 80240B6C 10710013 */  beq       $v1, $s1, .L80240BBC
-/* 9B2300 80240B70 28620002 */   slti     $v0, $v1, 2
-/* 9B2304 80240B74 10400005 */  beqz      $v0, .L80240B8C
-/* 9B2308 80240B78 24020002 */   addiu    $v0, $zero, 2
-/* 9B230C 80240B7C 10600009 */  beqz      $v1, .L80240BA4
-/* 9B2310 80240B80 0000102D */   daddu    $v0, $zero, $zero
-/* 9B2314 80240B84 08090315 */  j         .L80240C54
-/* 9B2318 80240B88 00000000 */   nop
-.L80240B8C:
-/* 9B231C 80240B8C 10620013 */  beq       $v1, $v0, .L80240BDC
-/* 9B2320 80240B90 24020003 */   addiu    $v0, $zero, 3
-/* 9B2324 80240B94 1062001E */  beq       $v1, $v0, .L80240C10
-/* 9B2328 80240B98 0000102D */   daddu    $v0, $zero, $zero
-/* 9B232C 80240B9C 08090315 */  j         .L80240C54
-/* 9B2330 80240BA0 00000000 */   nop
-.L80240BA4:
-/* 9B2334 80240BA4 0C03AC5A */  jal       func_800EB168
-/* 9B2338 80240BA8 0000202D */   daddu    $a0, $zero, $zero
-/* 9B233C 80240BAC 2402001E */  addiu     $v0, $zero, 0x1e
-/* 9B2340 80240BB0 AE420074 */  sw        $v0, 0x74($s2)
-/* 9B2344 80240BB4 08090314 */  j         .L80240C50
-/* 9B2348 80240BB8 AE510070 */   sw       $s1, 0x70($s2)
-.L80240BBC:
-/* 9B234C 80240BBC 8E420074 */  lw        $v0, 0x74($s2)
-/* 9B2350 80240BC0 2403FFFF */  addiu     $v1, $zero, -1
-/* 9B2354 80240BC4 2442FFFF */  addiu     $v0, $v0, -1
-/* 9B2358 80240BC8 14430021 */  bne       $v0, $v1, .L80240C50
-/* 9B235C 80240BCC AE420074 */   sw       $v0, 0x74($s2)
-/* 9B2360 80240BD0 24020002 */  addiu     $v0, $zero, 2
-/* 9B2364 80240BD4 08090314 */  j         .L80240C50
-/* 9B2368 80240BD8 AE420070 */   sw       $v0, 0x70($s2)
-.L80240BDC:
-/* 9B236C 80240BDC 0200202D */  daddu     $a0, $s0, $zero
-/* 9B2370 80240BE0 00141600 */  sll       $v0, $s4, 0x18
-/* 9B2374 80240BE4 00021543 */  sra       $v0, $v0, 0x15
-/* 9B2378 80240BE8 02621021 */  addu      $v0, $s3, $v0
-/* 9B237C 80240BEC A2740012 */  sb        $s4, 0x12($s3)
-/* 9B2380 80240BF0 0C03BD17 */  jal       clear_partner_move_history
-/* 9B2384 80240BF4 A0510014 */   sb       $s1, 0x14($v0)
-/* 9B2388 80240BF8 82640012 */  lb        $a0, 0x12($s3)
-/* 9B238C 80240BFC 0C03ACA9 */  jal       func_800EB2A4
-/* 9B2390 80240C00 00000000 */   nop
-/* 9B2394 80240C04 24020003 */  addiu     $v0, $zero, 3
-/* 9B2398 80240C08 08090314 */  j         .L80240C50
-/* 9B239C 80240C0C AE420070 */   sw       $v0, 0x70($s2)
-.L80240C10:
-/* 9B23A0 80240C10 0C00EAD2 */  jal       get_npc_safe
-/* 9B23A4 80240C14 2404FFFC */   addiu    $a0, $zero, -4
-/* 9B23A8 80240C18 8E05000C */  lw        $a1, 0xc($s0)
-/* 9B23AC 80240C1C 0C00ECD0 */  jal       set_npc_yaw
-/* 9B23B0 80240C20 0040202D */   daddu    $a0, $v0, $zero
-/* 9B23B4 80240C24 0200202D */  daddu     $a0, $s0, $zero
-/* 9B23B8 80240C28 8E020000 */  lw        $v0, ($s0)
-/* 9B23BC 80240C2C 2403FFFB */  addiu     $v1, $zero, -5
-/* 9B23C0 80240C30 00431024 */  and       $v0, $v0, $v1
-/* 9B23C4 80240C34 0C00EAFF */  jal       disable_npc_shadow
-/* 9B23C8 80240C38 AE020000 */   sw       $v0, ($s0)
-/* 9B23CC 80240C3C 3C01C47A */  lui       $at, 0xc47a
-/* 9B23D0 80240C40 44810000 */  mtc1      $at, $f0
-/* 9B23D4 80240C44 24020002 */  addiu     $v0, $zero, 2
-/* 9B23D8 80240C48 08090315 */  j         .L80240C54
-/* 9B23DC 80240C4C E600003C */   swc1     $f0, 0x3c($s0)
-.L80240C50:
-/* 9B23E0 80240C50 0000102D */  daddu     $v0, $zero, $zero
-.L80240C54:
-/* 9B23E4 80240C54 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 9B23E8 80240C58 8FB40020 */  lw        $s4, 0x20($sp)
-/* 9B23EC 80240C5C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9B23F0 80240C60 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9B23F4 80240C64 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9B23F8 80240C68 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9B23FC 80240C6C 03E00008 */  jr        $ra
-/* 9B2400 80240C70 27BD0028 */   addiu    $sp, $sp, 0x28
-/* 9B2404 80240C74 00000000 */  nop
-/* 9B2408 80240C78 00000000 */  nop
-/* 9B240C 80240C7C 00000000 */  nop
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 804ccdb8e9..ea00135d33 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -5653,18 +5653,14 @@ segments:
     start: 0x95B200
     vram: 0x80240000
     subsegments:
-    - [0x95B200, c]
-    - [0x95B7E0, c]
-    - [0x95E660, c]
-    - [0x95E7A0, c]
-    - [0x95ECC0, data]
-    - [0x960210, data]
-    - [0x966CA0, data]
-    - [0x967780, data]
-    - [0x9685C0, data]
-    - [0x968FD0, rodata]
-    - [0x969198, rodata]
-    - [0x9691B0, rodata]
+    - [0x95B200,       c, 95B200]
+    - [0x95B7E0,       c, 95B7E0]
+    - [0x95E660,       c, 95E660]
+    - [0x95E7A0,       c, 95E7A0]
+    - [0x95ECC0,   .data, 95B7E0]
+    - [0x9685C0,   .data, 95E7A0]
+    - [0x968FD0, .rodata, 95B7E0]
+    - [0x9691C0,    .bss, 95B7E0]
   - name: dro_02
     dir: world/area_dro/dro_02
     type: code
@@ -5672,14 +5668,11 @@ segments:
     start: 0x9691C0
     vram: 0x80240000
     subsegments:
-    - [0x9691C0, c]
-    - [0x9694C0, c]
-    - [0x96CC30, data]
-    - [0x96CD90, data]
-    - [0x96CE00, data]
-    - [0x96D380, data]
-    - [0x96DFA0, data]
-    - [0x9780D0, rodata]
+    - [0x9691C0,       c, 9691C0]
+    - [0x9694C0,       c, 9694C0]
+    - [0x96CC30,   .data, 9694C0]
+    - [0x9780D0, .rodata, 9694C0]
+    - [0x978140,    .bss, 9694C0]
   - name: isk_01
     dir: world/area_isk/isk_01
     type: code
@@ -8207,9 +8200,8 @@ segments:
     - [0xBDED90,       c, events]
     - [0xBE04B0,   .data, header]
     - [0xBE05C0,   .data, events]
-    - [0xBE0950,   .data, events]
-    - [0xBE3570,   .data, events]
     - [0xBE35E0, .rodata, events]
+    - [0xBE37B0,    .bss, events]
   - name: arn_04
     dir: world/area_arn/arn_04
     type: code
@@ -8220,8 +8212,6 @@ segments:
     - [0xBE37B0,       c, events]
     - [0xBE6B20,   .data, header]
     - [0xBE6C30,   .data, events]
-    - [0xBE6E10,   .data, events]
-    - [0xBE77F0,   .data, events]
     - [0xBE78D0, .rodata, events]
     - [0xBE7AD8, .rodata, events]
   - name: arn_05
@@ -8234,7 +8224,6 @@ segments:
     - [0xBE7BE0,       c, events]
     - [0xBE8EE0,   .data, header]
     - [0xBE9290,   .data, events]
-    - [0xBECBE0,   .data, events]
     - [0xBECC20, .rodata, events]
   - name: arn_07
     dir: world/area_arn/arn_07
@@ -8264,11 +8253,6 @@ segments:
     - [0xBF4860,       c, events]
     - [0xBF4A30,   .data, header]
     - [0xBF4B50,   .data, events]
-    - [0xBF5210,   .data, events]
-    - [0xBF5340,   .data, events]
-    - [0xBF5460,   .data, events]
-    - [0xBF59A0,   .data, events]
-    - [0xBF5FF0,   .data, events]
     - [0xBF6040, .rodata, events]
   - name: arn_09
     dir: world/area_arn/arn_09
@@ -8280,9 +8264,6 @@ segments:
     - [0xBF6060,       c, events]
     - [0xBF60A0,   .data, header]
     - [0xBF61A0,   .data, events]
-    - [0xBF6400,   .data, events]
-    - [0xBF6530,   .data, events]
-    - [0xBF6610,   .data, events]
     - [0xBF69F0, .rodata, events]
   - name: arn_10
     dir: world/area_arn/arn_10
@@ -8293,8 +8274,6 @@ segments:
     subsegments:
     - [0xBF6A00,   .data, header]
     - [0xBF6B00,   .data, events]
-    - [0xBF6E30,   .data, events]
-    - [0xBF75E0,   .data, events]
     - [0xBF7670, .rodata, events]
   - name: arn_11
     dir: world/area_arn/arn_11
@@ -8305,7 +8284,6 @@ segments:
     subsegments:
     - [0xBF7680,   .data, header]
     - [0xBF7770,   .data, events]
-    - [0xBF7D00,   .data, events]
     - [0xBF8780, .rodata, events]
   - name: arn_12
     dir: world/area_arn/arn_12
@@ -8316,7 +8294,6 @@ segments:
     subsegments:
     - [0xBF8790,   .data, header]
     - [0xBF8890,   .data, events]
-    - [0xBF8BB0,   .data, events]
     - [0xBF9400, .rodata, events]
   - name: arn_13
     dir: world/area_arn/arn_13
@@ -8327,7 +8304,6 @@ segments:
     subsegments:
     - [0xBF9410,   .data, header]
     - [0xBF9510,   .data, events]
-    - [0xBF9840,   .data, events]
     - [0xBFA090, .rodata, events]
   - name: dgb_00
     dir: world/area_dgb/dgb_00
@@ -8340,7 +8316,6 @@ segments:
     - [0xBFA100,       c, BFA100]
     - [0xBFA150,   .data, BFA0A0]
     - [0xBFA260,   .data, BFA100]
-    - [0xBFD800,   .data, BFA100]
     - [0xBFD840, .rodata, BFA0A0]
     - [0xBFD864, .rodata, BFA100]
   - name: dgb_01
@@ -8354,8 +8329,6 @@ segments:
     - [0xBFD8C0,        c, BFD8C0]
     - [0xBFD9A0,        c, BFD9A0]
     - [0xC00C70,    .data, BFD9A0]
-    - [0xC00DD0,    .data, BFD9A0]
-    - [0xC01770,    .data, BFD9A0]
     - [0xC047F0,   rgba16, img0, 64, 32]
     - [0xC057F0,    .data, data0]
     - [0xC05870,   rgba16, img1, 64, 32]
@@ -8373,9 +8346,11 @@ segments:
     - [0xC08770,   rgba16, img7, 32, 32]
     - [0xC08F70,    .data, data7]
     - [0xC08FF0,    .data, data]
-    - [0xC20C70,  .rodata, BFD9A0] # dgb_00-18, 1x 32767.0, 2 jump tables
-    - [0xC20D88,  .rodata, BFD9A0] # "dgb_00", 2x 32767.0, jump table
-    - [0xC20F30,  .rodata, BFD9A0] # "dgb_08" only
+    - [0xC20C70,  .rodata, BFD9A0] 
+    # rodata seemingly in 3 different parts:
+    # dgb_00-18, 1x 32767.0, 2 jump tables
+    # "dgb_00", 2x 32767.0, jump table
+    # "dgb_08" only
   - type: code
     start: 0xC20F40
     vram: 0x80200000
@@ -8390,8 +8365,6 @@ segments:
     subsegments:
     - [0xC2EBA0,       c, C2EBA0]
     - [0xC2FFD0,   .data, C2EBA0]
-    - [0xC300F0,   .data, C2EBA0]
-    - [0xC30650,   .data, C2EBA0]
     - [0xC31190, .rodata, C2EBA0]
   - name: dgb_03
     dir: world/area_dgb/dgb_03
@@ -8403,10 +8376,6 @@ segments:
     - [0xC314E0,       c, C314E0]
     - [0xC31730,       c, C31730]
     - [0xC33CB0,   .data, C31730]
-    - [0xC33DF0,   .data, C31730]
-    - [0xC345C0,   .data, C31730]
-    - [0xC34C20,   .data, C31730]
-    - [0xC34E50,   .data, C31730]
     - [0xC35EA0, .rodata, C31730]
   - name: dgb_04
     dir: world/area_dgb/dgb_04
@@ -8417,8 +8386,6 @@ segments:
     subsegments:
     - [0xC36530,       c, C36530]
     - [0xC39640,   .data, C36530]
-    - [0xC39740,   .data, C36530]
-    - [0xC39A90,   .data, C36530]
     - [0xC3A910, .rodata, C36530]
     - [0xC3A978, .rodata, C36530]
   - name: dgb_05
@@ -8430,10 +8397,6 @@ segments:
     subsegments:
     - [0xC3AA10,       c, C3AA10]
     - [0xC3BEA0,   .data, C3AA10]
-    - [0xC3BF90,   .data, C3AA10]
-    - [0xC3C200,   .data, C3AA10]
-    - [0xC3C280,   .data, C3AA10]
-    - [0xC3C2D0,   .data, C3AA10]
     - [0xC3CD40, .rodata, C3AA10]
   - name: dgb_06
     dir: world/area_dgb/dgb_06
@@ -8444,8 +8407,6 @@ segments:
     subsegments:
     - [0xC3D080,       c, C3D080]
     - [0xC3D340,   .data, C3D080]
-    - [0xC3D440,   .data, C3D080]
-    - [0xC3D8C0,   .data, C3D080]
     - [0xC3DBE0, .rodata, C3D080]
   - name: dgb_07
     dir: world/area_dgb/dgb_07
@@ -8456,8 +8417,6 @@ segments:
     subsegments:
     - [0xC3DBF0,       c, C3DBF0]
     - [0xC3F020,   .data, C3DBF0]
-    - [0xC3F120,   .data, C3DBF0]
-    - [0xC3F3E0,   .data, C3DBF0]
     - [0xC3FA70, .rodata, C3DBF0]
     - [0xC3FA80, .rodata, C3DBF0]
   - name: dgb_08
@@ -8469,9 +8428,6 @@ segments:
     subsegments:
     - [0xC3FDB0,       c, C3FDB0]
     - [0xC43A40,   .data, C3FDB0]
-    - [0xC43B40,   .data, C3FDB0]
-    - [0xC43EB0,   .data, C3FDB0]
-    - [0xC46790,   .data, C3FDB0]
     - [0xC467A0, .rodata, C3FDB0]
     - [0xC467B0, .rodata, C3FDB0]
     - [0xC46B40, .rodata, C3FDB0]
@@ -8484,9 +8440,6 @@ segments:
     subsegments:
     - [0xC46BE0,       c, C46BE0]
     - [0xC4A3E0,   .data, C46BE0]
-    - [0xC4A500,   .data, C46BE0]
-    - [0xC4AA30,   .data, C46BE0]
-    - [0xC4ABE0,   .data, C46BE0]
     - [0xC4BF50, .rodata, C46BE0]
     - [0xC4C2F8, .rodata, C46BE0]
   - name: dgb_10
@@ -8498,9 +8451,6 @@ segments:
     subsegments:
     - [0xC4C390,       c, C4C390]
     - [0xC4C580,   .data, C4C390]
-    - [0xC4C680,   .data, C4C390]
-    - [0xC4CA00,   .data, C4C390]
-    - [0xC4D270,   .data, C4C390]
     - [0xC4D3D0, .rodata, C4C390]
   - name: dgb_11
     dir: world/area_dgb/dgb_11
@@ -8511,8 +8461,6 @@ segments:
     subsegments:
     - [0xC4D3E0,       c, C4D3E0]
     - [0xC4D430,   .data, C4D3E0]
-    - [0xC4D550,   .data, C4D3E0]
-    - [0xC4D950,   .data, C4D3E0]
     - [0xC4DEE0, .rodata, C4D3E0]
   - name: dgb_12
     dir: world/area_dgb/dgb_12
@@ -8523,8 +8471,6 @@ segments:
     subsegments:
     - [0xC4DEF0,       c, C4DEF0]
     - [0xC4E1B0,   .data, C4DEF0]
-    - [0xC4E2A0,   .data, C4DEF0]
-    - [0xC4E760,   .data, C4DEF0]
     - [0xC4E950, .rodata, C4DEF0]
   - name: dgb_13
     dir: world/area_dgb/dgb_13
@@ -8534,8 +8480,6 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC4E960,   .data, C4E960]
-    - [0xC4EA50,   .data, C4E960]
-    - [0xC4ECE0,   .data, C4E960]
     - [0xC4F020, .rodata, C4E960]
   - name: dgb_14
     dir: world/area_dgb/dgb_14
@@ -8545,8 +8489,6 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC4F030,   .data, C4F030]
-    - [0xC4F130,   .data, C4F030]
-    - [0xC4F4B0,   .data, C4F030]
     - [0xC4F500, .rodata, C4F030]
   - name: dgb_15
     dir: world/area_dgb/dgb_15
@@ -8558,9 +8500,6 @@ segments:
     - [0xC4F510,       c, C4F510]
     - [0xC50CA0,       c, C50CA0]
     - [0xC50D80,   .data, C4F510]
-    - [0xC50ED0,   .data, C4F510]
-    - [0xC513B0,   .data, C4F510]
-    - [0xC51FE0,   .data, C4F510]
     - [0xC521E0, .rodata, C4F510]
     - [0xC52200, .rodata, C4F510]
   - name: dgb_16
@@ -8572,9 +8511,6 @@ segments:
     subsegments:
     - [0xC52540,       c, C52540]
     - [0xC53970,   .data, C52540]
-    - [0xC53A60,   .data, C52540]
-    - [0xC53CC0,   .data, C52540]
-    - [0xC53D00,   .data, C52540]
     - [0xC55720, .rodata, C52540]
     - [0xC55730, .rodata, C52540]
   - name: dgb_17
@@ -8585,7 +8521,6 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC55A60,   .data, C55A60]
-    - [0xC55B60,   .data, C55A60]
     - [0xC55F30, .rodata, C55A60]
   - name: dgb_18
     dir: world/area_dgb/dgb_18
@@ -8597,9 +8532,6 @@ segments:
     - [0xC55F40,       c, C55F40]
     - [0xC56EF0,       c, C56EF0]
     - [0xC571B0,   .data, C55F40]
-    - [0xC572A0,   .data, C55F40]
-    - [0xC574C0,   .data, C55F40]
-    - [0xC59620,   .data, C55F40]
     - [0xC59810, .rodata, C55F40]
     - [0xC59820, .rodata, C55F40]
   - name: kzn_01
@@ -8841,17 +8773,11 @@ segments:
     start: 0xC9DF20
     vram: 0x80240000
     subsegments:
-    - [0xC9DF20, c]
-    - [0xC9DF60, c]
-    - [0xC9EE30, c]
-    - [0xC9F300, data]
-    - [0xC9F5E0, data]
-    - [0xCA3D50, data]
-    - [0xCA4770, data]
-    - [0xCA7050, data]
-    - [0xCA70A0, rodata]
-    - [0xCA70E0, rodata]
-    - [0xCA7290, rodata]
+    - [0xC9DF20,       c, C9DF20]
+    - [0xC9DF60,       c, C9DF60]
+    - [0xC9EE30,       c, C9EE30]
+    - [0xC9F300,   .data, C9DF60]
+    - [0xCA70A0, .rodata, C9DF60]
   - name: flo_03
     dir: world/area_flo/flo_03
     type: code
@@ -8859,12 +8785,10 @@ segments:
     start: 0xCA72A0
     vram: 0x80240000
     subsegments:
-    - [0xCA72A0, c]
-    - [0xCA72E0, c]
-    - [0xCA78D0, data]
-    - [0xCA8150, data]
-    - [0xCAC170, data]
-    - [0xCAC1D0, rodata]
+    - [0xCA72A0,       c, CA72A0]
+    - [0xCA72E0,       c, CA72E0]
+    - [0xCA78D0,   .data, CA72E0]
+    - [0xCAC1D0, .rodata, CA72E0]
   - name: flo_07
     dir: world/area_flo/flo_07
     type: code
@@ -8872,12 +8796,10 @@ segments:
     start: 0xCAC1F0
     vram: 0x80240000
     subsegments:
-    - [0xCAC1F0, c]
-    - [0xCAC5D0, c]
-    - [0xCAC930, data]
-    - [0xCACAC0, data]
-    - [0xCAD410, data]
-    - [0xCAED20, rodata]
+    - [0xCAC1F0,       c, CAC1F0]
+    - [0xCAC5D0,       c, CAC5D0]
+    - [0xCAC930,   .data, CAC5D0]
+    - [0xCAED20, .rodata, CAC5D0]
   - name: flo_08
     dir: world/area_flo/flo_08
     type: code
@@ -8885,15 +8807,13 @@ segments:
     start: 0xCAED40
     vram: 0x80240000
     subsegments:
-    - [0xCAED40, c]
-    - [0xCAFA80, c]
-    - [0xCAFAC0, c]
-    - [0xCB0B80, c]
-    - [0xCB0C20, data]
-    - [0xCB1BF0, data]
-    - [0xCB3C80, data]
-    - [0xCB46D0, data]
-    - [0xCB4E60, rodata]
+    - [0xCAED40,       c, CAED40]
+    - [0xCAFA80,       c, CAFA80]
+    - [0xCAFAC0,       c, CAFAC0]
+    - [0xCB0B80,       c, CB0B80]
+    - [0xCB0C20,   .data, CAFAC0]
+    - [0xCB4E60, .rodata, CAFAC0]
+    - [0xCB5000,    .bss, CAFAC0]
   - name: flo_09
     dir: world/area_flo/flo_09
     type: code
@@ -8901,14 +8821,13 @@ segments:
     start: 0xCB5000
     vram: 0x80240000
     subsegments:
-    - [0xCB5000, c]
-    - [0xCB5040, c]
-    - [0xCB50E0, c]
-    - [0xCB5320, c]
-    - [0xCB6820, data]
-    - [0xCB7010, data]
-    - [0xCB7880, data]
-    - [0xCB9190, rodata]
+    - [0xCB5000,       c, CB5000]
+    - [0xCB5040,       c, CB5040]
+    - [0xCB50E0,       c, CB50E0]
+    - [0xCB5320,       c, CB5320]
+    - [0xCB6820,   .data, CB50E0]
+    - [0xCB9190, .rodata, CB50E0]
+    - [0xCB91A0, .rodata, CB5320]
   - name: flo_10
     dir: world/area_flo/flo_10
     type: code
@@ -8916,19 +8835,14 @@ segments:
     start: 0xCB9200
     vram: 0x80240000
     subsegments:
-    - [0xCB9200, c]
-    - [0xCB9240, c]
-    - [0xCB9280, c]
-    - [0xCB96B0, c]
-    - [0xCBA430, c]
-    - [0xCBA670, data]
-    - [0xCBA830, data]
-    - [0xCBA880, data]
-    - [0xCBAEB0, data]
-    - [0xCBC420, data]
-    - [0xCBD270, data]
-    - [0xCBD290, data]
-    - [0xCBDCB0, rodata]
+    - [0xCB9200,       c, CB9200]
+    - [0xCB9240,       c, CB9240]
+    - [0xCB9280,       c, CB9280]
+    - [0xCB96B0,       c, CB96B0]
+    - [0xCBA430,       c, CBA430]
+    - [0xCBA670,   .data, CB9280]
+    - [0xCBD290,   .data, CBA430]
+    - [0xCBDCB0, .rodata, CB9280]
   - name: flo_11
     dir: world/area_flo/flo_11
     type: code
@@ -8936,11 +8850,9 @@ segments:
     start: 0xCBDCD0
     vram: 0x80240000
     subsegments:
-    - [0xCBDCD0, c]
-    - [0xCBDFF0, data]
-    - [0xCBF790, data]
-    - [0xCC0DC0, data]
-    - [0xCC0E10, rodata]
+    - [0xCBDCD0,       c, CBDCD0]
+    - [0xCBDFF0,   .data, CBDCD0]
+    - [0xCC0E10, .rodata, CBDCD0]
   - name: flo_12
     dir: world/area_flo/flo_12
     type: code
@@ -8948,12 +8860,11 @@ segments:
     start: 0xCC0E30
     vram: 0x80240000
     subsegments:
-    - [0xCC0E30, c]
-    - [0xCC0E70, c]
-    - [0xCC1520, data]
-    - [0xCC16A0, data]
-    - [0xCC1C60, data]
-    - [0xCC3800, rodata]
+    - [0xCC0E30,       c, CC0E30]
+    - [0xCC0E70,       c, CC0E70]
+    - [0xCC1520,   .data, CC0E70]
+    - [0xCC3800, .rodata, CC0E70]
+    - [0xCC3810,    .bss, CC0E70]
   - name: flo_13
     dir: world/area_flo/flo_13
     type: code
@@ -8961,15 +8872,13 @@ segments:
     start: 0xCC3810
     vram: 0x80240000
     subsegments:
-    - [0xCC3810, c]
-    - [0xCC3850, c]
-    - [0xCC6DE0, c]
-    - [0xCC6E80, data]
-    - [0xCC7160, data]
-    - [0xCC7250, data]
-    - [0xCCB230, rodata]
-    - [0xCCB298, rodata]
-    - [0xCCB2F8, rodata]
+    - [0xCC3810,       c, CC3810]
+    - [0xCC3850,       c, CC3850]
+    - [0xCC6DE0,       c, CC6DE0]
+    - [0xCC6E80,   .data, CC3850]
+    - [0xCCB230, .rodata, CC3850]
+    - [0xCCB300, .rodata, CC6DE0]
+    - [0xCCB310,    .bss, CC6DE0]
   - name: flo_14
     dir: world/area_flo/flo_14
     type: code
@@ -8977,15 +8886,14 @@ segments:
     start: 0xCCB310
     vram: 0x80240000
     subsegments:
-    - [0xCCB310, c]
-    - [0xCCBE20, c]
-    - [0xCCD670, c]
-    - [0xCCD6A0, data]
-    - [0xCCDF10, data]
-    - [0xCCF7D0, data]
-    - [0xCD0240, data]
-    - [0xCD0280, data]
-    - [0xCD0620, rodata]
+    - [0xCCB310,       c, CCB310]
+    - [0xCCBE20,       c, CCBE20]
+    - [0xCCD670,       c, CCD670]
+    - [0xCCD6A0,   .data, CCB310]
+    - [0xCCF7D0,   .data, CCBE20]
+    - [0xCD0620, .rodata, CCB310]
+    - [0xCD0660, .rodata, CCBE20]
+    - [0xCD06C0,    .bss, CCBE20]
   - name: flo_15
     dir: world/area_flo/flo_15
     type: code
@@ -8993,12 +8901,8 @@ segments:
     start: 0xCD06C0
     vram: 0x80240000
     subsegments:
-    - [0xCD06C0, data]
-    - [0xCD07E0, data]
-    - [0xCD09C0, data]
-    - [0xCD19A0, data]
-    - [0xCD1A20, data]
-    - [0xCD1E20, rodata]
+    - [0xCD06C0,   .data, CD06C0]
+    - [0xCD1E20, .rodata, CD06C0]
   - name: flo_16
     dir: world/area_flo/flo_16
     type: code
@@ -9006,17 +8910,15 @@ segments:
     start: 0xCD1E30
     vram: 0x80240000
     subsegments:
-    - [0xCD1E30, c]
-    - [0xCD1E70, c]
-    - [0xCD1F10, c]
-    - [0xCD2C80, c]
-    - [0xCD4770, c]
-    - [0xCD47A0, data]
-    - [0xCD5530, data]
-    - [0xCD5E40, data]
-    - [0xCD6330, data]
-    - [0xCD7210, rodata]
-    - [0xCD7278, rodata]
+    - [0xCD1E30,       c, CD1E30]
+    - [0xCD1E70,       c, CD1E70]
+    - [0xCD1F10,       c, CD1F10]
+    - [0xCD2C80,       c, CD2C80]
+    - [0xCD4770,       c, CD4770]
+    - [0xCD47A0,   .data, CD1F10]
+    - [0xCD5E40,   .data, CD2C80]
+    - [0xCD7210, .rodata, CD1F10]
+    - [0xCD7220, .rodata, CD2C80]
   - name: flo_17
     dir: world/area_flo/flo_17
     type: code
@@ -9024,15 +8926,11 @@ segments:
     start: 0xCD72E0
     vram: 0x80240000
     subsegments:
-    - [0xCD72E0, c]
-    - [0xCD7320, c]
-    - [0xCD7350, c]
-    - [0xCDA500, data]
-    - [0xCDB2B0, data]
-    - [0xCDC560, data]
-    - [0xCDC5D0, rodata]
-    - [0xCDC638, rodata]
-    - [0xCDC698, rodata]
+    - [0xCD72E0,       c, CD72E0]
+    - [0xCD7320,       c, CD7320]
+    - [0xCD7350,       c, CD7350]
+    - [0xCDA500,   .data, CD7350]
+    - [0xCDC5D0, .rodata, CD7350]
   - name: flo_18
     dir: world/area_flo/flo_18
     type: code
@@ -9040,14 +8938,12 @@ segments:
     start: 0xCDC6A0
     vram: 0x80240000
     subsegments:
-    - [0xCDC6A0, c]
-    - [0xCDCBD0, c]
-    - [0xCDCC30, c]
-    - [0xCDCE70, data]
-    - [0xCDCF60, data]
-    - [0xCDD530, data]
-    - [0xCE2D60, data]
-    - [0xCE36E0, rodata]
+    - [0xCDC6A0,       c, CDC6A0]
+    - [0xCDCBD0,       c, CDCBD0]
+    - [0xCDCC30,       c, CDCC30]
+    - [0xCDCE70,   .data, CDC6A0]
+    - [0xCE2D60,   .data, CDCC30]
+    - [0xCE36E0, .rodata, CDC6A0]
   - name: flo_19
     dir: world/area_flo/flo_19
     type: code
@@ -9055,13 +8951,9 @@ segments:
     start: 0xCE36F0
     vram: 0x80240000
     subsegments:
-    - [0xCE36F0, c]
-    - [0xCE4030, data]
-    - [0xCE41B0, data]
-    - [0xCE41F0, data]
-    - [0xCE4740, data]
-    - [0xCE5160, data]
-    - [0xCE66F0, rodata]
+    - [0xCE36F0,       c, CE36F0]
+    - [0xCE4030,   .data, CE36F0]
+    - [0xCE66F0, .rodata, CE36F0]
   - name: flo_21
     dir: world/area_flo/flo_21
     type: code
@@ -9069,11 +8961,11 @@ segments:
     start: 0xCE6700
     vram: 0x80240000
     subsegments:
-    - [0xCE6700, c]
-    - [0xCE7240, c]
-    - [0xCE73F0, data]
-    - [0xCE7EC0, data]
-    - [0xCEC210, rodata]
+    - [0xCE6700,       c, CE6700]
+    - [0xCE7240,       c, CE7240]
+    - [0xCE73F0,   .data, CE6700]
+    - [0xCE7440,   .data, CE7240]
+    - [0xCEC210, .rodata, CE6700]
   - name: flo_22
     dir: world/area_flo/flo_22
     type: code
@@ -9081,14 +8973,12 @@ segments:
     start: 0xCEC240
     vram: 0x80240000
     subsegments:
-    - [0xCEC240, c]
-    - [0xCEC280, c]
-    - [0xCEC290, c]
-    - [0xCEC4D0, data]
-    - [0xCEC760, data]
-    - [0xCED050, data]
-    - [0xCED7E0, data]
-    - [0xCEE250, rodata]
+    - [0xCEC240,       c, CEC240]
+    - [0xCEC280,       c, CEC280]
+    - [0xCEC290,       c, CEC290]
+    - [0xCEC4D0,   .data, CEC240]
+    - [0xCED7E0,   .data, CEC290]
+    - [0xCEE250, .rodata, CEC240]
   - name: flo_23
     dir: world/area_flo/flo_23
     type: code
@@ -9096,12 +8986,11 @@ segments:
     start: 0xCEE260
     vram: 0x80240000
     subsegments:
-    - [0xCEE260, c]
-    - [0xCEE2A0, c]
-    - [0xCEEF30, data]
-    - [0xCEF540, data]
-    - [0xCF0800, data]
-    - [0xCF08D0, rodata]
+    - [0xCEE260,       c, CEE260]
+    - [0xCEE2A0,       c, CEE2A0]
+    - [0xCEEF30,   .data, CEE2A0]
+    - [0xCF08D0, .rodata, CEE2A0]
+    - [0xCF0940,    .bss, CEE2A0]
   - name: flo_24
     dir: world/area_flo/flo_24
     type: code
@@ -9109,13 +8998,11 @@ segments:
     start: 0xCF0940
     vram: 0x80240000
     subsegments:
-    - [0xCF0940, c]
-    - [0xCF0980, c]
-    - [0xCF0BC0, c]
-    - [0xCF0ED0, data]
-    - [0xCF1680, data]
-    - [0xCF2AF0, data]
-    - [0xCF2BB0, rodata]
+    - [0xCF0940,       c, CF0940]
+    - [0xCF0980,       c, CF0980]
+    - [0xCF0BC0,       c, CF0BC0]
+    - [0xCF0ED0,   .data, CF0980]
+    - [0xCF2BB0, .rodata, CF0980]
   - name: flo_25
     dir: world/area_flo/flo_25
     type: code
@@ -9123,16 +9010,14 @@ segments:
     start: 0xCF2BD0
     vram: 0x80240000
     subsegments:
-    - [0xCF2BD0, c]
-    - [0xCF2C10, c]
-    - [0xCF4BC0, c]
-    - [0xCF4E00, c]
-    - [0xCF4EA0, data]
-    - [0xCF6860, data]
-    - [0xCF68B0, data]
-    - [0xCF7310, data]
-    - [0xCF7AA0, rodata]
-    - [0xCF7B08, rodata]
+    - [0xCF2BD0,       c, CF2BD0]
+    - [0xCF2C10,       c, CF2C10]
+    - [0xCF4BC0,       c, CF4BC0]
+    - [0xCF4E00,       c, CF4E00]
+    - [0xCF4EA0,   .data, CF2C10]
+    - [0xCF68B0,   .data, CF4BC0]
+    - [0xCF7AA0, .rodata, CF2C10]
+    - [0xCF7B70,    .bss, CF2C10]
   - name: sam_01
     dir: world/area_sam/sam_01
     type: code
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index c4b6a125bf..bd86466f36 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -7288,7 +7288,7 @@ func_80283D6C = 0x80283D6C; // type:func rom:0x7E4BEC
 func_80283DF0 = 0x80283DF0; // type:func rom:0x7E4C70
 func_80283E2C = 0x80283E2C; // type:func rom:0x7E4CAC
 func_80240000_7E73A0 = 0x80240000; // type:func rom:0x7E73A0
-func_80240030_7E73D0 = 0x80240030; // type:func rom:0x7E73D0
+machi_UnkFunc36 = 0x80240030; // type:func rom:0x7E73D0
 func_80240038_7E73D8 = 0x80240038; // type:func rom:0x7E73D8
 func_80240040_7E73E0 = 0x80240040; // type:func rom:0x7E73E0
 func_80240048_7E73E8 = 0x80240048; // type:func rom:0x7E73E8
@@ -7308,7 +7308,7 @@ D_80241180_7E8520 = 0x80241180; // type:data rom:0x7E8520
 D_80243960_7EAD00 = 0x80243960; // type:data rom:0x7EAD00
 mac_00_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x7EAD10
 mac_00_GetCurrentFloor = 0x80240020; // type:func rom:0x7EAD30
-func_80240034_7EAD44 = 0x80240034; // type:func rom:0x7EAD44
+mac_00_UnkFunc25 = 0x80240034; // type:func rom:0x7EAD44
 mac_00_GetEntryPos = 0x802400F0; // type:func rom:0x7EAE00
 mac_00_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x7EAEE0
 mac_00_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x7EAF4C
@@ -7321,11 +7321,11 @@ mac_00_GetItemName = 0x802406E4; // type:func rom:0x7EB3F4
 mac_00_Set80151310_1 = 0x80240748; // type:func rom:0x7EB458
 mac_00_Set80151310_0 = 0x8024075C; // type:func rom:0x7EB46C
 func_8024076C_7EB47C = 0x8024076C; // type:func rom:0x7EB47C
-func_80240990_7EB6A0 = 0x80240990; // type:func rom:0x7EB6A0
+mac_00_UnkFunc31 = 0x80240990; // type:func rom:0x7EB6A0
 mac_00_GetNpcUnsafeOwner2 = 0x802409DC; // type:func rom:0x7EB6EC
-func_802409FC_7EB70C = 0x802409FC; // type:func rom:0x7EB70C
+mac_00_UnkFunc28 = 0x802409FC; // type:func rom:0x7EB70C
 mac_00_UnkAlphaFunc = 0x80240A5C; // type:func rom:0x7EB76C
-func_80240BA8_7EB8B8 = 0x80240BA8; // type:func rom:0x7EB8B8
+mac_00_UnkFunc29 = 0x80240BA8; // type:func rom:0x7EB8B8
 func_80240D1C_7EBA2C = 0x80240D1C; // type:func rom:0x7EBA2C
 func_80240DA0_7EBAB0 = 0x80240DA0; // type:func rom:0x7EBAB0
 func_80240FB8_7EBCC8 = 0x80240FB8; // type:func rom:0x7EBCC8
@@ -7428,11 +7428,11 @@ mac_01_GetItemName = 0x80241FC4; // type:func rom:0x802844
 mac_01_Set80151310_1 = 0x80242028; // type:func rom:0x8028A8
 mac_01_Set80151310_0 = 0x8024203C; // type:func rom:0x8028BC
 func_8024204C_8028CC = 0x8024204C; // type:func rom:0x8028CC
-func_80242270_802AF0 = 0x80242270; // type:func rom:0x802AF0
+mac_01_UnkFunc31 = 0x80242270; // type:func rom:0x802AF0
 mac_01_GetNpcUnsafeOwner2 = 0x802422BC; // type:func rom:0x802B3C
-func_802422DC_802B5C = 0x802422DC; // type:func rom:0x802B5C
+mac_01_UnkFunc28 = 0x802422DC; // type:func rom:0x802B5C
 mac_01_UnkAlphaFunc = 0x8024233C; // type:func rom:0x802BBC
-func_80242488_802D08 = 0x80242488; // type:func rom:0x802D08
+mac_01_UnkFunc29 = 0x80242488; // type:func rom:0x802D08
 func_802425FC_802E7C = 0x802425FC; // type:func rom:0x802E7C
 func_80242680_802F00 = 0x80242680; // type:func rom:0x802F00
 func_80242898_803118 = 0x80242898; // type:func rom:0x803118
@@ -7459,13 +7459,13 @@ func_80243680_803F00 = 0x80243680; // type:func rom:0x803F00
 func_80243740_803FC0 = 0x80243740; // type:func rom:0x803FC0
 mac_01_Call800E9894 = 0x802437AC; // type:func rom:0x80402C
 mac_01_Call800E98C4SyncStatusMenu = 0x802437CC; // type:func rom:0x80404C
-pause_tutorial_draw_contents_804074 = 0x802437F4; // type:func rom:0x804074
-func_80243870_8040F0 = 0x80243870; // type:func rom:0x8040F0
+mac_01_UnkFunc32 = 0x802437F4; // type:func rom:0x804074
+mac_01_UnkFunc33 = 0x80243870; // type:func rom:0x8040F0
 mac_01_AwaitScriptComplete = 0x802438F0; // type:func rom:0x804170
 mac_01_PartnerSuspendAbilityScript = 0x80243920; // type:func rom:0x8041A0
 mac_01_PartnerResumeAbilityScript = 0x8024394C; // type:func rom:0x8041CC
-func_8024396C_8041EC = 0x8024396C; // type:func rom:0x8041EC
-func_802439C0_804240 = 0x802439C0; // type:func rom:0x804240
+mac_01_UnkFunc34 = 0x8024396C; // type:func rom:0x8041EC
+mac_01_UnkFunc35 = 0x802439C0; // type:func rom:0x804240
 mac_01_GetPartnerCall800EB168 = 0x80243A3C; // type:func rom:0x8042BC
 mac_01_Call800EB168 = 0x80243A70; // type:func rom:0x8042F0
 func_80243AA0_804320 = 0x80243AA0; // type:func rom:0x804320
@@ -7538,7 +7538,7 @@ D_80262890_823110 = 0x80262890; // type:data rom:0x823110
 D_80262898_823118 = 0x80262898; // type:data rom:0x823118
 mac_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8232C0
 mac_02_GetCurrentFloor = 0x80240020; // type:func rom:0x8232E0
-func_80240034_8232F4 = 0x80240034; // type:func rom:0x8232F4
+mac_02_UnkFunc25 = 0x80240034; // type:func rom:0x8232F4
 mac_02_GetEntryPos = 0x802400F0; // type:func rom:0x8233B0
 mac_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x823490
 mac_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8234FC
@@ -7565,11 +7565,11 @@ mac_02_GetItemName = 0x80241874; // type:func rom:0x824B34
 mac_02_Set80151310_1 = 0x802418D8; // type:func rom:0x824B98
 mac_02_Set80151310_0 = 0x802418EC; // type:func rom:0x824BAC
 func_802418FC_824BBC = 0x802418FC; // type:func rom:0x824BBC
-func_80241B20_824DE0 = 0x80241B20; // type:func rom:0x824DE0
+mac_02_UnkFunc31 = 0x80241B20; // type:func rom:0x824DE0
 mac_02_GetNpcUnsafeOwner2 = 0x80241B6C; // type:func rom:0x824E2C
-func_80241B8C_824E4C = 0x80241B8C; // type:func rom:0x824E4C
+mac_02_UnkFunc28 = 0x80241B8C; // type:func rom:0x824E4C
 mac_02_UnkAlphaFunc = 0x80241BEC; // type:func rom:0x824EAC
-func_80241D38_824FF8 = 0x80241D38; // type:func rom:0x824FF8
+mac_02_UnkFunc29 = 0x80241D38; // type:func rom:0x824FF8
 func_80241EAC_82516C = 0x80241EAC; // type:func rom:0x82516C
 func_80241F30_8251F0 = 0x80241F30; // type:func rom:0x8251F0
 func_80242148_825408 = 0x80242148; // type:func rom:0x825408
@@ -7622,7 +7622,7 @@ D_8024E3A0_831660 = 0x8024E3A0; // type:data rom:0x831660
 D_8024E470_831730 = 0x8024E470; // type:data rom:0x831730
 mac_03_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x831800
 mac_03_GetCurrentFloor = 0x80240020; // type:func rom:0x831820
-func_80240034_831834 = 0x80240034; // type:func rom:0x831834
+mac_03_UnkFunc25 = 0x80240034; // type:func rom:0x831834
 mac_03_GetEntryPos = 0x802400F0; // type:func rom:0x8318F0
 mac_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8319D0
 mac_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x831A3C
@@ -7633,11 +7633,11 @@ mac_03_GetItemName = 0x80240564; // type:func rom:0x831D64
 mac_03_Set80151310_1 = 0x802405C8; // type:func rom:0x831DC8
 mac_03_Set80151310_0 = 0x802405DC; // type:func rom:0x831DDC
 func_802405EC_831DEC = 0x802405EC; // type:func rom:0x831DEC
-func_80240810_832010 = 0x80240810; // type:func rom:0x832010
+mac_03_UnkFunc31 = 0x80240810; // type:func rom:0x832010
 mac_03_GetNpcUnsafeOwner2 = 0x8024085C; // type:func rom:0x83205C
-func_8024087C_83207C = 0x8024087C; // type:func rom:0x83207C
+mac_03_UnkFunc28 = 0x8024087C; // type:func rom:0x83207C
 mac_03_UnkAlphaFunc = 0x802408DC; // type:func rom:0x8320DC
-func_80240A28_832228 = 0x80240A28; // type:func rom:0x832228
+mac_03_UnkFunc29 = 0x80240A28; // type:func rom:0x832228
 func_80240B9C_83239C = 0x80240B9C; // type:func rom:0x83239C
 func_80240C20_832420 = 0x80240C20; // type:func rom:0x832420
 func_80240E38_832638 = 0x80240E38; // type:func rom:0x832638
@@ -7668,7 +7668,7 @@ func_80241B84_833384 = 0x80241B84; // type:func rom:0x833384
 func_80241BD8_8333D8 = 0x80241BD8; // type:func rom:0x8333D8
 mac_03_foliage_setup_shear_mtx = 0x80241D00; // type:func rom:0x833500
 mac_03_TransformFoliage = 0x80241D70; // type:func rom:0x833570
-func_80241F40_833740 = 0x80241F40; // type:func rom:0x833740
+mac_03_UnkFunc30 = 0x80241F40; // type:func rom:0x833740
 mac_03_GetPlayerCoins = 0x80241F6C; // type:func rom:0x83376C
 func_80241F80_833780 = 0x80241F80; // type:func rom:0x833780
 func_80241FA0_8337A0 = 0x80241FA0; // type:func rom:0x8337A0
@@ -7697,11 +7697,11 @@ mac_04_GetItemName = 0x80240514; // type:func rom:0x8430E4
 mac_04_Set80151310_1 = 0x80240578; // type:func rom:0x843148
 mac_04_Set80151310_0 = 0x8024058C; // type:func rom:0x84315C
 func_8024059C_84316C = 0x8024059C; // type:func rom:0x84316C
-func_802407C0_843390 = 0x802407C0; // type:func rom:0x843390
+mac_04_UnkFunc31 = 0x802407C0; // type:func rom:0x843390
 mac_04_GetNpcUnsafeOwner2 = 0x8024080C; // type:func rom:0x8433DC
-func_8024082C_8433FC = 0x8024082C; // type:func rom:0x8433FC
+mac_04_UnkFunc28 = 0x8024082C; // type:func rom:0x8433FC
 mac_04_UnkAlphaFunc = 0x8024088C; // type:func rom:0x84345C
-func_802409D8_8435A8 = 0x802409D8; // type:func rom:0x8435A8
+mac_04_UnkFunc29 = 0x802409D8; // type:func rom:0x8435A8
 func_80240B4C_84371C = 0x80240B4C; // type:func rom:0x84371C
 func_80240BD0_8437A0 = 0x80240BD0; // type:func rom:0x8437A0
 func_80240DE8_8439B8 = 0x80240DE8; // type:func rom:0x8439B8
@@ -7727,7 +7727,7 @@ func_802417AC_84437C = 0x802417AC; // type:func rom:0x84437C
 func_80241848_844418 = 0x80241848; // type:func rom:0x844418
 func_802418AC_84447C = 0x802418AC; // type:func rom:0x84447C
 PostChapter4StatUpdate = 0x80241944; // type:func rom:0x844514
-func_80241980_844550 = 0x80241980; // type:func rom:0x844550
+mac_04_UnkFunc30 = 0x80241980; // type:func rom:0x844550
 func_802419AC_84457C = 0x802419AC; // type:func rom:0x84457C
 mac_04_GetPlayerCoins = 0x802419D0; // type:func rom:0x8445A0
 func_802419E4_8445B4 = 0x802419E4; // type:func rom:0x8445B4
@@ -7771,11 +7771,11 @@ mac_05_GetItemName = 0x802413D4; // type:func rom:0x853544
 mac_05_Set80151310_1 = 0x80241438; // type:func rom:0x8535A8
 mac_05_Set80151310_0 = 0x8024144C; // type:func rom:0x8535BC
 func_8024145C_8535CC = 0x8024145C; // type:func rom:0x8535CC
-func_80241680_8537F0 = 0x80241680; // type:func rom:0x8537F0
+mac_05_UnkFunc31 = 0x80241680; // type:func rom:0x8537F0
 mac_05_GetNpcUnsafeOwner2 = 0x802416CC; // type:func rom:0x85383C
-func_802416EC_85385C = 0x802416EC; // type:func rom:0x85385C
+mac_05_UnkFunc28 = 0x802416EC; // type:func rom:0x85385C
 mac_05_UnkAlphaFunc = 0x8024174C; // type:func rom:0x8538BC
-func_80241898_853A08 = 0x80241898; // type:func rom:0x853A08
+mac_05_UnkFunc29 = 0x80241898; // type:func rom:0x853A08
 func_80241A0C_853B7C = 0x80241A0C; // type:func rom:0x853B7C
 func_80241A90_853C00 = 0x80241A90; // type:func rom:0x853C00
 func_80241CA8_853E18 = 0x80241CA8; // type:func rom:0x853E18
@@ -7806,7 +7806,7 @@ func_80242A64_854BD4 = 0x80242A64; // type:func rom:0x854BD4
 func_80242A90_854C00 = 0x80242A90; // type:func rom:0x854C00
 func_80242C78_854DE8 = 0x80242C78; // type:func rom:0x854DE8
 func_80242E84_854FF4 = 0x80242E84; // type:func rom:0x854FF4
-func_80243088_8551F8 = 0x80243088; // type:func rom:0x8551F8
+mac_05_UnkFunc30 = 0x80243088; // type:func rom:0x8551F8
 func_802430B4_855224 = 0x802430B4; // type:func rom:0x855224
 func_802431B0_855320 = 0x802431B0; // type:func rom:0x855320
 func_80243254_8553C4 = 0x80243254; // type:func rom:0x8553C4
@@ -7869,7 +7869,7 @@ tik_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8694B0
 tik_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8695D4
 tik_01_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x8697BC
 tik_01_GetCurrentFloor = 0x8024032C; // type:func rom:0x8697DC
-func_80240340_8697F0 = 0x80240340; // type:func rom:0x8697F0
+tik_01_UnkFunc25 = 0x80240340; // type:func rom:0x8697F0
 tik_01_GetEntryPos = 0x802403FC; // type:func rom:0x8698AC
 tik_01_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x86998C
 tik_01_SomeXYZFunc2 = 0x80240548; // type:func rom:0x8699F8
@@ -7889,7 +7889,7 @@ D_802410C0_86D800 = 0x802410C0; // type:data rom:0x86D800
 D_80241BAE_86E2EE = 0x80241BAE; // type:data rom:0x86E2EE
 tik_03_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x86EB00
 tik_03_GetCurrentFloor = 0x80240020; // type:func rom:0x86EB20
-func_80240034_86EB34 = 0x80240034; // type:func rom:0x86EB34
+tik_03_UnkFunc25 = 0x80240034; // type:func rom:0x86EB34
 tik_03_GetEntryPos = 0x802400F0; // type:func rom:0x86EBF0
 tik_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x86ECD0
 tik_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x86ED3C
@@ -7905,14 +7905,14 @@ tik_04_UnkTexturePanFunc = 0x80240000; // type:func rom:0x871A30
 tik_04_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x871B54
 tik_04_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x871D3C
 tik_04_GetCurrentFloor = 0x8024032C; // type:func rom:0x871D5C
-func_80240340_871D70 = 0x80240340; // type:func rom:0x871D70
+tik_04_UnkFunc25 = 0x80240340; // type:func rom:0x871D70
 tik_04_GetEntryPos = 0x802403FC; // type:func rom:0x871E2C
 tik_04_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x871F0C
 tik_04_SomeXYZFunc2 = 0x80240548; // type:func rom:0x871F78
 func_802405F0_872020 = 0x802405F0; // type:func rom:0x872020
 func_80240960_872390 = 0x80240960; // type:func rom:0x872390
 func_80240A00_872430 = 0x80240A00; // type:func rom:0x872430
-func_80240BF4_872624 = 0x80240BF4; // type:func rom:0x872624
+tik_04_UnkFunc30 = 0x80240BF4; // type:func rom:0x872624
 func_80240C20_872650 = 0x80240C20; // type:func rom:0x872650
 tik_05_UnkTexturePanFunc = 0x80240000; // type:func rom:0x874DC0
 tik_05_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x874EE4
@@ -7926,7 +7926,7 @@ tik_05_SetEntityPosition = 0x80240984; // type:func rom:0x875744
 D_80241800_8765C0 = 0x80241800; // type:data rom:0x8765C0
 tik_06_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x876EE0
 tik_06_GetCurrentFloor = 0x80240020; // type:func rom:0x876F00
-func_80240034_876F14 = 0x80240034; // type:func rom:0x876F14
+tik_06_UnkFunc25 = 0x80240034; // type:func rom:0x876F14
 tik_06_GetEntryPos = 0x802400F0; // type:func rom:0x876FD0
 tik_06_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8770B0
 tik_06_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87711C
@@ -7935,7 +7935,7 @@ tik_06_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8772E4
 func_802405F0_8774D0 = 0x802405F0; // type:func rom:0x8774D0
 tik_07_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x879BE0
 tik_07_GetCurrentFloor = 0x80240020; // type:func rom:0x879C00
-func_80240034_879C14 = 0x80240034; // type:func rom:0x879C14
+tik_07_UnkFunc25 = 0x80240034; // type:func rom:0x879C14
 tik_07_GetEntryPos = 0x802400F0; // type:func rom:0x879CD0
 tik_07_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x879DB0
 tik_07_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x879E1C
@@ -7943,20 +7943,20 @@ tik_07_SetOverrideFlags_40 = 0x802402E0; // type:func rom:0x879EC0
 tik_07_UnkFunc17 = 0x802402FC; // type:func rom:0x879EDC
 func_8024031C_879EFC = 0x8024031C; // type:func rom:0x879EFC
 tik_07_UnkFunc18 = 0x80240348; // type:func rom:0x879F28
-func_802403B4_879F94 = 0x802403B4; // type:func rom:0x879F94
-func_80240400_879FE0 = 0x80240400; // type:func rom:0x879FE0
+tik_07_UnkFunc37 = 0x802403B4; // type:func rom:0x879F94
+tik_07_UnkFunc38 = 0x80240400; // type:func rom:0x879FE0
 func_802404AC_87A08C = 0x802404AC; // type:func rom:0x87A08C
 func_802406FC_87A2DC = 0x802406FC; // type:func rom:0x87A2DC
 tik_07_UnkFunc19 = 0x80240728; // type:func rom:0x87A308
 tik_07_UnkFunc20 = 0x80240760; // type:func rom:0x87A340
-func_802407F0_87A3D0 = 0x802407F0; // type:func rom:0x87A3D0
+tik_07_UnkFunc39 = 0x802407F0; // type:func rom:0x87A3D0
 tik_07_UnkFunc21 = 0x80240824; // type:func rom:0x87A404
 tik_07_UnkFunc22 = 0x80240888; // type:func rom:0x87A468
 func_802408E0_87A4C0 = 0x802408E0; // type:func rom:0x87A4C0
 tik_07_UnkFunc23 = 0x80240E18; // type:func rom:0x87A9F8
 tik_07_UnkPartnerPosFunc = 0x80240F58; // type:func rom:0x87AB38
 tik_07_UnkPartnerPosFunc2 = 0x80240FA0; // type:func rom:0x87AB80
-func_80240FE8_87ABC8 = 0x80240FE8; // type:func rom:0x87ABC8
+tik_07_UnkFunc40 = 0x80240FE8; // type:func rom:0x87ABC8
 func_80241020_87AC00 = 0x80241020; // type:func rom:0x87AC00
 func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70
 func_802413F0_87AFD0 = 0x802413F0; // type:func rom:0x87AFD0
@@ -7981,7 +7981,7 @@ D_802451B8_87ED98 = 0x802451B8; // type:data rom:0x87ED98
 D_802451C0_87EDA0 = 0x802451C0; // type:data rom:0x87EDA0
 tik_08_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x87EDF0
 tik_08_GetCurrentFloor = 0x80240020; // type:func rom:0x87EE10
-func_80240034_87EE24 = 0x80240034; // type:func rom:0x87EE24
+tik_08_UnkFunc25 = 0x80240034; // type:func rom:0x87EE24
 tik_08_GetEntryPos = 0x802400F0; // type:func rom:0x87EEE0
 tik_08_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x87EFC0
 tik_08_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87F02C
@@ -7989,12 +7989,12 @@ tik_08_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x87F0D0
 tik_08_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x87F1F4
 func_802405F0_87F3E0 = 0x802405F0; // type:func rom:0x87F3E0
 tik_08_SetEntityPosition = 0x80240960; // type:func rom:0x87F750
-func_80240A30_87F820 = 0x80240A30; // type:func rom:0x87F820
+tik_08_UnkFunc30 = 0x80240A30; // type:func rom:0x87F820
 func_80240A5C_87F84C = 0x80240A5C; // type:func rom:0x87F84C
 D_80242C0E_8819FE = 0x80242C0E; // type:data rom:0x8819FE
 tik_09_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8821C0
 tik_09_GetCurrentFloor = 0x80240020; // type:func rom:0x8821E0
-func_80240034_8821F4 = 0x80240034; // type:func rom:0x8821F4
+tik_09_UnkFunc25 = 0x80240034; // type:func rom:0x8821F4
 tik_09_GetEntryPos = 0x802400F0; // type:func rom:0x8822B0
 tik_09_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x882390
 tik_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8823FC
@@ -8016,27 +8016,27 @@ tik_10_SetOverrideFlags_40 = 0x80240680; // type:func rom:0x886A40
 tik_10_UnkFunc17 = 0x8024069C; // type:func rom:0x886A5C
 func_802406BC_886A7C = 0x802406BC; // type:func rom:0x886A7C
 tik_10_UnkFunc18 = 0x802406E8; // type:func rom:0x886AA8
-func_80240754_886B14 = 0x80240754; // type:func rom:0x886B14
-func_802407A0_886B60 = 0x802407A0; // type:func rom:0x886B60
+tik_10_UnkFunc37 = 0x80240754; // type:func rom:0x886B14
+tik_10_UnkFunc38 = 0x802407A0; // type:func rom:0x886B60
 func_8024084C_886C0C = 0x8024084C; // type:func rom:0x886C0C
 func_80240A9C_886E5C = 0x80240A9C; // type:func rom:0x886E5C
 tik_10_UnkFunc19 = 0x80240AC8; // type:func rom:0x886E88
 tik_10_UnkFunc20 = 0x80240B00; // type:func rom:0x886EC0
-func_80240B90_886F50 = 0x80240B90; // type:func rom:0x886F50
+tik_10_UnkFunc39 = 0x80240B90; // type:func rom:0x886F50
 tik_10_UnkFunc21 = 0x80240BC4; // type:func rom:0x886F84
 tik_10_UnkFunc22 = 0x80240C28; // type:func rom:0x886FE8
 func_80240C80_887040 = 0x80240C80; // type:func rom:0x887040
 tik_10_UnkFunc23 = 0x802411B8; // type:func rom:0x887578
 tik_10_UnkPartnerPosFunc = 0x802412F8; // type:func rom:0x8876B8
 tik_10_UnkPartnerPosFunc2 = 0x80241340; // type:func rom:0x887700
-func_80241388_887748 = 0x80241388; // type:func rom:0x887748
+tik_10_UnkFunc40 = 0x80241388; // type:func rom:0x887748
 D_80242030_8883F0 = 0x80242030; // type:data rom:0x8883F0
 D_80242038_8883F8 = 0x80242038; // type:data rom:0x8883F8
 D_80242048_888408 = 0x80242048; // type:data rom:0x888408
 D_80242088_888448 = 0x80242088; // type:data rom:0x888448
 tik_12_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x888BD0
 tik_12_GetCurrentFloor = 0x80240020; // type:func rom:0x888BF0
-func_80240034_888C04 = 0x80240034; // type:func rom:0x888C04
+tik_12_UnkFunc25 = 0x80240034; // type:func rom:0x888C04
 tik_12_GetEntryPos = 0x802400F0; // type:func rom:0x888CC0
 tik_12_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x888DA0
 tik_12_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x888E0C
@@ -8051,20 +8051,20 @@ tik_12_SetOverrideFlags_40 = 0x80240C1C; // type:func rom:0x8897EC
 tik_12_UnkFunc17 = 0x80240C38; // type:func rom:0x889808
 func_80240C58_889828 = 0x80240C58; // type:func rom:0x889828
 tik_12_UnkFunc18 = 0x80240C84; // type:func rom:0x889854
-func_80240CF0_8898C0 = 0x80240CF0; // type:func rom:0x8898C0
-func_80240D3C_88990C = 0x80240D3C; // type:func rom:0x88990C
+tik_12_UnkFunc37 = 0x80240CF0; // type:func rom:0x8898C0
+tik_12_UnkFunc38 = 0x80240D3C; // type:func rom:0x88990C
 func_80240DE8_8899B8 = 0x80240DE8; // type:func rom:0x8899B8
 func_80241038_889C08 = 0x80241038; // type:func rom:0x889C08
 tik_12_UnkFunc19 = 0x80241064; // type:func rom:0x889C34
 tik_12_UnkFunc20 = 0x8024109C; // type:func rom:0x889C6C
-func_8024112C_889CFC = 0x8024112C; // type:func rom:0x889CFC
+tik_12_UnkFunc39 = 0x8024112C; // type:func rom:0x889CFC
 tik_12_UnkFunc21 = 0x80241160; // type:func rom:0x889D30
 tik_12_UnkFunc22 = 0x802411C4; // type:func rom:0x889D94
 func_8024121C_889DEC = 0x8024121C; // type:func rom:0x889DEC
 tik_12_UnkFunc23 = 0x80241754; // type:func rom:0x88A324
 tik_12_UnkPartnerPosFunc = 0x80241894; // type:func rom:0x88A464
 tik_12_UnkPartnerPosFunc2 = 0x802418DC; // type:func rom:0x88A4AC
-func_80241924_88A4F4 = 0x80241924; // type:func rom:0x88A4F4
+tik_12_UnkFunc40 = 0x80241924; // type:func rom:0x88A4F4
 tik_12_set_script_owner_npc_anim = 0x80241960; // type:func rom:0x88A530
 func_802419DC_88A5AC = 0x802419DC; // type:func rom:0x88A5AC
 tik_12_UnkNpcAIFunc12 = 0x80241B10; // type:func rom:0x88A6E0
@@ -8081,7 +8081,7 @@ D_80243D04_88C8D4 = 0x80243D04; // type:data rom:0x88C8D4
 D_802449D0_88D5A0 = 0x802449D0; // type:data rom:0x88D5A0
 tik_14_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x88D600
 tik_14_GetCurrentFloor = 0x80240020; // type:func rom:0x88D620
-func_80240034_88D634 = 0x80240034; // type:func rom:0x88D634
+tik_14_UnkFunc25 = 0x80240034; // type:func rom:0x88D634
 tik_14_GetEntryPos = 0x802400F0; // type:func rom:0x88D6F0
 tik_14_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88D7D0
 tik_14_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88D83C
@@ -8090,7 +8090,7 @@ tik_14_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x88DA04
 func_802405F0_88DBF0 = 0x802405F0; // type:func rom:0x88DBF0
 tik_15_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x88FBA0
 tik_15_GetCurrentFloor = 0x80240020; // type:func rom:0x88FBC0
-func_80240034_88FBD4 = 0x80240034; // type:func rom:0x88FBD4
+tik_15_UnkFunc25 = 0x80240034; // type:func rom:0x88FBD4
 tik_15_GetEntryPos = 0x802400F0; // type:func rom:0x88FC90
 tik_15_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88FD70
 tik_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88FDDC
@@ -8109,23 +8109,23 @@ tik_17_SetOverrideFlags_40 = 0x80240030; // type:func rom:0x892A50
 tik_17_UnkFunc17 = 0x8024004C; // type:func rom:0x892A6C
 func_8024006C_892A8C = 0x8024006C; // type:func rom:0x892A8C
 tik_17_UnkFunc18 = 0x80240098; // type:func rom:0x892AB8
-func_80240104_892B24 = 0x80240104; // type:func rom:0x892B24
-func_80240150_892B70 = 0x80240150; // type:func rom:0x892B70
+tik_17_UnkFunc37 = 0x80240104; // type:func rom:0x892B24
+tik_17_UnkFunc38 = 0x80240150; // type:func rom:0x892B70
 func_802401FC_892C1C = 0x802401FC; // type:func rom:0x892C1C
 func_8024044C_892E6C = 0x8024044C; // type:func rom:0x892E6C
 tik_17_UnkFunc19 = 0x80240478; // type:func rom:0x892E98
 tik_17_UnkFunc20 = 0x802404B0; // type:func rom:0x892ED0
-func_80240540_892F60 = 0x80240540; // type:func rom:0x892F60
+tik_17_UnkFunc39 = 0x80240540; // type:func rom:0x892F60
 tik_17_UnkFunc21 = 0x80240574; // type:func rom:0x892F94
 tik_17_UnkFunc22 = 0x802405D8; // type:func rom:0x892FF8
 func_80240630_893050 = 0x80240630; // type:func rom:0x893050
 tik_17_UnkFunc23 = 0x80240B68; // type:func rom:0x893588
 tik_17_UnkPartnerPosFunc = 0x80240CA8; // type:func rom:0x8936C8
 tik_17_UnkPartnerPosFunc2 = 0x80240CF0; // type:func rom:0x893710
-func_80240D38_893758 = 0x80240D38; // type:func rom:0x893758
+tik_17_UnkFunc40 = 0x80240D38; // type:func rom:0x893758
 tik_17_SetPlayerStatusAnimFlags100000 = 0x80240D70; // type:func rom:0x893790
 tik_17_GetCurrentFloor = 0x80240D90; // type:func rom:0x8937B0
-func_80240DA4_8937C4 = 0x80240DA4; // type:func rom:0x8937C4
+tik_17_UnkFunc25 = 0x80240DA4; // type:func rom:0x8937C4
 tik_17_GetEntryPos = 0x80240E60; // type:func rom:0x893880
 tik_17_GetCurrentCameraYawClamped180 = 0x80240F40; // type:func rom:0x893960
 tik_17_SomeXYZFunc2 = 0x80240FAC; // type:func rom:0x8939CC
@@ -8141,7 +8141,7 @@ func_80240310_8959F0 = 0x80240310; // type:func rom:0x8959F0
 func_80240680_895D60 = 0x80240680; // type:func rom:0x895D60
 tik_19_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8975E0
 tik_19_GetCurrentFloor = 0x80240020; // type:func rom:0x897600
-func_80240034_897614 = 0x80240034; // type:func rom:0x897614
+tik_19_UnkFunc25 = 0x80240034; // type:func rom:0x897614
 tik_19_GetEntryPos = 0x802400F0; // type:func rom:0x8976D0
 tik_19_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8977B0
 tik_19_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x89781C
@@ -8151,20 +8151,20 @@ tik_19_SetOverrideFlags_40 = 0x802405F0; // type:func rom:0x897BD0
 tik_19_UnkFunc17 = 0x8024060C; // type:func rom:0x897BEC
 func_8024062C_897C0C = 0x8024062C; // type:func rom:0x897C0C
 tik_19_UnkFunc18 = 0x80240658; // type:func rom:0x897C38
-func_802406C4_897CA4 = 0x802406C4; // type:func rom:0x897CA4
-func_80240710_897CF0 = 0x80240710; // type:func rom:0x897CF0
+tik_19_UnkFunc37 = 0x802406C4; // type:func rom:0x897CA4
+tik_19_UnkFunc38 = 0x80240710; // type:func rom:0x897CF0
 func_802407BC_897D9C = 0x802407BC; // type:func rom:0x897D9C
 func_80240A0C_897FEC = 0x80240A0C; // type:func rom:0x897FEC
 tik_19_UnkFunc19 = 0x80240A38; // type:func rom:0x898018
 tik_19_UnkFunc20 = 0x80240A70; // type:func rom:0x898050
-func_80240B00_8980E0 = 0x80240B00; // type:func rom:0x8980E0
+tik_19_UnkFunc39 = 0x80240B00; // type:func rom:0x8980E0
 tik_19_UnkFunc21 = 0x80240B34; // type:func rom:0x898114
 tik_19_UnkFunc22 = 0x80240B98; // type:func rom:0x898178
 func_80240BF0_8981D0 = 0x80240BF0; // type:func rom:0x8981D0
 tik_19_UnkFunc23 = 0x80241128; // type:func rom:0x898708
 tik_19_UnkPartnerPosFunc = 0x80241268; // type:func rom:0x898848
 tik_19_UnkPartnerPosFunc2 = 0x802412B0; // type:func rom:0x898890
-func_802412F8_8988D8 = 0x802412F8; // type:func rom:0x8988D8
+tik_19_UnkFunc40 = 0x802412F8; // type:func rom:0x8988D8
 D_802426B0_899C90 = 0x802426B0; // type:data rom:0x899C90
 D_802426B8_899C98 = 0x802426B8; // type:data rom:0x899C98
 D_802426C8_899CA8 = 0x802426C8; // type:data rom:0x899CA8
@@ -8173,7 +8173,7 @@ tik_20_UnkTexturePanFunc = 0x80240000; // type:func rom:0x89A350
 tik_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x89A474
 tik_20_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x89A65C
 tik_20_GetCurrentFloor = 0x8024032C; // type:func rom:0x89A67C
-func_80240340_89A690 = 0x80240340; // type:func rom:0x89A690
+tik_20_UnkFunc25 = 0x80240340; // type:func rom:0x89A690
 tik_20_GetEntryPos = 0x802403FC; // type:func rom:0x89A74C
 tik_20_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89A82C
 tik_20_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89A898
@@ -8188,7 +8188,7 @@ tik_21_UnkTexturePanFunc = 0x80240000; // type:func rom:0x89D7A0
 tik_21_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x89D8C4
 tik_21_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x89DAAC
 tik_21_GetCurrentFloor = 0x8024032C; // type:func rom:0x89DACC
-func_80240340_89DAE0 = 0x80240340; // type:func rom:0x89DAE0
+tik_21_UnkFunc25 = 0x80240340; // type:func rom:0x89DAE0
 tik_21_GetEntryPos = 0x802403FC; // type:func rom:0x89DB9C
 tik_21_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89DC7C
 tik_21_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89DCE8
@@ -8198,7 +8198,7 @@ tik_22_UnkTexturePanFunc = 0x80240030; // type:func rom:0x89FEF0
 tik_22_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0x8A0014
 tik_22_SetPlayerStatusAnimFlags100000 = 0x8024033C; // type:func rom:0x8A01FC
 tik_22_GetCurrentFloor = 0x8024035C; // type:func rom:0x8A021C
-func_80240370_8A0230 = 0x80240370; // type:func rom:0x8A0230
+tik_22_UnkFunc25 = 0x80240370; // type:func rom:0x8A0230
 tik_22_GetEntryPos = 0x8024042C; // type:func rom:0x8A02EC
 tik_22_GetCurrentCameraYawClamped180 = 0x8024050C; // type:func rom:0x8A03CC
 tik_22_SomeXYZFunc2 = 0x80240578; // type:func rom:0x8A0438
@@ -8206,7 +8206,7 @@ func_8024061C_8A04DC = 0x8024061C; // type:func rom:0x8A04DC
 func_80240640_8A0500 = 0x80240640; // type:func rom:0x8A0500
 tik_23_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8A23D0
 tik_23_GetCurrentFloor = 0x80240020; // type:func rom:0x8A23F0
-func_80240034_8A2404 = 0x80240034; // type:func rom:0x8A2404
+tik_23_UnkFunc25 = 0x80240034; // type:func rom:0x8A2404
 tik_23_GetEntryPos = 0x802400F0; // type:func rom:0x8A24C0
 tik_23_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8A25A0
 tik_23_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8A260C
@@ -8266,7 +8266,7 @@ func_80240CB0_8ACC40 = 0x80240CB0; // type:func rom:0x8ACC40
 D_80242D60_8AECF0 = 0x80242D60; // type:data rom:0x8AECF0
 kmr_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8B0070
 kmr_02_GetCurrentFloor = 0x80240020; // type:func rom:0x8B0090
-func_80240034_8B00A4 = 0x80240034; // type:func rom:0x8B00A4
+kmr_02_UnkFunc25 = 0x80240034; // type:func rom:0x8B00A4
 kmr_02_GetEntryPos = 0x802400F0; // type:func rom:0x8B0160
 kmr_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8B0240
 kmr_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8B02AC
@@ -8277,11 +8277,11 @@ kmr_02_GetItemName = 0x80240444; // type:func rom:0x8B04B4
 kmr_02_Set80151310_1 = 0x802404A8; // type:func rom:0x8B0518
 kmr_02_Set80151310_0 = 0x802404BC; // type:func rom:0x8B052C
 func_802404CC_8B053C = 0x802404CC; // type:func rom:0x8B053C
-func_802406F0_8B0760 = 0x802406F0; // type:func rom:0x8B0760
+kmr_02_UnkFunc31 = 0x802406F0; // type:func rom:0x8B0760
 kmr_02_GetNpcUnsafeOwner2 = 0x8024073C; // type:func rom:0x8B07AC
-func_8024075C_8B07CC = 0x8024075C; // type:func rom:0x8B07CC
+kmr_02_UnkFunc28 = 0x8024075C; // type:func rom:0x8B07CC
 kmr_02_UnkAlphaFunc = 0x802407BC; // type:func rom:0x8B082C
-func_80240908_8B0978 = 0x80240908; // type:func rom:0x8B0978
+kmr_02_UnkFunc29 = 0x80240908; // type:func rom:0x8B0978
 func_80240A7C_8B0AEC = 0x80240A7C; // type:func rom:0x8B0AEC
 func_80240B00_8B0B70 = 0x80240B00; // type:func rom:0x8B0B70
 func_80240D18_8B0D88 = 0x80240D18; // type:func rom:0x8B0D88
@@ -8309,7 +8309,7 @@ kmr_02_UnkNpcAIFunc10 = 0x8024191C; // type:func rom:0x8B198C
 func_80241964_8B19D4 = 0x80241964; // type:func rom:0x8B19D4
 func_80241A10_8B1A80 = 0x80241A10; // type:func rom:0x8B1A80
 func_80241C18_8B1C88 = 0x80241C18; // type:func rom:0x8B1C88
-func_80241E90_8B1F00 = 0x80241E90; // type:func rom:0x8B1F00
+kmr_02_UnkFunc41 = 0x80241E90; // type:func rom:0x8B1F00
 func_80242014_8B2084 = 0x80242014; // type:func rom:0x8B2084
 func_80242040_8B20B0 = 0x80242040; // type:func rom:0x8B20B0
 kmr_02_AddPlayerHandsOffset = 0x8024209C; // type:func rom:0x8B210C
@@ -8339,23 +8339,23 @@ func_80242F7C_8B2FEC = 0x80242F7C; // type:func rom:0x8B2FEC
 func_80243034_8B30A4 = 0x80243034; // type:func rom:0x8B30A4
 kmr_02_Call800E9894 = 0x80243070; // type:func rom:0x8B30E0
 kmr_02_Call800E98C4SyncStatusMenu = 0x80243090; // type:func rom:0x8B3100
-func_802430B8_8B3128 = 0x802430B8; // type:func rom:0x8B3128
-func_80243134_8B31A4 = 0x80243134; // type:func rom:0x8B31A4
+kmr_02_UnkFunc32 = 0x802430B8; // type:func rom:0x8B3128
+kmr_02_UnkFunc33 = 0x80243134; // type:func rom:0x8B31A4
 kmr_02_AwaitScriptComplete = 0x802431B4; // type:func rom:0x8B3224
 kmr_02_PartnerSuspendAbilityScript = 0x802431E4; // type:func rom:0x8B3254
 kmr_02_PartnerResumeAbilityScript = 0x80243210; // type:func rom:0x8B3280
-func_80243230_8B32A0 = 0x80243230; // type:func rom:0x8B32A0
-func_80243284_8B32F4 = 0x80243284; // type:func rom:0x8B32F4
+kmr_02_UnkFunc34 = 0x80243230; // type:func rom:0x8B32A0
+kmr_02_UnkFunc35 = 0x80243284; // type:func rom:0x8B32F4
 kmr_02_GetPartnerCall800EB168 = 0x80243300; // type:func rom:0x8B3370
 kmr_02_Call800EB168 = 0x80243334; // type:func rom:0x8B33A4
-func_80243364_8B33D4 = 0x80243364; // type:func rom:0x8B33D4
+kmr_02_UnkFunc36 = 0x80243364; // type:func rom:0x8B33D4
 func_80243370_8B33E0 = 0x80243370; // type:func rom:0x8B33E0
 func_802433AC_8B341C = 0x802433AC; // type:func rom:0x8B341C
 kmr_02_GetEntityPosition = 0x80243474; // type:func rom:0x8B34E4
 func_80243514_8B3584 = 0x80243514; // type:func rom:0x8B3584
 kmr_02_CheckPartnerFlags1000 = 0x80243640; // type:func rom:0x8B36B0
 func_8024366C_8B36DC = 0x8024366C; // type:func rom:0x8B36DC
-func_802436FC_8B376C = 0x802436FC; // type:func rom:0x8B376C
+kmr_02_UnkFunc42 = 0x802436FC; // type:func rom:0x8B376C
 kmr_02_foliage_setup_shear_mtx = 0x80243760; // type:func rom:0x8B37D0
 kmr_02_TransformFoliage = 0x802437D0; // type:func rom:0x8B3840
 func_802439A0_8B3A10 = 0x802439A0; // type:func rom:0x8B3A10
@@ -8375,7 +8375,7 @@ D_80257D48_8C7DB8 = 0x80257D48; // type:data rom:0x8C7DB8
 D_80257D50_8C7DC0 = 0x80257D50; // type:data rom:0x8C7DC0
 D_80257F08_8C7F78 = 0x80257F08; // type:data rom:0x8C7F78
 D_80257F10_8C7F80 = 0x80257F10; // type:data rom:0x8C7F80
-kmr_03_func_80240000_8C7F90 = 0x80240000; // type:func rom:0x8C7F90
+kmr_03_UnkFunc41 = 0x80240000; // type:func rom:0x8C7F90
 kmr_03_CheckPartnerFlags1000 = 0x80240184; // type:func rom:0x8C8114
 kmr_03_func_802401B0_8C8140 = 0x802401B0; // type:func rom:0x8C8140
 kmr_03_UnkPositionFunc = 0x80240218; // type:func rom:0x8C81A8
@@ -8418,15 +8418,15 @@ kmr_03_triggerCoord_802422A8 = 0x802422A8; // type:data rom:0x8CA238
 kmr_03_802422B8 = 0x802422B8; // type:data rom:0x8CA248
 kmr_03_80242340 = 0x80242340; // type:data rom:0x8CA2D0
 kmr_04_CheckPartnerFlags1000 = 0x80240000; // type:func rom:0x8CA900
-func_8024002C_8CA92C = 0x8024002C; // type:func rom:0x8CA92C
+kmr_04_func_8024002C_8CA92C = 0x8024002C; // type:func rom:0x8CA92C
 kmr_04_foliage_setup_shear_mtx = 0x80240060; // type:func rom:0x8CA960
 kmr_04_TransformFoliage = 0x802400D0; // type:func rom:0x8CA9D0
 dup_kmr_04_CheckPartnerFlags1000 = 0x8024029C; // type:func rom:0x8CAB9C
 func_802402C8_8CABC8 = 0x802402C8; // type:func rom:0x8CABC8
 kmr_04_GetItemName = 0x8024037C; // type:func rom:0x8CAC7C
 func_802403E0_8CACE0 = 0x802403E0; // type:func rom:0x8CACE0
-func_80240434_8CAD34 = 0x80240434; // type:func rom:0x8CAD34
-func_80240444_8CAD44 = 0x80240444; // type:func rom:0x8CAD44
+kmr_04_func_80240434_8CAD34 = 0x80240434; // type:func rom:0x8CAD34
+kmr_04_func_80240444_8CAD44 = 0x80240444; // type:func rom:0x8CAD44
 D_80241BF0_8CC4F0 = 0x80241BF0; // type:data rom:0x8CC4F0
 D_80242070_8CC970 = 0x80242070; // type:data rom:0x8CC970
 D_802429F4_8CD2F4 = 0x802429F4; // type:data rom:0x8CD2F4
@@ -8554,7 +8554,7 @@ kmr_12_MakeEntities = 0x80240A64; // type:data rom:0x8EBDC4
 func_80240000_8EBE20 = 0x80240000; // type:func rom:0x8EBE20
 kmr_20_SetPlayerStatusAnimFlags100000 = 0x80240030; // type:func rom:0x8EBE50
 kmr_20_GetCurrentFloor = 0x80240050; // type:func rom:0x8EBE70
-func_80240064_8EBE84 = 0x80240064; // type:func rom:0x8EBE84
+kmr_20_UnkFunc25 = 0x80240064; // type:func rom:0x8EBE84
 kmr_20_GetEntryPos = 0x80240120; // type:func rom:0x8EBF40
 kmr_20_GetCurrentCameraYawClamped180 = 0x80240200; // type:func rom:0x8EC020
 kmr_20_SomeXYZFunc2 = 0x8024026C; // type:func rom:0x8EC08C
@@ -8578,25 +8578,25 @@ dup2_kmr_20_foliage_setup_shear_mtx = 0x80241060; // type:func rom:0x8ECE80
 dup2_kmr_20_TransformFoliage = 0x802410D0; // type:func rom:0x8ECEF0
 kmr_20_Call800E9894 = 0x802412A0; // type:func rom:0x8ED0C0
 kmr_20_Call800E98C4SyncStatusMenu = 0x802412C0; // type:func rom:0x8ED0E0
-func_802412E8_8ED108 = 0x802412E8; // type:func rom:0x8ED108
-func_80241364_8ED184 = 0x80241364; // type:func rom:0x8ED184
+kmr_20_UnkFunc32 = 0x802412E8; // type:func rom:0x8ED108
+kmr_20_UnkFunc33 = 0x80241364; // type:func rom:0x8ED184
 kmr_20_AwaitScriptComplete = 0x802413E4; // type:func rom:0x8ED204
 kmr_20_PartnerSuspendAbilityScript = 0x80241414; // type:func rom:0x8ED234
 kmr_20_PartnerResumeAbilityScript = 0x80241440; // type:func rom:0x8ED260
-func_80241460_8ED280 = 0x80241460; // type:func rom:0x8ED280
-func_802414B4_8ED2D4 = 0x802414B4; // type:func rom:0x8ED2D4
+kmr_20_UnkFunc34 = 0x80241460; // type:func rom:0x8ED280
+kmr_20_UnkFunc35 = 0x802414B4; // type:func rom:0x8ED2D4
 kmr_20_GetPartnerCall800EB168 = 0x80241530; // type:func rom:0x8ED350
 kmr_20_Call800EB168 = 0x80241564; // type:func rom:0x8ED384
-func_80241594_8ED3B4 = 0x80241594; // type:func rom:0x8ED3B4
+kmr_20_UnkFunc36 = 0x80241594; // type:func rom:0x8ED3B4
 func_8024159C_8ED3BC = 0x8024159C; // type:func rom:0x8ED3BC
 func_802415C4_8ED3E4 = 0x802415C4; // type:func rom:0x8ED3E4
-func_802415EC_8ED40C = 0x802415EC; // type:func rom:0x8ED40C
+kmr_20_UnkFunc40 = 0x802415EC; // type:func rom:0x8ED40C
 func_80241620_8ED440 = 0x80241620; // type:func rom:0x8ED440
 kmr_20_GetItemName = 0x802416D4; // type:func rom:0x8ED4F4
 func_80241738_8ED558 = 0x80241738; // type:func rom:0x8ED558
 dup_kmr_20_SetPlayerStatusAnimFlags100000 = 0x80241780; // type:func rom:0x8ED5A0
 dup_kmr_20_GetCurrentFloor = 0x802417A0; // type:func rom:0x8ED5C0
-func_802417B4_8ED5D4 = 0x802417B4; // type:func rom:0x8ED5D4
+dup_kmr_20_UnkFunc25 = 0x802417B4; // type:func rom:0x8ED5D4
 dup_kmr_20_GetEntryPos = 0x80241870; // type:func rom:0x8ED690
 dup_kmr_20_GetCurrentCameraYawClamped180 = 0x80241950; // type:func rom:0x8ED770
 dup_kmr_20_SomeXYZFunc2 = 0x802419BC; // type:func rom:0x8ED7DC
@@ -8607,7 +8607,7 @@ func_80241CF0_8EDB10 = 0x80241CF0; // type:func rom:0x8EDB10
 func_80241D1C_8EDB3C = 0x80241D1C; // type:func rom:0x8EDB3C
 dup2_kmr_20_SetPlayerStatusAnimFlags100000 = 0x80241D50; // type:func rom:0x8EDB70
 dup2_kmr_20_GetCurrentFloor = 0x80241D70; // type:func rom:0x8EDB90
-func_80241D84_8EDBA4 = 0x80241D84; // type:func rom:0x8EDBA4
+dup2_kmr_20_UnkFunc25 = 0x80241D84; // type:func rom:0x8EDBA4
 dup2_kmr_20_GetEntryPos = 0x80241E40; // type:func rom:0x8EDC60
 dup2_kmr_20_GetCurrentCameraYawClamped180 = 0x80241F20; // type:func rom:0x8EDD40
 dup2_kmr_20_SomeXYZFunc2 = 0x80241F8C; // type:func rom:0x8EDDAC
@@ -8840,21 +8840,21 @@ iwa_10_SetOverrideFlags_40 = 0x802402F0; // type:func rom:0x91E860
 iwa_10_UnkFunc17 = 0x8024030C; // type:func rom:0x91E87C
 func_8024032C_91E89C = 0x8024032C; // type:func rom:0x91E89C
 iwa_10_UnkFunc18 = 0x80240358; // type:func rom:0x91E8C8
-func_802403C4_91E934 = 0x802403C4; // type:func rom:0x91E934
-func_80240410_91E980 = 0x80240410; // type:func rom:0x91E980
+iwa_10_UnkFunc37 = 0x802403C4; // type:func rom:0x91E934
+iwa_10_UnkFunc38 = 0x80240410; // type:func rom:0x91E980
 func_802404BC_91EA2C = 0x802404BC; // type:func rom:0x91EA2C
 func_8024070C_91EC7C = 0x8024070C; // type:func rom:0x91EC7C
 iwa_10_UnkFunc19 = 0x80240738; // type:func rom:0x91ECA8
 iwa_10_UnkFunc20 = 0x80240770; // type:func rom:0x91ECE0
-func_80240800_91ED70 = 0x80240800; // type:func rom:0x91ED70
+iwa_10_UnkFunc39 = 0x80240800; // type:func rom:0x91ED70
 iwa_10_UnkFunc21 = 0x80240834; // type:func rom:0x91EDA4
 iwa_10_UnkFunc22 = 0x80240898; // type:func rom:0x91EE08
 func_802408F0_91EE60 = 0x802408F0; // type:func rom:0x91EE60
 iwa_10_UnkFunc23 = 0x80240E28; // type:func rom:0x91F398
 iwa_10_UnkPartnerPosFunc = 0x80240F68; // type:func rom:0x91F4D8
 iwa_10_UnkPartnerPosFunc2 = 0x80240FB0; // type:func rom:0x91F520
-func_80240FF8_91F568 = 0x80240FF8; // type:func rom:0x91F568
-func_80241030_91F5A0 = 0x80241030; // type:func rom:0x91F5A0
+iwa_10_UnkFunc40 = 0x80240FF8; // type:func rom:0x91F568
+iwa_10_UnkFunc41 = 0x80241030; // type:func rom:0x91F5A0
 iwa_10_GetNpcCollisionHeight = 0x802411B4; // type:func rom:0x91F724
 iwa_10_AddPlayerHandsOffset = 0x80241210; // type:func rom:0x91F780
 func_802413E0_91F950 = 0x802413E0; // type:func rom:0x91F950
@@ -8908,8 +8908,8 @@ sbk_01_npcGroup_802403F8 = 0x802403F8; // type:data rom:0x929E88
 sbk_01_npcGroup_802405E8 = 0x802405E8; // type:data rom:0x92A078
 sbk_01_npcGroupList_802407D8 = 0x802407D8; // type:data rom:0x92A268
 func_80240000_92A2B0 = 0x80240000; // type:func rom:0x92A2B0
-func_80240040_92A2F0 = 0x80240040; // type:func rom:0x92A2F0
-func_80240164_92A414 = 0x80240164; // type:func rom:0x92A414
+sbk_02_UnkFunc27 = 0x80240040; // type:func rom:0x92A2F0
+sbk_02_UnkFunc26 = 0x80240164; // type:func rom:0x92A414
 func_80240338_92A5E8 = 0x80240338; // type:func rom:0x92A5E8
 func_80240364_92A614 = 0x80240364; // type:func rom:0x92A614
 sbk_02_GetNpcCollisionHeight = 0x802406F0; // type:func rom:0x92A9A0
@@ -8971,8 +8971,8 @@ sbk_26_SetNpcB5_3 = 0x80240140; // type:func rom:0x93DE10
 sbk_26_foliage_setup_shear_mtx = 0x80240160; // type:func rom:0x93DE30
 sbk_26_TransformFoliage = 0x802401D0; // type:func rom:0x93DEA0
 func_80240000_93F5B0 = 0x80240000; // type:func rom:0x93F5B0
-func_80240040_93F5F0 = 0x80240040; // type:func rom:0x93F5F0
-func_80240164_93F714 = 0x80240164; // type:func rom:0x93F714
+sbk_30_UnkFunc27 = 0x80240040; // type:func rom:0x93F5F0
+sbk_30_UnkFunc26 = 0x80240164; // type:func rom:0x93F714
 sbk_30_SpawnSunEffect = 0x80240338; // type:func rom:0x93F8E8
 func_80240370_93F920 = 0x80240370; // type:func rom:0x93F920
 func_80240424_93F9D4 = 0x80240424; // type:func rom:0x93F9D4
@@ -9068,20 +9068,20 @@ sbk_56_SetOverrideFlags_40 = 0x80240080; // type:func rom:0x954040
 sbk_56_UnkFunc17 = 0x8024009C; // type:func rom:0x95405C
 func_802400BC_95407C = 0x802400BC; // type:func rom:0x95407C
 sbk_56_UnkFunc18 = 0x802400E8; // type:func rom:0x9540A8
-func_80240154_954114 = 0x80240154; // type:func rom:0x954114
-func_802401A0_954160 = 0x802401A0; // type:func rom:0x954160
+sbk_56_UnkFunc37 = 0x80240154; // type:func rom:0x954114
+sbk_56_UnkFunc38 = 0x802401A0; // type:func rom:0x954160
 func_8024024C_95420C = 0x8024024C; // type:func rom:0x95420C
 func_8024049C_95445C = 0x8024049C; // type:func rom:0x95445C
 sbk_56_UnkFunc19 = 0x802404C8; // type:func rom:0x954488
 sbk_56_UnkFunc20 = 0x80240500; // type:func rom:0x9544C0
-func_80240590_954550 = 0x80240590; // type:func rom:0x954550
+sbk_56_UnkFunc39 = 0x80240590; // type:func rom:0x954550
 sbk_56_UnkFunc21 = 0x802405C4; // type:func rom:0x954584
 sbk_56_UnkFunc22 = 0x80240628; // type:func rom:0x9545E8
 func_80240680_954640 = 0x80240680; // type:func rom:0x954640
 sbk_56_UnkFunc23 = 0x80240BB8; // type:func rom:0x954B78
 sbk_56_UnkPartnerPosFunc = 0x80240CF8; // type:func rom:0x954CB8
 sbk_56_UnkPartnerPosFunc2 = 0x80240D40; // type:func rom:0x954D00
-func_80240D88_954D48 = 0x80240D88; // type:func rom:0x954D48
+sbk_56_UnkFunc40 = 0x80240D88; // type:func rom:0x954D48
 sbk_56_foliage_setup_shear_mtx = 0x80240DC0; // type:func rom:0x954D80
 sbk_56_TransformFoliage = 0x80240E30; // type:func rom:0x954DF0
 D_80241430_9553F0 = 0x80241430; // type:data rom:0x9553F0
@@ -9103,42 +9103,42 @@ sbk_66_foliage_setup_shear_mtx = 0x80240140; // type:func rom:0x958DF0
 sbk_66_TransformFoliage = 0x802401B0; // type:func rom:0x958E60
 dro_01_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x95B200
 dro_01_GetCurrentFloor = 0x80240020; // type:func rom:0x95B220
-func_80240034_95B234 = 0x80240034; // type:func rom:0x95B234
+dro_01_UnkFunc25 = 0x80240034; // type:func rom:0x95B234
 dro_01_GetEntryPos = 0x802400F0; // type:func rom:0x95B2F0
 dro_01_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x95B3D0
 dro_01_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x95B43C
-func_802402E0_95B4E0 = 0x802402E0; // type:func rom:0x95B4E0
-func_80240404_95B604 = 0x80240404; // type:func rom:0x95B604
-func_802405E0_95B7E0 = 0x802405E0; // type:func rom:0x95B7E0
+dro_01_UnkFunc27 = 0x802402E0; // type:func rom:0x95B4E0
+dro_01_UnkFunc26 = 0x80240404; // type:func rom:0x95B604
+dro_01_func_802405E0_95B7E0 = 0x802405E0; // type:func rom:0x95B7E0
 dro_01_UnkFunc13 = 0x80240738; // type:func rom:0x95B938
 dro_01_UnkNpcAIFunc1 = 0x802409E0; // type:func rom:0x95BBE0
 dro_01_UnkFunc14 = 0x80240AA0; // type:func rom:0x95BCA0
-func_80240C5C_95BE5C = 0x80240C5C; // type:func rom:0x95BE5C
+dro_01_func_80240C5C_95BE5C = 0x80240C5C; // type:func rom:0x95BE5C
 dro_01_NpcJumpFunc2 = 0x80240D10; // type:func rom:0x95BF10
 dro_01_NpcJumpFunc = 0x80240D84; // type:func rom:0x95BF84
 dro_01_UnkNpcAIFunc13 = 0x80240DFC; // type:func rom:0x95BFFC
 dro_01_UnkFunc15 = 0x80240F2C; // type:func rom:0x95C12C
 dro_01_UnkNpcDurationFlagFunc = 0x8024104C; // type:func rom:0x95C24C
 dro_01_UnkFunc16 = 0x802410B4; // type:func rom:0x95C2B4
-func_80241174_95C374 = 0x80241174; // type:func rom:0x95C374
-func_80241470_95C670 = 0x80241470; // type:func rom:0x95C670
+dro_01_func_80241174_95C374 = 0x80241174; // type:func rom:0x95C374
+dro_01_func_80241470_95C670 = 0x80241470; // type:func rom:0x95C670
 dro_01_GetItemName = 0x80241524; // type:func rom:0x95C724
 dro_01_Set80151310_1 = 0x80241588; // type:func rom:0x95C788
 dro_01_Set80151310_0 = 0x8024159C; // type:func rom:0x95C79C
-func_802415AC_95C7AC = 0x802415AC; // type:func rom:0x95C7AC
-func_802417D0_95C9D0 = 0x802417D0; // type:func rom:0x95C9D0
+dro_01_func_802415AC_95C7AC = 0x802415AC; // type:func rom:0x95C7AC
+dro_01_UnkFunc31 = 0x802417D0; // type:func rom:0x95C9D0
 dro_01_GetNpcUnsafeOwner2 = 0x8024181C; // type:func rom:0x95CA1C
-func_8024183C_95CA3C = 0x8024183C; // type:func rom:0x95CA3C
+dro_01_UnkFunc28 = 0x8024183C; // type:func rom:0x95CA3C
 dro_01_UnkAlphaFunc = 0x8024189C; // type:func rom:0x95CA9C
-func_802419E8_95CBE8 = 0x802419E8; // type:func rom:0x95CBE8
-func_80241B5C_95CD5C = 0x80241B5C; // type:func rom:0x95CD5C
-func_80241BE0_95CDE0 = 0x80241BE0; // type:func rom:0x95CDE0
-func_80241DF8_95CFF8 = 0x80241DF8; // type:func rom:0x95CFF8
-func_80241EAC_95D0AC = 0x80241EAC; // type:func rom:0x95D0AC
-func_80241EE0_95D0E0 = 0x80241EE0; // type:func rom:0x95D0E0
-func_80241F60_95D160 = 0x80241F60; // type:func rom:0x95D160
-func_80241F78_95D178 = 0x80241F78; // type:func rom:0x95D178
-func_80241F94_95D194 = 0x80241F94; // type:func rom:0x95D194
+dro_01_UnkFunc29 = 0x802419E8; // type:func rom:0x95CBE8
+dro_01_func_80241B5C_95CD5C = 0x80241B5C; // type:func rom:0x95CD5C
+dro_01_func_80241BE0_95CDE0 = 0x80241BE0; // type:func rom:0x95CDE0
+dro_01_func_80241DF8_95CFF8 = 0x80241DF8; // type:func rom:0x95CFF8
+dro_01_func_80241EAC_95D0AC = 0x80241EAC; // type:func rom:0x95D0AC
+dro_01_func_80241EE0_95D0E0 = 0x80241EE0; // type:func rom:0x95D0E0
+dro_01_func_80241F60_95D160 = 0x80241F60; // type:func rom:0x95D160
+dro_01_func_80241F78_95D178 = 0x80241F78; // type:func rom:0x95D178
+dro_01_func_80241F94_95D194 = 0x80241F94; // type:func rom:0x95D194
 dro_01_GetGameStatus75 = 0x80241FAC; // type:func rom:0x95D1AC
 dro_01_SetCamVfov = 0x80241FDC; // type:func rom:0x95D1DC
 dro_01_GetCamVfov = 0x80242050; // type:func rom:0x95D250
@@ -9146,64 +9146,199 @@ dro_01_UnkCameraFunc = 0x802420F0; // type:func rom:0x95D2F0
 dro_01_UnkRotatePlayer = 0x8024228C; // type:func rom:0x95D48C
 dro_01_UnkRotatePartner = 0x802422F0; // type:func rom:0x95D4F0
 dro_01_UnkMovePartner = 0x80242380; // type:func rom:0x95D580
-func_80242468_95D668 = 0x80242468; // type:func rom:0x95D668
-func_802424D4_95D6D4 = 0x802424D4; // type:func rom:0x95D6D4
+dro_01_func_80242468_95D668 = 0x80242468; // type:func rom:0x95D668
+dro_01_func_802424D4_95D6D4 = 0x802424D4; // type:func rom:0x95D6D4
 dro_01_GetNpcCollisionHeight = 0x80242504; // type:func rom:0x95D704
 dro_01_AddPlayerHandsOffset = 0x80242560; // type:func rom:0x95D760
-func_80242730_95D930 = 0x80242730; // type:func rom:0x95D930
-func_80242784_95D984 = 0x80242784; // type:func rom:0x95D984
-func_802427BC_95D9BC = 0x802427BC; // type:func rom:0x95D9BC
-func_80242858_95DA58 = 0x80242858; // type:func rom:0x95DA58
+dro_01_func_80242730_95D930 = 0x80242730; // type:func rom:0x95D930
+dro_01_func_80242784_95D984 = 0x80242784; // type:func rom:0x95D984
+dro_01_func_802427BC_95D9BC = 0x802427BC; // type:func rom:0x95D9BC
+dro_01_func_80242858_95DA58 = 0x80242858; // type:func rom:0x95DA58
 dro_01_SetManyVars = 0x80242D98; // type:func rom:0x95DF98
 dro_01_UnkYawFunc = 0x80242E88; // type:func rom:0x95E088
-func_80243014_95E214 = 0x80243014; // type:func rom:0x95E214
-func_80243058_95E258 = 0x80243058; // type:func rom:0x95E258
-func_80243084_95E284 = 0x80243084; // type:func rom:0x95E284
-func_8024309C_95E29C = 0x8024309C; // type:func rom:0x95E29C
-func_802430C8_95E2C8 = 0x802430C8; // type:func rom:0x95E2C8
-func_802431B4_95E3B4 = 0x802431B4; // type:func rom:0x95E3B4
-func_802431FC_95E3FC = 0x802431FC; // type:func rom:0x95E3FC
-func_80243350_95E550 = 0x80243350; // type:func rom:0x95E550
-func_80243460_95E660 = 0x80243460; // type:func rom:0x95E660
-dup_dro_01_GetItemName = 0x80243514; // type:func rom:0x95E714
-func_80243578_95E778 = 0x80243578; // type:func rom:0x95E778
-dup_dro_01_SetPlayerStatusAnimFlags100000 = 0x802435A0; // type:func rom:0x95E7A0
-dup_dro_01_GetCurrentFloor = 0x802435C0; // type:func rom:0x95E7C0
-func_802435D4_95E7D4 = 0x802435D4; // type:func rom:0x95E7D4
-dup_dro_01_GetEntryPos = 0x80243690; // type:func rom:0x95E890
-dup_dro_01_GetCurrentCameraYawClamped180 = 0x80243770; // type:func rom:0x95E970
-dup_dro_01_SomeXYZFunc2 = 0x802437DC; // type:func rom:0x95E9DC
+dro_01_func_80243014_95E214 = 0x80243014; // type:func rom:0x95E214
+dro_01_func_80243058_95E258 = 0x80243058; // type:func rom:0x95E258
+dro_01_func_80243084_95E284 = 0x80243084; // type:func rom:0x95E284
+dro_01_UnkFunc30 = 0x8024309C; // type:func rom:0x95E29C
+dro_01_func_802430C8_95E2C8 = 0x802430C8; // type:func rom:0x95E2C8
+dro_01_func_802431B4_95E3B4 = 0x802431B4; // type:func rom:0x95E3B4
+dro_01_func_802431FC_95E3FC = 0x802431FC; // type:func rom:0x95E3FC
+dro_01_func_80243350_95E550 = 0x80243350; // type:func rom:0x95E550
+dro_01_func_80243460_95E660 = 0x80243460; // type:func rom:0x95E660
+dro_01_dup_GetItemName = 0x80243514; // type:func rom:0x95E714
+dro_01_func_80243578_95E778 = 0x80243578; // type:func rom:0x95E778
+dro_01_dup_SetPlayerStatusAnimFlags100000 = 0x802435A0; // type:func rom:0x95E7A0
+dro_01_dup_GetCurrentFloor = 0x802435C0; // type:func rom:0x95E7C0
+dro_01_dup_UnkFunc25 = 0x802435D4; // type:func rom:0x95E7D4
+dro_01_dup_GetEntryPos = 0x80243690; // type:func rom:0x95E890
+dro_01_dup_GetCurrentCameraYawClamped180 = 0x80243770; // type:func rom:0x95E970
+dro_01_dup_SomeXYZFunc2 = 0x802437DC; // type:func rom:0x95E9DC
 dro_01_foliage_setup_shear_mtx = 0x80243880; // type:func rom:0x95EA80
 dro_01_TransformFoliage = 0x802438F0; // type:func rom:0x95EAF0
-D_802451B8_9603B8 = 0x802451B8; // type:data rom:0x9603B8
-D_8024521C_96041C = 0x8024521C; // type:data rom:0x96041C
-D_8024525C_96045C = 0x8024525C; // type:data rom:0x96045C
-D_802477E0_9629E0 = 0x802477E0; // type:data rom:0x9629E0
-D_802477E4_9629E4 = 0x802477E4; // type:data rom:0x9629E4
-D_80248504_963704 = 0x80248504; // type:data rom:0x963704
-D_8024B5B0_9667B0 = 0x8024B5B0; // type:data rom:0x9667B0
+dro_01_entryList = 0x80243AC0; // type:data rom:0x95ECC0
+dro_01_config = 0x80243B70; // type:data rom:0x95ED70
+dro_01_80243BB0 = 0x80243BB0; // type:data rom:0x95EDB0
+dro_01_80243C30 = 0x80243C30; // type:data rom:0x95EE30
+dro_01_80243F84 = 0x80243F84; // type:data rom:0x95F184
+dro_01_80244374 = 0x80244374; // type:data rom:0x95F574
+dro_01_80244450 = 0x80244450; // type:data rom:0x95F650
+dro_01_8024462C = 0x8024462C; // type:data rom:0x95F82C
+dro_01_exitWalk_80244960 = 0x80244960; // type:data rom:0x95FB60
+dro_01_exitWalk_802449CC = 0x802449CC; // type:data rom:0x95FBCC
+dro_01_80244A28 = 0x80244A28; // type:data rom:0x95FC28
+dro_01_80244A70 = 0x80244A70; // type:data rom:0x95FC70
+dro_01_enterWalk_80244C14 = 0x80244C14; // type:data rom:0x95FE14
+dro_01_main = 0x80244E58; // type:data rom:0x960058
+dro_01_pad_5004 = 0x80245004; // type:data rom:0x960204
+dro_01_npcAISettings_80245010 = 0x80245010; // type:data rom:0x960210
+dro_01_npcAI_80245040 = 0x80245040; // type:data rom:0x960240
+dro_01_npcSettings_80245060 = 0x80245060; // type:data rom:0x960260
+dro_01_npcAISettings_8024508C = 0x8024508C; // type:data rom:0x96028C
+dro_01_npcAI_802450BC = 0x802450BC; // type:data rom:0x9602BC
+dro_01_npcSettings_802450DC = 0x802450DC; // type:data rom:0x9602DC
+dro_01_npcSettings_80245108 = 0x80245108; // type:data rom:0x960308
+dro_01_npcSettings_80245134 = 0x80245134; // type:data rom:0x960334
+dro_01_npcSettings_80245160 = 0x80245160; // type:data rom:0x960360
+dro_01_npcSettings_8024518C = 0x8024518C; // type:data rom:0x96038C
+dro_01_D_802451B8_9603B8 = 0x802451B8; // type:data rom:0x9603B8
+dro_01_802451BC = 0x802451BC; // type:data rom:0x9603BC
+dro_01_802451EC = 0x802451EC; // type:data rom:0x9603EC
+dro_01_quizAnswers = 0x8024521C; // type:data rom:0x96041C
+dro_01_quizRequirements = 0x8024525C; // type:data rom:0x96045C
+dro_01_802452AC = 0x802452AC; // type:data rom:0x9604AC
+dro_01_8024535C = 0x8024535C; // type:data rom:0x96055C
+dro_01_802454F8 = 0x802454F8; // type:data rom:0x9606F8
+dro_01_802455F4 = 0x802455F4; // type:data rom:0x9607F4
+dro_01_80245630 = 0x80245630; // type:data rom:0x960830
+dro_01_802457E0 = 0x802457E0; // type:data rom:0x9609E0
+dro_01_80245918 = 0x80245918; // type:data rom:0x960B18
+dro_01_80245A84 = 0x80245A84; // type:data rom:0x960C84
+dro_01_80245AB8 = 0x80245AB8; // type:data rom:0x960CB8
+dro_01_80245AF8 = 0x80245AF8; // type:data rom:0x960CF8
+dro_01_80245B34 = 0x80245B34; // type:data rom:0x960D34
+dro_01_8024667C = 0x8024667C; // type:data rom:0x96187C
+dro_01_802466BC = 0x802466BC; // type:data rom:0x9618BC
+dro_01_80246798 = 0x80246798; // type:data rom:0x961998
+dro_01_80246848 = 0x80246848; // type:data rom:0x961A48
+dro_01_802468F8 = 0x802468F8; // type:data rom:0x961AF8
+dro_01_80247628 = 0x80247628; // type:data rom:0x962828
+dro_01_8024769C = 0x8024769C; // type:data rom:0x96289C
+dro_01_8024771C = 0x8024771C; // type:data rom:0x96291C
+dro_01_npcAISettings_80247738 = 0x80247738; // type:data rom:0x962938
+dro_01_80247768 = 0x80247768; // type:data rom:0x962968
+dro_01_npcSettings_80247788 = 0x80247788; // type:data rom:0x962988
+dro_01_npcSettings_802477B4 = 0x802477B4; // type:data rom:0x9629B4
+dro_01_D_802477E0_9629E0 = 0x802477E0; // type:data rom:0x9629E0
+dro_01_D_802477E4_9629E4 = 0x802477E4; // type:data rom:0x9629E4
+dro_01_802477E8 = 0x802477E8; // type:data rom:0x9629E8
+dro_01_8024792C = 0x8024792C; // type:data rom:0x962B2C
+dro_01_8024797C = 0x8024797C; // type:data rom:0x962B7C
+dro_01_802479FC = 0x802479FC; // type:data rom:0x962BFC
+dro_01_80247D20 = 0x80247D20; // type:data rom:0x962F20
+dro_01_80247D90 = 0x80247D90; // type:data rom:0x962F90
+dro_01_D_80248088_963288 = 0x80248088; // type:data rom:0x963288
+dro_01_80248090 = 0x80248090; // type:data rom:0x963290
+dro_01_interact_802480E0 = 0x802480E0; // type:data rom:0x9632E0
+dro_01_init_802481F8 = 0x802481F8; // type:data rom:0x9633F8
+dro_01_interact_8024821C = 0x8024821C; // type:data rom:0x96341C
+dro_01_init_802483A8 = 0x802483A8; // type:data rom:0x9635A8
+dro_01_interact_802483CC = 0x802483CC; // type:data rom:0x9635CC
+dro_01_init_802484E0 = 0x802484E0; // type:data rom:0x9636E0
+dro_01_80248504 = 0x80248504; // type:data rom:0x963704
+dro_01_D_8024884C_963A4C = 0x8024884C; // type:data rom:0x963A4C
+dro_01_interact_80248864 = 0x80248864; // type:data rom:0x963A64
+dro_01_init_80248AE4 = 0x80248AE4; // type:data rom:0x963CE4
+dro_01_interact_80248BA0 = 0x80248BA0; // type:data rom:0x963DA0
+dro_01_init_80248CC8 = 0x80248CC8; // type:data rom:0x963EC8
+dro_01_D_80248D4C_963F4C = 0x80248D4C; // type:data rom:0x963F4C
+dro_01_interact_80248D54 = 0x80248D54; // type:data rom:0x963F54
+dro_01_init_80249168 = 0x80249168; // type:data rom:0x964368
+dro_01_idle_8024918C = 0x8024918C; // type:data rom:0x96438C
+dro_01_interact_80249750 = 0x80249750; // type:data rom:0x964950
+dro_01_init_8024981C = 0x8024981C; // type:data rom:0x964A1C
+dro_01_interact_80249854 = 0x80249854; // type:data rom:0x964A54
+dro_01_init_802498C4 = 0x802498C4; // type:data rom:0x964AC4
+dro_01_interact_802498E8 = 0x802498E8; // type:data rom:0x964AE8
+dro_01_init_80249ABC = 0x80249ABC; // type:data rom:0x964CBC
+dro_01_interact_80249AE0 = 0x80249AE0; // type:data rom:0x964CE0
+dro_01_init_80249B10 = 0x80249B10; // type:data rom:0x964D10
+dro_01_npcGroup_80249B34 = 0x80249B34; // type:data rom:0x964D34
+dro_01_npcGroup_8024AE94 = 0x8024AE94; // type:data rom:0x966094
+dro_01_npcGroupList_8024B464 = 0x8024B464; // type:data rom:0x966664
+dro_01_npcGroupList_8024B47C = 0x8024B47C; // type:data rom:0x96667C
+dro_01_intTable_8024B4A0 = 0x8024B4A0; // type:data rom:0x9666A0
+dro_01_shopInventory_8024B4FC = 0x8024B4FC; // type:data rom:0x9666FC
+dro_01_shopPriceList_8024B550 = 0x8024B550; // type:data rom:0x966750
+dro_01_D_8024B5B0_9667B0 = 0x8024B5B0; // type:data rom:0x9667B0
+dro_01_8024B5B4 = 0x8024B5B4; // type:data rom:0x9667B4
+dro_01_8024B5E4 = 0x8024B5E4; // type:data rom:0x9667E4
+dro_01_8024B614 = 0x8024B614; // type:data rom:0x966814
+dro_01_8024B664 = 0x8024B664; // type:data rom:0x966864
+dro_01_8024B6B4 = 0x8024B6B4; // type:data rom:0x9668B4
+dro_01_8024B7B0 = 0x8024B7B0; // type:data rom:0x9669B0
+dro_01_8024B894 = 0x8024B894; // type:data rom:0x966A94
+dro_01_shopItemPositions_8024BA68 = 0x8024BA68; // type:data rom:0x966C68
+dro_01_shopOwnerNPC_8024BA80 = 0x8024BA80; // type:data rom:0x966C80
+dro_01_pad_BA9C = 0x8024BA9C; // type:data rom:0x966C9C
+dro_01_openDoor_8024BAA0 = 0x8024BAA0; // type:data rom:0x966CA0
+dro_01_moveWalls_8024BAD0 = 0x8024BAD0; // type:data rom:0x966CD0
+dro_01_dropDoor_8024BBB8 = 0x8024BBB8; // type:data rom:0x966DB8
+dro_01_openDoor_8024BC24 = 0x8024BC24; // type:data rom:0x966E24
+dro_01_moveWalls_8024BC54 = 0x8024BC54; // type:data rom:0x966E54
+dro_01_openDoor_8024BD9C = 0x8024BD9C; // type:data rom:0x966F9C
+dro_01_dropDoor_8024BDCC = 0x8024BDCC; // type:data rom:0x966FCC
+dro_01_moveWalls_8024BE38 = 0x8024BE38; // type:data rom:0x967038
+dro_01_toggleVis_8024BFDC = 0x8024BFDC; // type:data rom:0x9671DC
+dro_01_toggleVis_8024C040 = 0x8024C040; // type:data rom:0x967240
+dro_01_toggleVis_8024C190 = 0x8024C190; // type:data rom:0x967390
+dro_01_npcList_8024C200 = 0x8024C200; // type:data rom:0x967400
+dro_01_npcList_8024C208 = 0x8024C208; // type:data rom:0x967408
+dro_01_npcList_8024C210 = 0x8024C210; // type:data rom:0x967410
+dro_01_8024C218 = 0x8024C218; // type:data rom:0x967418
+dro_01_8024C2EC = 0x8024C2EC; // type:data rom:0x9674EC
+dro_01_8024C41C = 0x8024C41C; // type:data rom:0x96761C
+dro_01_8024C4C8 = 0x8024C4C8; // type:data rom:0x9676C8
+dro_01_pad_C574 = 0x8024C574; // type:data rom:0x967774
+dro_01_8024C580 = 0x8024C580; // type:data rom:0x967780
+dro_01_8024C8D4 = 0x8024C8D4; // type:data rom:0x967AD4
+dro_01_8024CCC4 = 0x8024CCC4; // type:data rom:0x967EC4
+dro_01_8024CDA0 = 0x8024CDA0; // type:data rom:0x967FA0
+dro_01_8024CF7C = 0x8024CF7C; // type:data rom:0x96817C
+dro_01_8024D2B0 = 0x8024D2B0; // type:data rom:0x9684B0
+dro_01_makeEntities = 0x8024D2F0; // type:data rom:0x9684F0
+dro_01_pad_D3BC = 0x8024D3BC; // type:data rom:0x9685BC
+dro_01_searchBush_8024D3C0 = 0x8024D3C0; // type:data rom:0x9685C0
+dro_01_shakeTree_8024D720 = 0x8024D720; // type:data rom:0x968920
+dro_01_treeModelList_Tree1_Leaves = 0x8024DD24; // type:data rom:0x968F24
+dro_01_treeModelList_Tree1_Trunk = 0x8024DD2C; // type:data rom:0x968F2C
+dro_01_treeDropList_Tree1 = 0x8024DD34; // type:data rom:0x968F34
+dro_01_shakeTreeEvent_Tree1 = 0x8024DD54; // type:data rom:0x968F54
+dro_01_triggerCoord_8024DD68 = 0x8024DD68; // type:data rom:0x968F68
+dro_01_8024DD78 = 0x8024DD78; // type:data rom:0x968F78
 D_8024DDE0_968FE0 = 0x8024DDE0; // type:data rom:0x968FE0
 D_8024DDE8_968FE8 = 0x8024DDE8; // type:data rom:0x968FE8
-func_80240000_9691C0 = 0x80240000; // type:func rom:0x9691C0
-func_80240124_9692E4 = 0x80240124; // type:func rom:0x9692E4
-func_80240300_9694C0 = 0x80240300; // type:func rom:0x9694C0
+dro_01_pad_XXX = 0x8024DFAC; // type:data rom:0x9691AC
+dro_01_dro_01_name_hack = 0x8024DFB0; // type:data rom:0x9691B0
+dro_02_UnkFunc27 = 0x80240000; // type:func rom:0x9691C0
+dro_02_UnkFunc26 = 0x80240124; // type:func rom:0x9692E4
+dro_02_func_80240300_9694C0 = 0x80240300; // type:func rom:0x9694C0
 dro_02_GetItemName = 0x802403B4; // type:func rom:0x969574
 dro_02_Set80151310_1 = 0x80240418; // type:func rom:0x9695D8
 dro_02_Set80151310_0 = 0x8024042C; // type:func rom:0x9695EC
-func_8024043C_9695FC = 0x8024043C; // type:func rom:0x9695FC
-func_80240660_969820 = 0x80240660; // type:func rom:0x969820
+dro_02_func_8024043C_9695FC = 0x8024043C; // type:func rom:0x9695FC
+dro_02_UnkFunc31 = 0x80240660; // type:func rom:0x969820
 dro_02_GetNpcUnsafeOwner2 = 0x802406AC; // type:func rom:0x96986C
-func_802406CC_96988C = 0x802406CC; // type:func rom:0x96988C
+dro_02_UnkFunc28 = 0x802406CC; // type:func rom:0x96988C
 dro_02_UnkAlphaFunc = 0x8024072C; // type:func rom:0x9698EC
-func_80240878_969A38 = 0x80240878; // type:func rom:0x969A38
-func_802409EC_969BAC = 0x802409EC; // type:func rom:0x969BAC
-func_80240A70_969C30 = 0x80240A70; // type:func rom:0x969C30
-func_80240C88_969E48 = 0x80240C88; // type:func rom:0x969E48
-func_80240D3C_969EFC = 0x80240D3C; // type:func rom:0x969EFC
-func_80240D70_969F30 = 0x80240D70; // type:func rom:0x969F30
-func_80240DF0_969FB0 = 0x80240DF0; // type:func rom:0x969FB0
-func_80240E08_969FC8 = 0x80240E08; // type:func rom:0x969FC8
-func_80240E24_969FE4 = 0x80240E24; // type:func rom:0x969FE4
+dro_02_UnkFunc29 = 0x80240878; // type:func rom:0x969A38
+dro_02_func_802409EC_969BAC = 0x802409EC; // type:func rom:0x969BAC
+dro_02_func_80240A70_969C30 = 0x80240A70; // type:func rom:0x969C30
+dro_02_func_80240C88_969E48 = 0x80240C88; // type:func rom:0x969E48
+dro_02_func_80240D3C_969EFC = 0x80240D3C; // type:func rom:0x969EFC
+dro_02_func_80240D70_969F30 = 0x80240D70; // type:func rom:0x969F30
+dro_02_func_80240DF0_969FB0 = 0x80240DF0; // type:func rom:0x969FB0
+dro_02_func_80240E08_969FC8 = 0x80240E08; // type:func rom:0x969FC8
+dro_02_func_80240E24_969FE4 = 0x80240E24; // type:func rom:0x969FE4
 dro_02_GetGameStatus75 = 0x80240E3C; // type:func rom:0x969FFC
 dro_02_SetCamVfov = 0x80240E6C; // type:func rom:0x96A02C
 dro_02_GetCamVfov = 0x80240EE0; // type:func rom:0x96A0A0
@@ -9211,52 +9346,189 @@ dro_02_UnkCameraFunc = 0x80240F80; // type:func rom:0x96A140
 dro_02_UnkRotatePlayer = 0x8024111C; // type:func rom:0x96A2DC
 dro_02_UnkRotatePartner = 0x80241180; // type:func rom:0x96A340
 dro_02_UnkMovePartner = 0x80241210; // type:func rom:0x96A3D0
-func_802412F8_96A4B8 = 0x802412F8; // type:func rom:0x96A4B8
-func_80241364_96A524 = 0x80241364; // type:func rom:0x96A524
-func_80241394_96A554 = 0x80241394; // type:func rom:0x96A554
-func_802414C0_96A680 = 0x802414C0; // type:func rom:0x96A680
-func_802415CC_96A78C = 0x802415CC; // type:func rom:0x96A78C
-func_802416FC_96A8BC = 0x802416FC; // type:func rom:0x96A8BC
-func_80241874_96AA34 = 0x80241874; // type:func rom:0x96AA34
+dro_02_func_802412F8_96A4B8 = 0x802412F8; // type:func rom:0x96A4B8
+dro_02_func_80241364_96A524 = 0x80241364; // type:func rom:0x96A524
+dro_02_func_80241394_96A554 = 0x80241394; // type:func rom:0x96A554
+dro_02_func_802414C0_96A680 = 0x802414C0; // type:func rom:0x96A680
+dro_02_func_802415CC_96A78C = 0x802415CC; // type:func rom:0x96A78C
+dro_02_func_802416FC_96A8BC = 0x802416FC; // type:func rom:0x96A8BC
+dro_02_func_80241874_96AA34 = 0x80241874; // type:func rom:0x96AA34
 func_8024190C_96AACC = 0x8024190C; // type:func rom:0x96AACC
-func_80242214_96B3D4 = 0x80242214; // type:func rom:0x96B3D4
+dro_02_func_80242214_96B3D4 = 0x80242214; // type:func rom:0x96B3D4
 func_8024240C_96B5CC = 0x8024240C; // type:func rom:0x96B5CC
-func_80242EAC_96C06C = 0x80242EAC; // type:func rom:0x96C06C
-func_8024303C_96C1FC = 0x8024303C; // type:func rom:0x96C1FC
-func_80243068_96C228 = 0x80243068; // type:func rom:0x96C228
+dro_02_func_80242EAC_96C06C = 0x80242EAC; // type:func rom:0x96C06C
+dro_02_func_8024303C_96C1FC = 0x8024303C; // type:func rom:0x96C1FC
+dro_02_func_80243068_96C228 = 0x80243068; // type:func rom:0x96C228
 dro_02_GetNpcCollisionHeight = 0x80243094; // type:func rom:0x96C254
 dro_02_AddPlayerHandsOffset = 0x802430F0; // type:func rom:0x96C2B0
-func_802432C0_96C480 = 0x802432C0; // type:func rom:0x96C480
-func_80243314_96C4D4 = 0x80243314; // type:func rom:0x96C4D4
-func_8024334C_96C50C = 0x8024334C; // type:func rom:0x96C50C
-func_802433E8_96C5A8 = 0x802433E8; // type:func rom:0x96C5A8
+dro_02_func_802432C0_96C480 = 0x802432C0; // type:func rom:0x96C480
+dro_02_func_80243314_96C4D4 = 0x80243314; // type:func rom:0x96C4D4
+dro_02_func_8024334C_96C50C = 0x8024334C; // type:func rom:0x96C50C
+dro_02_func_802433E8_96C5A8 = 0x802433E8; // type:func rom:0x96C5A8
 dro_02_Call800E9894 = 0x80243484; // type:func rom:0x96C644
 dro_02_Call800E98C4SyncStatusMenu = 0x802434A4; // type:func rom:0x96C664
-func_802434CC_96C68C = 0x802434CC; // type:func rom:0x96C68C
-func_80243548_96C708 = 0x80243548; // type:func rom:0x96C708
+dro_02_UnkFunc32 = 0x802434CC; // type:func rom:0x96C68C
+dro_02_UnkFunc33 = 0x80243548; // type:func rom:0x96C708
 dro_02_AwaitScriptComplete = 0x802435C8; // type:func rom:0x96C788
 dro_02_PartnerSuspendAbilityScript = 0x802435F8; // type:func rom:0x96C7B8
 dro_02_PartnerResumeAbilityScript = 0x80243624; // type:func rom:0x96C7E4
-func_80243644_96C804 = 0x80243644; // type:func rom:0x96C804
-func_80243698_96C858 = 0x80243698; // type:func rom:0x96C858
+dro_02_UnkFunc34 = 0x80243644; // type:func rom:0x96C804
+dro_02_UnkFunc35 = 0x80243698; // type:func rom:0x96C858
 dro_02_GetPartnerCall800EB168 = 0x80243714; // type:func rom:0x96C8D4
 dro_02_Call800EB168 = 0x80243748; // type:func rom:0x96C908
-func_80243778_96C938 = 0x80243778; // type:func rom:0x96C938
+dro_02_UnkFunc36 = 0x80243778; // type:func rom:0x96C938
 dro_02_SetManyVars = 0x80243780; // type:func rom:0x96C940
 dro_02_UnkYawFunc = 0x80243870; // type:func rom:0x96CA30
-func_802439FC_96CBBC = 0x802439FC; // type:func rom:0x96CBBC
-func_80243A40_96CC00 = 0x80243A40; // type:func rom:0x96CC00
-D_80244DE0_96DFA0 = 0x80244DE0; // type:data rom:0x96DFA0
-D_80244E44_96E004 = 0x80244E44; // type:data rom:0x96E004
-D_80244E84_96E044 = 0x80244E84; // type:data rom:0x96E044
-D_802475DC_97079C = 0x802475DC; // type:data rom:0x97079C
-D_802475E0_9707A0 = 0x802475E0; // type:data rom:0x9707A0
-D_802478C8_970A88 = 0x802478C8; // type:data rom:0x970A88
-D_802479B8_970B78 = 0x802479B8; // type:data rom:0x970B78
-D_80247A38_970BF8 = 0x80247A38; // type:data rom:0x970BF8
-D_80248780_971940 = 0x80248780; // type:data rom:0x971940
-D_80248784_971944 = 0x80248784; // type:data rom:0x971944
+dro_02_func_802439FC_96CBBC = 0x802439FC; // type:func rom:0x96CBBC
+dro_02_func_80243A40_96CC00 = 0x80243A40; // type:func rom:0x96CC00
+dro_02_entryList = 0x80243A70; // type:data rom:0x96CC30
+dro_02_config = 0x80243AB0; // type:data rom:0x96CC70
+dro_02_80243AF0 = 0x80243AF0; // type:data rom:0x96CCB0
+dro_02_80243B70 = 0x80243B70; // type:data rom:0x96CD30
+dro_02_80243B9C = 0x80243B9C; // type:data rom:0x96CD5C
+dro_02_makeEntities = 0x80243BD0; // type:data rom:0x96CD90
+dro_02_exitWalk_80243C40 = 0x80243C40; // type:data rom:0x96CE00
+dro_02_80243C9C = 0x80243C9C; // type:data rom:0x96CE5C
+dro_02_80243CC8 = 0x80243CC8; // type:data rom:0x96CE88
+dro_02_80243D10 = 0x80243D10; // type:data rom:0x96CED0
+dro_02_main = 0x80243EE0; // type:data rom:0x96D0A0
+dro_02_802441C0 = 0x802441C0; // type:data rom:0x96D380
+dro_02_802442F0 = 0x802442F0; // type:data rom:0x96D4B0
+dro_02_openDoor_80244340 = 0x80244340; // type:data rom:0x96D500
+dro_02_moveWalls_80244390 = 0x80244390; // type:data rom:0x96D550
+dro_02_dropDoor_80244474 = 0x80244474; // type:data rom:0x96D634
+dro_02_openDoor_8024451C = 0x8024451C; // type:data rom:0x96D6DC
+dro_02_moveWalls_8024454C = 0x8024454C; // type:data rom:0x96D70C
+dro_02_8024459C = 0x8024459C; // type:data rom:0x96D75C
+dro_02_toggleVis_80244600 = 0x80244600; // type:data rom:0x96D7C0
+dro_02_toggleVis_8024468C = 0x8024468C; // type:data rom:0x96D84C
+dro_02_8024486C = 0x8024486C; // type:data rom:0x96DA2C
+dro_02_80244A68 = 0x80244A68; // type:data rom:0x96DC28
+dro_02_npcList_80244C64 = 0x80244C64; // type:data rom:0x96DE24
+dro_02_npcList_80244C70 = 0x80244C70; // type:data rom:0x96DE30
+dro_02_80244C78 = 0x80244C78; // type:data rom:0x96DE38
+dro_02_D_80244DE0_96DFA0 = 0x80244DE0; // type:data rom:0x96DFA0
+dro_02_80244DE4 = 0x80244DE4; // type:data rom:0x96DFA4
+dro_02_80244E14 = 0x80244E14; // type:data rom:0x96DFD4
+dro_02_quizAnswers = 0x80244E44; // type:data rom:0x96E004
+dro_02_quizRequirements = 0x80244E84; // type:data rom:0x96E044
+dro_02_80244ED4 = 0x80244ED4; // type:data rom:0x96E094
+dro_02_80244F84 = 0x80244F84; // type:data rom:0x96E144
+dro_02_80245120 = 0x80245120; // type:data rom:0x96E2E0
+dro_02_8024521C = 0x8024521C; // type:data rom:0x96E3DC
+dro_02_80245258 = 0x80245258; // type:data rom:0x96E418
+dro_02_80245408 = 0x80245408; // type:data rom:0x96E5C8
+dro_02_80245540 = 0x80245540; // type:data rom:0x96E700
+dro_02_802456AC = 0x802456AC; // type:data rom:0x96E86C
+dro_02_802456E0 = 0x802456E0; // type:data rom:0x96E8A0
+dro_02_80245720 = 0x80245720; // type:data rom:0x96E8E0
+dro_02_8024575C = 0x8024575C; // type:data rom:0x96E91C
+dro_02_802462A4 = 0x802462A4; // type:data rom:0x96F464
+dro_02_802462E4 = 0x802462E4; // type:data rom:0x96F4A4
+dro_02_802463C0 = 0x802463C0; // type:data rom:0x96F580
+dro_02_80246470 = 0x80246470; // type:data rom:0x96F630
+dro_02_80246520 = 0x80246520; // type:data rom:0x96F6E0
+dro_02_80247250 = 0x80247250; // type:data rom:0x970410
+dro_02_802472C4 = 0x802472C4; // type:data rom:0x970484
+dro_02_80247344 = 0x80247344; // type:data rom:0x970504
+dro_02_npcAISettings_80247360 = 0x80247360; // type:data rom:0x970520
+dro_02_80247390 = 0x80247390; // type:data rom:0x970550
+dro_02_npcSettings_802473B0 = 0x802473B0; // type:data rom:0x970570
+dro_02_npcSettings_802473DC = 0x802473DC; // type:data rom:0x97059C
+dro_02_npcAISettings_80247408 = 0x80247408; // type:data rom:0x9705C8
+dro_02_npcAI_80247438 = 0x80247438; // type:data rom:0x9705F8
+dro_02_npcSettings_80247458 = 0x80247458; // type:data rom:0x970618
+dro_02_npcSettings_80247484 = 0x80247484; // type:data rom:0x970644
+dro_02_npcAISettings_802474B0 = 0x802474B0; // type:data rom:0x970670
+dro_02_npcAI_802474E0 = 0x802474E0; // type:data rom:0x9706A0
+dro_02_npcSettings_80247500 = 0x80247500; // type:data rom:0x9706C0
+dro_02_npcSettings_8024752C = 0x8024752C; // type:data rom:0x9706EC
+dro_02_npcSettings_80247558 = 0x80247558; // type:data rom:0x970718
+dro_02_npcSettings_80247584 = 0x80247584; // type:data rom:0x970744
+dro_02_npcSettings_802475B0 = 0x802475B0; // type:data rom:0x970770
+dro_02_D_802475DC_97079C = 0x802475DC; // type:data rom:0x97079C
+dro_02_D_802475E0_9707A0 = 0x802475E0; // type:data rom:0x9707A0
+dro_02_pad_XX111 = 0x802475E4; // type:data rom:0x9707A4
+dro_02_image1 = 0x802475E8; // type:data rom:0x9707A8
+dro_02_image1_pal = 0x802477E8; // type:data rom:0x9709A8
+dro_02_D_80247808_9709C8 = 0x80247808; // type:data rom:0x9709C8
+dro_02_D_80247888_970A48 = 0x80247888; // type:data rom:0x970A48
+dro_02_D_802478C8_970A88 = 0x802478C8; // type:data rom:0x970A88
+dro_02_D_802479B8_970B78 = 0x802479B8; // type:data rom:0x970B78
+dro_02_D_80247A38_970BF8 = 0x80247A38; // type:data rom:0x970BF8
+dro_02_init_80247A80 = 0x80247A80; // type:data rom:0x970C40
+dro_02_npcAI_80247A90 = 0x80247A90; // type:data rom:0x970C50
+dro_02_80247AA0 = 0x80247AA0; // type:data rom:0x970C60
+dro_02_802481D8 = 0x802481D8; // type:data rom:0x971398
+dro_02_802482A8 = 0x802482A8; // type:data rom:0x971468
+dro_02_802482F8 = 0x802482F8; // type:data rom:0x9714B8
+dro_02_npcSettings_80248754 = 0x80248754; // type:data rom:0x971914
+dro_02_D_80248780_971940 = 0x80248780; // type:data rom:0x971940
+dro_02_D_80248784_971944 = 0x80248784; // type:data rom:0x971944
+dro_02_80248788 = 0x80248788; // type:data rom:0x971948
+dro_02_802488CC = 0x802488CC; // type:data rom:0x971A8C
+dro_02_8024891C = 0x8024891C; // type:data rom:0x971ADC
+dro_02_80248A50 = 0x80248A50; // type:data rom:0x971C10
+dro_02_D_80248AA0_971C60 = 0x80248AA0; // type:data rom:0x971C60
+dro_02_D_80248ACC_971C8C = 0x80248ACC; // type:data rom:0x971C8C
+dro_02_D_80248AF8_971CB8 = 0x80248AF8; // type:data rom:0x971CB8
+dro_02_D_80248B24_971CE4 = 0x80248B24; // type:data rom:0x971CE4
+dro_02_D_80248B50_971D10 = 0x80248B50; // type:data rom:0x971D10
+dro_02_D_80248B7C_971D3C = 0x80248B7C; // type:data rom:0x971D3C
+dro_02_D_80248BA8_971D68 = 0x80248BA8; // type:data rom:0x971D68
+dro_02_D_80248BD4_971D94 = 0x80248BD4; // type:data rom:0x971D94
+dro_02_D_80248C00_971DC0 = 0x80248C00; // type:data rom:0x971DC0
+dro_02_D_80248C2C_971DEC = 0x80248C2C; // type:data rom:0x971DEC
+dro_02_D_80248C58_971E18 = 0x80248C58; // type:data rom:0x971E18
+dro_02_D_80248C84_971E44 = 0x80248C84; // type:data rom:0x971E44
+dro_02_D_80248CB0_971E70 = 0x80248CB0; // type:data rom:0x971E70
+dro_02_D_80248CDC_971E9C = 0x80248CDC; // type:data rom:0x971E9C
+dro_02_D_80248D08_971EC8 = 0x80248D08; // type:data rom:0x971EC8
+dro_02_D_80248D34_971EF4 = 0x80248D34; // type:data rom:0x971EF4
+dro_02_D_80248D60_971F20 = 0x80248D60; // type:data rom:0x971F20
+dro_02_D_80248DD8_971F98 = 0x80248DD8; // type:data rom:0x971F98
+dro_02_D_802490F8_9722B8 = 0x802490F8; // type:data rom:0x9722B8
+dro_02_D_8024A3B8_973578 = 0x8024A3B8; // type:data rom:0x973578
+dro_02_image2 = 0x8024A520; // type:data rom:0x9736E0
+dro_02_8024AC14 = 0x8024AC14; // type:data rom:0x973DD4
+dro_02_8024AC8C = 0x8024AC8C; // type:data rom:0x973E4C
+dro_02_interact_8024ADE4 = 0x8024ADE4; // type:data rom:0x973FA4
+dro_02_8024B18C = 0x8024B18C; // type:data rom:0x97434C
+dro_02_8024B20C = 0x8024B20C; // type:data rom:0x9743CC
+dro_02_8024B530 = 0x8024B530; // type:data rom:0x9746F0
+dro_02_8024B5A0 = 0x8024B5A0; // type:data rom:0x974760
+dro_02_D_8024B898_974A58 = 0x8024B898; // type:data rom:0x974A58
+dro_02_8024B8A0 = 0x8024B8A0; // type:data rom:0x974A60
+dro_02_interact_8024B8F0 = 0x8024B8F0; // type:data rom:0x974AB0
+dro_02_init_8024BA50 = 0x8024BA50; // type:data rom:0x974C10
+dro_02_interact_8024BA9C = 0x8024BA9C; // type:data rom:0x974C5C
+dro_02_init_8024BBAC = 0x8024BBAC; // type:data rom:0x974D6C
+dro_02_interact_8024BBD0 = 0x8024BBD0; // type:data rom:0x974D90
+dro_02_init_8024BCD4 = 0x8024BCD4; // type:data rom:0x974E94
+dro_02_interact_8024BCF8 = 0x8024BCF8; // type:data rom:0x974EB8
+dro_02_init_8024BD28 = 0x8024BD28; // type:data rom:0x974EE8
+dro_02_interact_8024BD4C = 0x8024BD4C; // type:data rom:0x974F0C
+dro_02_init_8024BF10 = 0x8024BF10; // type:data rom:0x9750D0
+dro_02_interact_8024BF34 = 0x8024BF34; // type:data rom:0x9750F4
+dro_02_init_8024C038 = 0x8024C038; // type:data rom:0x9751F8
+dro_02_8024C05C = 0x8024C05C; // type:data rom:0x97521C
+dro_02_8024C0B8 = 0x8024C0B8; // type:data rom:0x975278
+dro_02_8024C1F8 = 0x8024C1F8; // type:data rom:0x9753B8
+dro_02_8024C248 = 0x8024C248; // type:data rom:0x975408
+dro_02_idle_8024C450 = 0x8024C450; // type:data rom:0x975610
+dro_02_interact_8024C4EC = 0x8024C4EC; // type:data rom:0x9756AC
+dro_02_init_8024D04C = 0x8024D04C; // type:data rom:0x97620C
+dro_02_init_8024D130 = 0x8024D130; // type:data rom:0x9762F0
+dro_02_idle_8024D154 = 0x8024D154; // type:data rom:0x976314
+dro_02_init_8024D3E8 = 0x8024D3E8; // type:data rom:0x9765A8
+dro_02_8024D434 = 0x8024D434; // type:data rom:0x9765F4
+dro_02_8024D494 = 0x8024D494; // type:data rom:0x976654
+dro_02_8024D700 = 0x8024D700; // type:data rom:0x9768C0
+dro_02_init_8024D790 = 0x8024D790; // type:data rom:0x976950
+dro_02_npcGroup_8024D7B4 = 0x8024D7B4; // type:data rom:0x976974
+dro_02_npcGroupList_8024EEF4 = 0x8024EEF4; // type:data rom:0x9780B4
 D_8024EF58_978118 = 0x8024EF58; // type:data rom:0x978118
+D_8024EF60_978120 = 0x8024EF60; // type:data rom:0x978120
 D_8024EF68_978128 = 0x8024EF68; // type:data rom:0x978128
 D_8024EF70_978130 = 0x8024EF70; // type:data rom:0x978130
 D_8024EF78_978138 = 0x8024EF78; // type:data rom:0x978138
@@ -9327,13 +9599,13 @@ isk_10_SetOverrideFlags_40 = 0x80240000; // type:func rom:0x988B60
 isk_10_UnkFunc17 = 0x8024001C; // type:func rom:0x988B7C
 func_8024003C_988B9C = 0x8024003C; // type:func rom:0x988B9C
 isk_10_UnkFunc18 = 0x80240068; // type:func rom:0x988BC8
-func_802400D4_988C34 = 0x802400D4; // type:func rom:0x988C34
-func_80240120_988C80 = 0x80240120; // type:func rom:0x988C80
+isk_10_UnkFunc37 = 0x802400D4; // type:func rom:0x988C34
+isk_10_UnkFunc38 = 0x80240120; // type:func rom:0x988C80
 func_802401CC_988D2C = 0x802401CC; // type:func rom:0x988D2C
 func_8024041C_988F7C = 0x8024041C; // type:func rom:0x988F7C
 isk_10_UnkFunc19 = 0x80240448; // type:func rom:0x988FA8
 isk_10_UnkFunc20 = 0x80240480; // type:func rom:0x988FE0
-func_80240510_989070 = 0x80240510; // type:func rom:0x989070
+isk_10_UnkFunc39 = 0x80240510; // type:func rom:0x989070
 isk_10_UnkFunc21 = 0x80240544; // type:func rom:0x9890A4
 isk_10_UnkFunc22 = 0x802405A8; // type:func rom:0x989108
 func_80240600_989160 = 0x80240600; // type:func rom:0x989160
@@ -9401,8 +9673,8 @@ func_802401AC_99539C = 0x802401AC; // type:func rom:0x99539C
 func_802405BC_9957AC = 0x802405BC; // type:func rom:0x9957AC
 func_802405FC_9957EC = 0x802405FC; // type:func rom:0x9957EC
 func_80240708_9958F8 = 0x80240708; // type:func rom:0x9958F8
-func_80240800_9959F0 = 0x80240800; // type:func rom:0x9959F0
-func_80240924_995B14 = 0x80240924; // type:func rom:0x995B14
+isk_16_UnkFunc27 = 0x80240800; // type:func rom:0x9959F0
+isk_16_UnkFunc26 = 0x80240924; // type:func rom:0x995B14
 isk_18_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x997F70
 func_8024007C_997FEC = 0x8024007C; // type:func rom:0x997FEC
 isk_18_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x998120
@@ -9542,7 +9814,7 @@ func_8024093C_9B20CC = 0x8024093C; // type:func rom:0x9B20CC
 func_80240A5C_9B21EC = 0x80240A5C; // type:func rom:0x9B21EC
 func_80240A70_9B2200 = 0x80240A70; // type:func rom:0x9B2200
 func_80240AD0_9B2260 = 0x80240AD0; // type:func rom:0x9B2260
-func_80240AF0_9B2280 = 0x80240AF0; // type:func rom:0x9B2280
+trd_06_UnkFunc41 = 0x80240AF0; // type:func rom:0x9B2280
 func_80240C80_9B2410 = 0x80240C80; // type:func rom:0x9B2410
 D_802451C0_9B6950 = 0x802451C0; // type:data rom:0x9B6950
 D_802451C8_9B6958 = 0x802451C8; // type:data rom:0x9B6958
@@ -9607,26 +9879,26 @@ func_802405EC_9C59CC = 0x802405EC; // type:func rom:0x9C59CC
 func_802407F4_9C5BD4 = 0x802407F4; // type:func rom:0x9C5BD4
 nok_01_Call800E9894 = 0x80240A6C; // type:func rom:0x9C5E4C
 nok_01_Call800E98C4SyncStatusMenu = 0x80240A8C; // type:func rom:0x9C5E6C
-func_80240AB4_9C5E94 = 0x80240AB4; // type:func rom:0x9C5E94
-func_80240B30_9C5F10 = 0x80240B30; // type:func rom:0x9C5F10
+nok_01_UnkFunc32 = 0x80240AB4; // type:func rom:0x9C5E94
+nok_01_UnkFunc33 = 0x80240B30; // type:func rom:0x9C5F10
 nok_01_AwaitScriptComplete = 0x80240BB0; // type:func rom:0x9C5F90
 nok_01_PartnerSuspendAbilityScript = 0x80240BE0; // type:func rom:0x9C5FC0
 nok_01_PartnerResumeAbilityScript = 0x80240C0C; // type:func rom:0x9C5FEC
-func_80240C2C_9C600C = 0x80240C2C; // type:func rom:0x9C600C
-func_80240C80_9C6060 = 0x80240C80; // type:func rom:0x9C6060
+nok_01_UnkFunc34 = 0x80240C2C; // type:func rom:0x9C600C
+nok_01_UnkFunc35 = 0x80240C80; // type:func rom:0x9C6060
 nok_01_GetPartnerCall800EB168 = 0x80240CFC; // type:func rom:0x9C60DC
 nok_01_Call800EB168 = 0x80240D30; // type:func rom:0x9C6110
-func_80240D60_9C6140 = 0x80240D60; // type:func rom:0x9C6140
+nok_01_UnkFunc36 = 0x80240D60; // type:func rom:0x9C6140
 func_80240D68_9C6148 = 0x80240D68; // type:func rom:0x9C6148
 nok_01_GetItemName = 0x80240E1C; // type:func rom:0x9C61FC
 nok_01_Set80151310_1 = 0x80240E80; // type:func rom:0x9C6260
 nok_01_Set80151310_0 = 0x80240E94; // type:func rom:0x9C6274
 func_80240EA4_9C6284 = 0x80240EA4; // type:func rom:0x9C6284
-func_802410C8_9C64A8 = 0x802410C8; // type:func rom:0x9C64A8
+nok_01_UnkFunc31 = 0x802410C8; // type:func rom:0x9C64A8
 nok_01_GetNpcUnsafeOwner2 = 0x80241114; // type:func rom:0x9C64F4
-func_80241134_9C6514 = 0x80241134; // type:func rom:0x9C6514
+nok_01_UnkFunc28 = 0x80241134; // type:func rom:0x9C6514
 nok_01_UnkAlphaFunc = 0x80241194; // type:func rom:0x9C6574
-func_802412E0_9C66C0 = 0x802412E0; // type:func rom:0x9C66C0
+nok_01_UnkFunc29 = 0x802412E0; // type:func rom:0x9C66C0
 func_80241454_9C6834 = 0x80241454; // type:func rom:0x9C6834
 func_802414D8_9C68B8 = 0x802414D8; // type:func rom:0x9C68B8
 func_802416F0_9C6AD0 = 0x802416F0; // type:func rom:0x9C6AD0
@@ -9678,7 +9950,7 @@ D_80251A98_9D6E78 = 0x80251A98; // type:data rom:0x9D6E78
 D_80251AA0_9D6E80 = 0x80251AA0; // type:data rom:0x9D6E80
 nok_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x9D7020
 nok_02_GetCurrentFloor = 0x80240020; // type:func rom:0x9D7040
-func_80240034_9D7054 = 0x80240034; // type:func rom:0x9D7054
+nok_02_UnkFunc25 = 0x80240034; // type:func rom:0x9D7054
 nok_02_GetEntryPos = 0x802400F0; // type:func rom:0x9D7110
 nok_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x9D71F0
 nok_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x9D725C
@@ -9708,11 +9980,11 @@ nok_02_GetItemName = 0x802419C4; // type:func rom:0x9D89E4
 nok_02_Set80151310_1 = 0x80241A28; // type:func rom:0x9D8A48
 nok_02_Set80151310_0 = 0x80241A3C; // type:func rom:0x9D8A5C
 func_80241A4C_9D8A6C = 0x80241A4C; // type:func rom:0x9D8A6C
-func_80241C70_9D8C90 = 0x80241C70; // type:func rom:0x9D8C90
+nok_02_UnkFunc31 = 0x80241C70; // type:func rom:0x9D8C90
 nok_02_GetNpcUnsafeOwner2 = 0x80241CBC; // type:func rom:0x9D8CDC
-func_80241CDC_9D8CFC = 0x80241CDC; // type:func rom:0x9D8CFC
+nok_02_UnkFunc28 = 0x80241CDC; // type:func rom:0x9D8CFC
 nok_02_UnkAlphaFunc = 0x80241D3C; // type:func rom:0x9D8D5C
-func_80241E88_9D8EA8 = 0x80241E88; // type:func rom:0x9D8EA8
+nok_02_UnkFunc29 = 0x80241E88; // type:func rom:0x9D8EA8
 func_80241FFC_9D901C = 0x80241FFC; // type:func rom:0x9D901C
 func_80242080_9D90A0 = 0x80242080; // type:func rom:0x9D90A0
 func_80242298_9D92B8 = 0x80242298; // type:func rom:0x9D92B8
@@ -9791,7 +10063,7 @@ func_802408AC_9EC09C = 0x802408AC; // type:func rom:0x9EC09C
 nok_03_UnkDurationCheck = 0x80240BAC; // type:func rom:0x9EC39C
 func_80240BF0_9EC3E0 = 0x80240BF0; // type:func rom:0x9EC3E0
 D_802423B0_9EDBA0 = 0x802423B0; // type:data rom:0x9EDBA0
-func_80240000_9EDBF0 = 0x80240000; // type:func rom:0x9EDBF0
+nok_04_UnkFunc41 = 0x80240000; // type:func rom:0x9EDBF0
 nok_04_UnkFloatFunc = 0x80240184; // type:func rom:0x9EDD74
 func_80240314_9EDF04 = 0x80240314; // type:func rom:0x9EDF04
 func_802403C0_9EDFB0 = 0x802403C0; // type:func rom:0x9EDFB0
@@ -9919,7 +10191,7 @@ D_80244628_A06E68 = 0x80244628; // type:data rom:0xA06E68
 D_80244630_A06E70 = 0x80244630; // type:data rom:0xA06E70
 nok_15_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xA06F00
 nok_15_GetCurrentFloor = 0x80240020; // type:func rom:0xA06F20
-func_80240034_A06F34 = 0x80240034; // type:func rom:0xA06F34
+nok_15_UnkFunc25 = 0x80240034; // type:func rom:0xA06F34
 nok_15_GetEntryPos = 0x802400F0; // type:func rom:0xA06FF0
 nok_15_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xA070D0
 nok_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xA0713C
@@ -9977,7 +10249,7 @@ func_80240000_A10880 = 0x80240000; // type:func rom:0xA10880
 func_80240120_A109A0 = 0x80240120; // type:func rom:0xA109A0
 func_8024031C_A10B9C = 0x8024031C; // type:func rom:0xA10B9C
 func_80240534_A10DB4 = 0x80240534; // type:func rom:0xA10DB4
-func_80240768_A10FE8 = 0x80240768; // type:func rom:0xA10FE8
+hos_01_UnkFunc30 = 0x80240768; // type:func rom:0xA10FE8
 hos_01_UnkTexturePanFunc = 0x802407A0; // type:func rom:0xA11020
 hos_01_UnkTexturePanFunc2 = 0x802408C4; // type:func rom:0xA11144
 func_80240AAC_A1132C = 0x80240AAC; // type:func rom:0xA1132C
@@ -9990,7 +10262,7 @@ func_80240C84_A11504 = 0x80240C84; // type:func rom:0xA11504
 func_80240CB0_A11530 = 0x80240CB0; // type:func rom:0xA11530
 func_80240CDC_A1155C = 0x80240CDC; // type:func rom:0xA1155C
 hos_01_UnsetCamera0MoveFlag1 = 0x80240DD0; // type:func rom:0xA11650
-func_80240DEC_A1166C = 0x80240DEC; // type:func rom:0xA1166C
+hos_01_dup_UnkFunc30 = 0x80240DEC; // type:func rom:0xA1166C
 D_80241C2C_A124AC = 0x80241C2C; // type:data rom:0xA124AC
 D_80241C2F_A124AF = 0x80241C2F; // type:data rom:0xA124AF
 D_80241C30_A124B0 = 0x80241C30; // type:data rom:0xA124B0
@@ -10021,7 +10293,7 @@ hos_02_UnkFunc5 = 0x802421D8; // type:func rom:0xA183F8
 func_802422FC_A1851C = 0x802422FC; // type:func rom:0xA1851C
 hos_02_UnkNpcAIFunc13 = 0x802424E8; // type:func rom:0xA18708
 func_80242618_A18838 = 0x80242618; // type:func rom:0xA18838
-func_80242898_A18AB8 = 0x80242898; // type:func rom:0xA18AB8
+hos_02_UnkFunc45 = 0x80242898; // type:func rom:0xA18AB8
 func_802428F4_A18B14 = 0x802428F4; // type:func rom:0xA18B14
 D_802433AC_A195CC = 0x802433AC; // type:data rom:0xA195CC
 D_802433AE_A195CE = 0x802433AE; // type:data rom:0xA195CE
@@ -10041,7 +10313,7 @@ D_80244E20_A1B040 = 0x80244E20; // type:data rom:0xA1B040
 D_80244E28_A1B048 = 0x80244E28; // type:data rom:0xA1B048
 D_80244E30_A1B050 = 0x80244E30; // type:data rom:0xA1B050
 D_80244E78_A1B098 = 0x80244E78; // type:data rom:0xA1B098
-func_80240000_A1B100 = 0x80240000; // type:func rom:0xA1B100
+hos_03_UnkFunc30 = 0x80240000; // type:func rom:0xA1B100
 hos_03_UnkTexturePanFunc = 0x80240030; // type:func rom:0xA1B130
 hos_03_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0xA1B254
 func_8024033C_A1B43C = 0x8024033C; // type:func rom:0xA1B43C
@@ -10064,26 +10336,26 @@ hos_03_UnkFunc5 = 0x80241E98; // type:func rom:0xA1CF98
 func_80241FBC_A1D0BC = 0x80241FBC; // type:func rom:0xA1D0BC
 hos_03_Call800E9894 = 0x802421A8; // type:func rom:0xA1D2A8
 hos_03_Call800E98C4SyncStatusMenu = 0x802421C8; // type:func rom:0xA1D2C8
-func_802421F0_A1D2F0 = 0x802421F0; // type:func rom:0xA1D2F0
-func_8024226C_A1D36C = 0x8024226C; // type:func rom:0xA1D36C
+hos_03_UnkFunc32 = 0x802421F0; // type:func rom:0xA1D2F0
+hos_03_UnkFunc33 = 0x8024226C; // type:func rom:0xA1D36C
 hos_03_AwaitScriptComplete = 0x802422EC; // type:func rom:0xA1D3EC
 hos_03_PartnerSuspendAbilityScript = 0x8024231C; // type:func rom:0xA1D41C
 hos_03_PartnerResumeAbilityScript = 0x80242348; // type:func rom:0xA1D448
-func_80242368_A1D468 = 0x80242368; // type:func rom:0xA1D468
-func_802423BC_A1D4BC = 0x802423BC; // type:func rom:0xA1D4BC
+hos_03_UnkFunc34 = 0x80242368; // type:func rom:0xA1D468
+hos_03_UnkFunc35 = 0x802423BC; // type:func rom:0xA1D4BC
 hos_03_GetPartnerCall800EB168 = 0x80242438; // type:func rom:0xA1D538
 hos_03_Call800EB168 = 0x8024246C; // type:func rom:0xA1D56C
-func_8024249C_A1D59C = 0x8024249C; // type:func rom:0xA1D59C
+hos_03_UnkFunc36 = 0x8024249C; // type:func rom:0xA1D59C
 func_802424A4_A1D5A4 = 0x802424A4; // type:func rom:0xA1D5A4
 hos_03_GetItemName = 0x80242558; // type:func rom:0xA1D658
 hos_03_Set80151310_1 = 0x802425BC; // type:func rom:0xA1D6BC
 hos_03_Set80151310_0 = 0x802425D0; // type:func rom:0xA1D6D0
 func_802425E0_A1D6E0 = 0x802425E0; // type:func rom:0xA1D6E0
-func_80242804_A1D904 = 0x80242804; // type:func rom:0xA1D904
+hos_03_UnkFunc31 = 0x80242804; // type:func rom:0xA1D904
 hos_03_GetNpcUnsafeOwner2 = 0x80242850; // type:func rom:0xA1D950
-func_80242870_A1D970 = 0x80242870; // type:func rom:0xA1D970
+hos_03_UnkFunc28 = 0x80242870; // type:func rom:0xA1D970
 hos_03_UnkAlphaFunc = 0x802428D0; // type:func rom:0xA1D9D0
-func_80242A1C_A1DB1C = 0x80242A1C; // type:func rom:0xA1DB1C
+hos_03_UnkFunc29 = 0x80242A1C; // type:func rom:0xA1DB1C
 func_80242B90_A1DC90 = 0x80242B90; // type:func rom:0xA1DC90
 func_80242C14_A1DD14 = 0x80242C14; // type:func rom:0xA1DD14
 func_80242E2C_A1DF2C = 0x80242E2C; // type:func rom:0xA1DF2C
@@ -10144,8 +10416,8 @@ D_80243258_A2A128 = 0x80243258; // type:data rom:0xA2A128
 D_80243284_A2A154 = 0x80243284; // type:data rom:0xA2A154
 D_80243300_A2A1D0 = 0x80243300; // type:data rom:0xA2A1D0
 D_80243328_A2A1F8 = 0x80243328; // type:data rom:0xA2A1F8
-func_80240000_A2A240 = 0x80240000; // type:func rom:0xA2A240
-func_80240124_A2A364 = 0x80240124; // type:func rom:0xA2A364
+hos_05_UnkFunc27 = 0x80240000; // type:func rom:0xA2A240
+hos_05_UnkFunc26 = 0x80240124; // type:func rom:0xA2A364
 hos_05_UnkTexturePanFunc = 0x802402F8; // type:func rom:0xA2A538
 hos_05_UnkTexturePanFunc2 = 0x8024041C; // type:func rom:0xA2A65C
 func_80240604_A2A844 = 0x80240604; // type:func rom:0xA2A844
@@ -10200,8 +10472,8 @@ func_80244934_A2EB74 = 0x80244934; // type:func rom:0xA2EB74
 func_802449F0_A2EC30 = 0x802449F0; // type:func rom:0xA2EC30
 func_80244C60_A2EEA0 = 0x80244C60; // type:func rom:0xA2EEA0
 func_80244C8C_A2EECC = 0x80244C8C; // type:func rom:0xA2EECC
-pause_tabs_draw_badges_A2EF00 = 0x80244CC0; // type:func rom:0xA2EF00
-func_80244DE4_A2F024 = 0x80244DE4; // type:func rom:0xA2F024
+dup_hos_05_UnkFunc27 = 0x80244CC0; // type:func rom:0xA2EF00
+dup_hos_05_UnkFunc26 = 0x80244DE4; // type:func rom:0xA2F024
 dup_hos_05_UnkTexturePanFunc = 0x80244FB8; // type:func rom:0xA2F1F8
 dup_hos_05_UnkTexturePanFunc2 = 0x802450DC; // type:func rom:0xA2F31C
 func_802452C4_A2F504 = 0x802452C4; // type:func rom:0xA2F504
@@ -10484,13 +10756,13 @@ D_80242030_A548F0 = 0x80242030; // type:data rom:0xA548F0
 func_80240000_A54950 = 0x80240000; // type:func rom:0xA54950
 kpa_12_UnkTexturePanFunc = 0x80240040; // type:func rom:0xA54990
 kpa_12_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xA54AB4
-func_80240350_A54CA0 = 0x80240350; // type:func rom:0xA54CA0
+kpa_12_func_80240350_A54CA0 = 0x80240350; // type:func rom:0xA54CA0
 func_8024037C_A54CCC = 0x8024037C; // type:func rom:0xA54CCC
 func_80240444_A54D94 = 0x80240444; // type:func rom:0xA54D94
 func_80240000_A55F20 = 0x80240000; // type:func rom:0xA55F20
 kpa_13_UnkTexturePanFunc = 0x80240040; // type:func rom:0xA55F60
 kpa_13_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xA56084
-func_80240350_A56270 = 0x80240350; // type:func rom:0xA56270
+kpa_13_func_80240350_A56270 = 0x80240350; // type:func rom:0xA56270
 func_8024037C_A5629C = 0x8024037C; // type:func rom:0xA5629C
 func_80240444_A56364 = 0x80240444; // type:func rom:0xA56364
 func_80240000_A574B0 = 0x80240000; // type:func rom:0xA574B0
@@ -10503,7 +10775,7 @@ kpa_14_SomeItemEntityFunc = 0x80240498; // type:func rom:0xA57948
 kpa_14_CheckItemFlags40 = 0x802405E8; // type:func rom:0xA57A98
 kpa_14_SetEntityFlags100000 = 0x8024063C; // type:func rom:0xA57AEC
 kpa_14_GetEntityPosition = 0x80240670; // type:func rom:0xA57B20
-func_80240710_A57BC0 = 0x80240710; // type:func rom:0xA57BC0
+kpa_14_func_80240710_A57BC0 = 0x80240710; // type:func rom:0xA57BC0
 func_8024073C_A57BEC = 0x8024073C; // type:func rom:0xA57BEC
 func_80240840_A57CF0 = 0x80240840; // type:func rom:0xA57CF0
 D_80241900_A58DB0 = 0x80241900; // type:data rom:0xA58DB0
@@ -10518,7 +10790,7 @@ kpa_16_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA5A030
 kpa_16_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA5A154
 func_80240310_A5A340 = 0x80240310; // type:func rom:0xA5A340
 func_8024034C_A5A37C = 0x8024034C; // type:func rom:0xA5A37C
-func_80240370_A5A3A0 = 0x80240370; // type:func rom:0xA5A3A0
+kpa_16_UnkFunc30 = 0x80240370; // type:func rom:0xA5A3A0
 kpa_32_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA5E0C0
 kpa_32_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA5E1E4
 kpa_33_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA5F080
@@ -10699,16 +10971,16 @@ kpa_91_set_script_owner_npc_col_height = 0x802411A4; // type:func rom:0xA87BF4
 func_80241224_A87C74 = 0x80241224; // type:func rom:0xA87C74
 kpa_91_Call800E9894 = 0x80241528; // type:func rom:0xA87F78
 kpa_91_Call800E98C4SyncStatusMenu = 0x80241548; // type:func rom:0xA87F98
-func_80241570_A87FC0 = 0x80241570; // type:func rom:0xA87FC0
-func_802415EC_A8803C = 0x802415EC; // type:func rom:0xA8803C
+kpa_91_UnkFunc32 = 0x80241570; // type:func rom:0xA87FC0
+kpa_91_UnkFunc33 = 0x802415EC; // type:func rom:0xA8803C
 kpa_91_AwaitScriptComplete = 0x8024166C; // type:func rom:0xA880BC
 kpa_91_PartnerSuspendAbilityScript = 0x8024169C; // type:func rom:0xA880EC
 kpa_91_PartnerResumeAbilityScript = 0x802416C8; // type:func rom:0xA88118
-func_802416E8_A88138 = 0x802416E8; // type:func rom:0xA88138
-func_8024173C_A8818C = 0x8024173C; // type:func rom:0xA8818C
+kpa_91_UnkFunc34 = 0x802416E8; // type:func rom:0xA88138
+kpa_91_UnkFunc35 = 0x8024173C; // type:func rom:0xA8818C
 kpa_91_GetPartnerCall800EB168 = 0x802417B8; // type:func rom:0xA88208
 kpa_91_Call800EB168 = 0x802417EC; // type:func rom:0xA8823C
-func_8024181C_A8826C = 0x8024181C; // type:func rom:0xA8826C
+kpa_91_UnkFunc36 = 0x8024181C; // type:func rom:0xA8826C
 kpa_91_SetEntityFlags100000 = 0x80241830; // type:func rom:0xA88280
 kpa_91_GetEntityPosition = 0x80241864; // type:func rom:0xA882B4
 D_80245A30_A8C480 = 0x80245A30; // type:data rom:0xA8C480
@@ -10735,16 +11007,16 @@ kpa_95_set_script_owner_npc_col_height = 0x80241284; // type:func rom:0xA8DD04
 func_80241304_A8DD84 = 0x80241304; // type:func rom:0xA8DD84
 kpa_95_Call800E9894 = 0x80241608; // type:func rom:0xA8E088
 kpa_95_Call800E98C4SyncStatusMenu = 0x80241628; // type:func rom:0xA8E0A8
-func_80241650_A8E0D0 = 0x80241650; // type:func rom:0xA8E0D0
-func_802416CC_A8E14C = 0x802416CC; // type:func rom:0xA8E14C
+kpa_95_UnkFunc32 = 0x80241650; // type:func rom:0xA8E0D0
+kpa_95_UnkFunc33 = 0x802416CC; // type:func rom:0xA8E14C
 kpa_95_AwaitScriptComplete = 0x8024174C; // type:func rom:0xA8E1CC
 kpa_95_PartnerSuspendAbilityScript = 0x8024177C; // type:func rom:0xA8E1FC
 kpa_95_PartnerResumeAbilityScript = 0x802417A8; // type:func rom:0xA8E228
-func_802417C8_A8E248 = 0x802417C8; // type:func rom:0xA8E248
-func_8024181C_A8E29C = 0x8024181C; // type:func rom:0xA8E29C
+kpa_95_UnkFunc34 = 0x802417C8; // type:func rom:0xA8E248
+kpa_95_UnkFunc35 = 0x8024181C; // type:func rom:0xA8E29C
 kpa_95_GetPartnerCall800EB168 = 0x80241898; // type:func rom:0xA8E318
 kpa_95_Call800EB168 = 0x802418CC; // type:func rom:0xA8E34C
-func_802418FC_A8E37C = 0x802418FC; // type:func rom:0xA8E37C
+kpa_95_UnkFunc36 = 0x802418FC; // type:func rom:0xA8E37C
 D_80245A00_A92480 = 0x80245A00; // type:data rom:0xA92480
 D_80245A08_A92488 = 0x80245A08; // type:data rom:0xA92488
 D_80245BA0_A92620 = 0x80245BA0; // type:data rom:0xA92620
@@ -10876,8 +11148,8 @@ osr_00_UnkTexturePanFunc = 0x80240000; // type:func rom:0xAAC830
 osr_00_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xAAC954
 func_8024030C_AACB3C = 0x8024030C; // type:func rom:0xAACB3C
 osr_00_SpawnSunEffect = 0x80240344; // type:func rom:0xAACB74
-func_80240380_AACBB0 = 0x80240380; // type:func rom:0xAACBB0
-func_802404A4_AACCD4 = 0x802404A4; // type:func rom:0xAACCD4
+osr_00_UnkFunc27 = 0x80240380; // type:func rom:0xAACBB0
+osr_00_UnkFunc26 = 0x802404A4; // type:func rom:0xAACCD4
 func_80240678_AACEA8 = 0x80240678; // type:func rom:0xAACEA8
 func_802406E0_AACF10 = 0x802406E0; // type:func rom:0xAACF10
 func_80240000_AAFFF0 = 0x80240000; // type:func rom:0xAAFFF0
@@ -11095,7 +11367,7 @@ func_802406A0_AF7FF0 = 0x802406A0; // type:func rom:0xAF7FF0
 func_802406C4_AF8014 = 0x802406C4; // type:func rom:0xAF8014
 func_80240B4C_AF849C = 0x80240B4C; // type:func rom:0xAF849C
 func_80240B8C_AF84DC = 0x80240B8C; // type:func rom:0xAF84DC
-func_80240BE4_AF8534 = 0x80240BE4; // type:func rom:0xAF8534
+kkj_19_UnkFunc30 = 0x80240BE4; // type:func rom:0xAF8534
 func_80240C10_AF8560 = 0x80240C10; // type:func rom:0xAF8560
 func_80240C4C_AF859C = 0x80240C4C; // type:func rom:0xAF859C
 func_80240CB4_AF8604 = 0x80240CB4; // type:func rom:0xAF8604
@@ -11113,16 +11385,16 @@ kkj_20_SomeItemEntityFunc = 0x80240118; // type:func rom:0xAFDC58
 kkj_20_CheckItemFlags40 = 0x80240268; // type:func rom:0xAFDDA8
 kkj_20_Call800E9894 = 0x802402C0; // type:func rom:0xAFDE00
 kkj_20_Call800E98C4SyncStatusMenu = 0x802402E0; // type:func rom:0xAFDE20
-func_80240308_AFDE48 = 0x80240308; // type:func rom:0xAFDE48
-func_80240384_AFDEC4 = 0x80240384; // type:func rom:0xAFDEC4
+kkj_20_UnkFunc32 = 0x80240308; // type:func rom:0xAFDE48
+kkj_20_UnkFunc33 = 0x80240384; // type:func rom:0xAFDEC4
 kkj_20_AwaitScriptComplete = 0x80240404; // type:func rom:0xAFDF44
 kkj_20_PartnerSuspendAbilityScript = 0x80240434; // type:func rom:0xAFDF74
 kkj_20_PartnerResumeAbilityScript = 0x80240460; // type:func rom:0xAFDFA0
-func_80240480_AFDFC0 = 0x80240480; // type:func rom:0xAFDFC0
-func_802404D4_AFE014 = 0x802404D4; // type:func rom:0xAFE014
+kkj_20_UnkFunc34 = 0x80240480; // type:func rom:0xAFDFC0
+kkj_20_UnkFunc35 = 0x802404D4; // type:func rom:0xAFE014
 kkj_20_GetPartnerCall800EB168 = 0x80240550; // type:func rom:0xAFE090
 kkj_20_Call800EB168 = 0x80240584; // type:func rom:0xAFE0C4
-func_802405B4_AFE0F4 = 0x802405B4; // type:func rom:0xAFE0F4
+kkj_20_UnkFunc36 = 0x802405B4; // type:func rom:0xAFE0F4
 func_802405BC_AFE0FC = 0x802405BC; // type:func rom:0xAFE0FC
 D_80240880_AFE3C0 = 0x80240880; // type:data rom:0xAFE3C0
 func_80240000_B02880 = 0x80240000; // type:func rom:0xB02880
@@ -11145,7 +11417,7 @@ func_80240000_B06570 = 0x80240000; // type:func rom:0xB06570
 func_80240000_B06A00 = 0x80240000; // type:func rom:0xB06A00
 func_80240020_B06A20 = 0x80240020; // type:func rom:0xB06A20
 kkj_25_UnkFunc1 = 0x80240050; // type:func rom:0xB06A50
-func_80240080_B06A80 = 0x80240080; // type:func rom:0xB06A80
+kkj_25_UnkFunc30 = 0x80240080; // type:func rom:0xB06A80
 func_802400AC_B06AAC = 0x802400AC; // type:func rom:0xB06AAC
 func_802400FC_B06AFC = 0x802400FC; // type:func rom:0xB06AFC
 kkj_25_GetEntityPosition = 0x802401C4; // type:func rom:0xB06BC4
@@ -11279,11 +11551,11 @@ jan_02_GetItemName = 0x802416C8; // type:func rom:0xB2DB38
 jan_02_Set80151310_1 = 0x8024172C; // type:func rom:0xB2DB9C
 jan_02_Set80151310_0 = 0x80241740; // type:func rom:0xB2DBB0
 func_80241750_B2DBC0 = 0x80241750; // type:func rom:0xB2DBC0
-func_80241974_B2DDE4 = 0x80241974; // type:func rom:0xB2DDE4
+jan_02_UnkFunc31 = 0x80241974; // type:func rom:0xB2DDE4
 jan_02_GetNpcUnsafeOwner2 = 0x802419C0; // type:func rom:0xB2DE30
-func_802419E0_B2DE50 = 0x802419E0; // type:func rom:0xB2DE50
+jan_02_UnkFunc28 = 0x802419E0; // type:func rom:0xB2DE50
 jan_02_UnkAlphaFunc = 0x80241A40; // type:func rom:0xB2DEB0
-func_80241B8C_B2DFFC = 0x80241B8C; // type:func rom:0xB2DFFC
+jan_02_UnkFunc29 = 0x80241B8C; // type:func rom:0xB2DFFC
 func_80241D00_B2E170 = 0x80241D00; // type:func rom:0xB2E170
 func_80241D84_B2E1F4 = 0x80241D84; // type:func rom:0xB2E1F4
 func_80241F9C_B2E40C = 0x80241F9C; // type:func rom:0xB2E40C
@@ -11314,7 +11586,7 @@ D_802485C0_B34A30 = 0x802485C0; // type:data rom:0xB34A30
 D_802485C8_B34A38 = 0x802485C8; // type:data rom:0xB34A38
 jan_03_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xB34BD0
 jan_03_GetCurrentFloor = 0x80240020; // type:func rom:0xB34BF0
-func_80240034_B34C04 = 0x80240034; // type:func rom:0xB34C04
+jan_03_UnkFunc25 = 0x80240034; // type:func rom:0xB34C04
 jan_03_GetEntryPos = 0x802400F0; // type:func rom:0xB34CC0
 jan_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xB34DA0
 jan_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xB34E0C
@@ -11335,16 +11607,16 @@ jan_03_UnkFunc16 = 0x802410F4; // type:func rom:0xB35CC4
 func_802411B4_B35D84 = 0x802411B4; // type:func rom:0xB35D84
 jan_03_Call800E9894 = 0x802414B0; // type:func rom:0xB36080
 jan_03_Call800E98C4SyncStatusMenu = 0x802414D0; // type:func rom:0xB360A0
-func_802414F8_B360C8 = 0x802414F8; // type:func rom:0xB360C8
-func_80241574_B36144 = 0x80241574; // type:func rom:0xB36144
+jan_03_UnkFunc32 = 0x802414F8; // type:func rom:0xB360C8
+jan_03_UnkFunc33 = 0x80241574; // type:func rom:0xB36144
 jan_03_AwaitScriptComplete = 0x802415F4; // type:func rom:0xB361C4
 jan_03_PartnerSuspendAbilityScript = 0x80241624; // type:func rom:0xB361F4
 jan_03_PartnerResumeAbilityScript = 0x80241650; // type:func rom:0xB36220
-func_80241670_B36240 = 0x80241670; // type:func rom:0xB36240
-func_802416C4_B36294 = 0x802416C4; // type:func rom:0xB36294
+jan_03_UnkFunc34 = 0x80241670; // type:func rom:0xB36240
+jan_03_UnkFunc35 = 0x802416C4; // type:func rom:0xB36294
 jan_03_GetPartnerCall800EB168 = 0x80241740; // type:func rom:0xB36310
 jan_03_Call800EB168 = 0x80241774; // type:func rom:0xB36344
-func_802417A4_B36374 = 0x802417A4; // type:func rom:0xB36374
+jan_03_UnkFunc36 = 0x802417A4; // type:func rom:0xB36374
 jan_03_GetNpcCollisionHeight = 0x802417AC; // type:func rom:0xB3637C
 jan_03_AddPlayerHandsOffset = 0x80241808; // type:func rom:0xB363D8
 func_802419D8_B365A8 = 0x802419D8; // type:func rom:0xB365A8
@@ -11356,11 +11628,11 @@ jan_03_GetItemName = 0x80241C50; // type:func rom:0xB36820
 jan_03_Set80151310_1 = 0x80241CB4; // type:func rom:0xB36884
 jan_03_Set80151310_0 = 0x80241CC8; // type:func rom:0xB36898
 func_80241CD8_B368A8 = 0x80241CD8; // type:func rom:0xB368A8
-func_80241EFC_B36ACC = 0x80241EFC; // type:func rom:0xB36ACC
+jan_03_UnkFunc31 = 0x80241EFC; // type:func rom:0xB36ACC
 jan_03_GetNpcUnsafeOwner2 = 0x80241F48; // type:func rom:0xB36B18
-func_80241F68_B36B38 = 0x80241F68; // type:func rom:0xB36B38
+jan_03_UnkFunc28 = 0x80241F68; // type:func rom:0xB36B38
 jan_03_UnkAlphaFunc = 0x80241FC8; // type:func rom:0xB36B98
-func_80242114_B36CE4 = 0x80242114; // type:func rom:0xB36CE4
+jan_03_UnkFunc29 = 0x80242114; // type:func rom:0xB36CE4
 func_80242288_B36E58 = 0x80242288; // type:func rom:0xB36E58
 func_8024230C_B36EDC = 0x8024230C; // type:func rom:0xB36EDC
 func_80242524_B370F4 = 0x80242524; // type:func rom:0xB370F4
@@ -11401,7 +11673,7 @@ func_80240350_B44AC0 = 0x80240350; // type:func rom:0xB44AC0
 jan_04_GetItemName = 0x80240404; // type:func rom:0xB44B74
 jan_04_SomeItemEntityFunc = 0x80240468; // type:func rom:0xB44BD8
 jan_04_CheckItemFlags40 = 0x802405B8; // type:func rom:0xB44D28
-func_80240610_B44D80 = 0x80240610; // type:func rom:0xB44D80
+jan_04_UnkFunc41 = 0x80240610; // type:func rom:0xB44D80
 jan_04_foliage_setup_shear_mtx = 0x802407A0; // type:func rom:0xB44F10
 jan_04_TransformFoliage = 0x80240810; // type:func rom:0xB44F80
 func_802409E0_B45150 = 0x802409E0; // type:func rom:0xB45150
@@ -11503,20 +11775,20 @@ jan_08_SetOverrideFlags_40 = 0x80240660; // type:func rom:0xB5E910
 jan_08_UnkFunc17 = 0x8024067C; // type:func rom:0xB5E92C
 func_8024069C_B5E94C = 0x8024069C; // type:func rom:0xB5E94C
 jan_08_UnkFunc18 = 0x802406C8; // type:func rom:0xB5E978
-func_80240734_B5E9E4 = 0x80240734; // type:func rom:0xB5E9E4
-func_80240780_B5EA30 = 0x80240780; // type:func rom:0xB5EA30
+jan_08_UnkFunc37 = 0x80240734; // type:func rom:0xB5E9E4
+jan_08_UnkFunc38 = 0x80240780; // type:func rom:0xB5EA30
 func_8024082C_B5EADC = 0x8024082C; // type:func rom:0xB5EADC
 func_80240A7C_B5ED2C = 0x80240A7C; // type:func rom:0xB5ED2C
 jan_08_UnkFunc19 = 0x80240AA8; // type:func rom:0xB5ED58
 jan_08_UnkFunc20 = 0x80240AE0; // type:func rom:0xB5ED90
-func_80240B70_B5EE20 = 0x80240B70; // type:func rom:0xB5EE20
+jan_08_UnkFunc39 = 0x80240B70; // type:func rom:0xB5EE20
 jan_08_UnkFunc21 = 0x80240BA4; // type:func rom:0xB5EE54
 jan_08_UnkFunc22 = 0x80240C08; // type:func rom:0xB5EEB8
 func_80240C60_B5EF10 = 0x80240C60; // type:func rom:0xB5EF10
 jan_08_UnkFunc23 = 0x80241198; // type:func rom:0xB5F448
 jan_08_UnkPartnerPosFunc = 0x802412D8; // type:func rom:0xB5F588
 jan_08_UnkPartnerPosFunc2 = 0x80241320; // type:func rom:0xB5F5D0
-func_80241368_B5F618 = 0x80241368; // type:func rom:0xB5F618
+jan_08_UnkFunc40 = 0x80241368; // type:func rom:0xB5F618
 func_802413A0_B5F650 = 0x802413A0; // type:func rom:0xB5F650
 jan_08_UnkNpcAIFunc4 = 0x80241454; // type:func rom:0xB5F704
 func_802414A4_B5F754 = 0x802414A4; // type:func rom:0xB5F754
@@ -11538,7 +11810,7 @@ D_802474B0_B65760 = 0x802474B0; // type:data rom:0xB65760
 D_802474D8_B65788 = 0x802474D8; // type:data rom:0xB65788
 jan_09_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xB65AB0
 jan_09_GetCurrentFloor = 0x80240020; // type:func rom:0xB65AD0
-func_80240034_B65AE4 = 0x80240034; // type:func rom:0xB65AE4
+jan_09_UnkFunc25 = 0x80240034; // type:func rom:0xB65AE4
 jan_09_GetEntryPos = 0x802400F0; // type:func rom:0xB65BA0
 jan_09_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xB65C80
 jan_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xB65CEC
@@ -11582,12 +11854,12 @@ D_80244480_B70810 = 0x80244480; // type:data rom:0xB70810
 func_80240000_B70860 = 0x80240000; // type:func rom:0xB70860
 jan_11_SetPlayerStatusAnimFlags100000 = 0x80240158; // type:func rom:0xB709B8
 jan_11_GetCurrentFloor = 0x80240178; // type:func rom:0xB709D8
-func_8024018C_B709EC = 0x8024018C; // type:func rom:0xB709EC
+jan_11_UnkFunc25 = 0x8024018C; // type:func rom:0xB709EC
 jan_11_GetEntryPos = 0x80240248; // type:func rom:0xB70AA8
 jan_11_GetCurrentCameraYawClamped180 = 0x80240328; // type:func rom:0xB70B88
 jan_11_SomeXYZFunc2 = 0x80240394; // type:func rom:0xB70BF4
 func_80240438_B70C98 = 0x80240438; // type:func rom:0xB70C98
-func_802407B0_B71010 = 0x802407B0; // type:func rom:0xB71010
+jan_11_UnkFunc30 = 0x802407B0; // type:func rom:0xB71010
 func_802407DC_B7103C = 0x802407DC; // type:func rom:0xB7103C
 func_80240000_B730B0 = 0x80240000; // type:func rom:0xB730B0
 func_802400F8_B731A8 = 0x802400F8; // type:func rom:0xB731A8
@@ -11637,8 +11909,8 @@ D_80243880_B7D8D0 = 0x80243880; // type:data rom:0xB7D8D0
 func_80240000_B7D920 = 0x80240000; // type:func rom:0xB7D920
 jan_15_foliage_setup_shear_mtx = 0x802400C0; // type:func rom:0xB7D9E0
 jan_15_TransformFoliage = 0x80240130; // type:func rom:0xB7DA50
-func_80240000_B80000 = 0x80240000; // type:func rom:0xB80000
-func_80240124_B80124 = 0x80240124; // type:func rom:0xB80124
+jan_16_UnkFunc27 = 0x80240000; // type:func rom:0xB80000
+jan_16_UnkFunc26 = 0x80240124; // type:func rom:0xB80124
 jan_16_foliage_setup_shear_mtx = 0x80240300; // type:func rom:0xB80300
 jan_16_TransformFoliage = 0x80240370; // type:func rom:0xB80370
 func_80240000_B837C0 = 0x80240000; // type:func rom:0xB837C0
@@ -11871,7 +12143,7 @@ func_802400EC_BB5ACC = 0x802400EC; // type:func rom:0xBB5ACC
 func_80240148_BB5B28 = 0x80240148; // type:func rom:0xBB5B28
 mim_11_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xBB7070
 mim_11_GetCurrentFloor = 0x80240020; // type:func rom:0xBB7090
-func_80240034_BB70A4 = 0x80240034; // type:func rom:0xBB70A4
+mim_11_UnkFunc25 = 0x80240034; // type:func rom:0xBB70A4
 mim_11_GetEntryPos = 0x802400F0; // type:func rom:0xBB7160
 mim_11_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xBB7240
 mim_11_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xBB72AC
@@ -11997,7 +12269,7 @@ func_802415F4_BD01E4 = 0x802415F4; // type:func rom:0xBD01E4
 func_80241630_BD0220 = 0x80241630; // type:func rom:0xBD0220
 func_80241674_BD0264 = 0x80241674; // type:func rom:0xBD0264
 func_802416F8_BD02E8 = 0x802416F8; // type:func rom:0xBD02E8
-func_80241788_BD0378 = 0x80241788; // type:func rom:0xBD0378
+obk_07_UnkFunc36 = 0x80241788; // type:func rom:0xBD0378
 func_80241790_BD0380 = 0x80241790; // type:func rom:0xBD0380
 func_80241898_BD0488 = 0x80241898; // type:func rom:0xBD0488
 func_802418E0_BD04D0 = 0x802418E0; // type:func rom:0xBD04D0
@@ -12034,7 +12306,7 @@ func_802412BC_BD4B2C = 0x802412BC; // type:func rom:0xBD4B2C
 func_80241300_BD4B70 = 0x80241300; // type:func rom:0xBD4B70
 func_80241658_BD4EC8 = 0x80241658; // type:func rom:0xBD4EC8
 D_80244FEC_BD885C = 0x80244FEC; // type:data rom:0xBD885C
-func_80240000_BDA7B0 = 0x80240000; // type:func rom:0xBDA7B0
+obk_09_UnkFunc41 = 0x80240000; // type:func rom:0xBDA7B0
 func_80240190_BDA940 = 0x80240190; // type:func rom:0xBDA940
 func_80240248_BDA9F8 = 0x80240248; // type:func rom:0xBDA9F8
 func_80240350_BDAB00 = 0x80240350; // type:func rom:0xBDAB00
@@ -12046,12 +12318,12 @@ arn_02_func_802401D4_BDD384 = 0x802401D4; // type:func rom:0xBDD384
 arn_02_UnkNpcAIFunc21 = 0x80240304; // type:func rom:0xBDD4B4
 arn_02_UnkNpcAIFunc20 = 0x802403A0; // type:func rom:0xBDD550
 arn_02_UnkNpcAIFunc22 = 0x80240428; // type:func rom:0xBDD5D8
-arn_02_func_802404D0_BDD680 = 0x802404D0; // type:func rom:0xBDD680
+arn_02_UnkFunc8 = 0x802404D0; // type:func rom:0xBDD680
 arn_02_UnkNpcAIFunc16 = 0x80240644; // type:func rom:0xBDD7F4
 arn_02_func_80240694_BDD844 = 0x80240694; // type:func rom:0xBDD844
-arn_02_func_80240834_BDD9E4 = 0x80240834; // type:func rom:0xBDD9E4
+arn_02_UnkFunc10 = 0x80240834; // type:func rom:0xBDD9E4
 arn_02_func_80240984_BDDB34 = 0x80240984; // type:func rom:0xBDDB34
-arn_02_func_80240A30_BDDBE0 = 0x80240A30; // type:func rom:0xBDDBE0
+arn_02_UnkFunc9 = 0x80240A30; // type:func rom:0xBDDBE0
 arn_02_UnkNpcAIFunc19 = 0x80240B68; // type:func rom:0xBDDD18
 arn_02_UnkNpcAIFunc17 = 0x80240BE4; // type:func rom:0xBDDD94
 arn_02_UnkDurationCheck = 0x80240C4C; // type:func rom:0xBDDDFC
@@ -12088,9 +12360,9 @@ arn_03_func_8024067C_BDF40C = 0x8024067C; // type:func rom:0xBDF40C
 arn_03_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBDF4C0
 arn_03_NpcJumpFunc = 0x802407A4; // type:func rom:0xBDF534
 arn_03_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBDF5AC
-arn_03_func_8024094C_BDF6DC = 0x8024094C; // type:func rom:0xBDF6DC
+arn_03_UnkFunc15 = 0x8024094C; // type:func rom:0xBDF6DC
 arn_03_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBDF7FC
-arn_03_func_80240AD4_BDF864 = 0x80240AD4; // type:func rom:0xBDF864
+arn_03_UnkFunc16 = 0x80240AD4; // type:func rom:0xBDF864
 arn_03_func_80240B94_BDF924 = 0x80240B94; // type:func rom:0xBDF924
 arn_03_func_80240E90_BDFC20 = 0x80240E90; // type:func rom:0xBDFC20
 arn_03_func_80241068_BDFDF8 = 0x80241068; // type:func rom:0xBDFDF8
@@ -12162,20 +12434,20 @@ arn_04_func_8024067C_BE3E2C = 0x8024067C; // type:func rom:0xBE3E2C
 arn_04_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBE3EE0
 arn_04_NpcJumpFunc = 0x802407A4; // type:func rom:0xBE3F54
 arn_04_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE3FCC
-arn_04_func_8024094C_BE40FC = 0x8024094C; // type:func rom:0xBE40FC
+arn_04_UnkFunc15 = 0x8024094C; // type:func rom:0xBE40FC
 arn_04_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE421C
-arn_04_func_80240AD4_BE4284 = 0x80240AD4; // type:func rom:0xBE4284
+arn_04_UnkFunc16 = 0x80240AD4; // type:func rom:0xBE4284
 arn_04_func_80240B94_BE4344 = 0x80240B94; // type:func rom:0xBE4344
 arn_04_func_80240E90_BE4640 = 0x80240E90; // type:func rom:0xBE4640
 arn_04_func_80241040_BE47F0 = 0x80241040; // type:func rom:0xBE47F0
 arn_04_UnkNpcAIFunc1_copy = 0x80241668; // type:func rom:0xBE4E18
-arn_04_func_80241728_BE4ED8 = 0x80241728; // type:func rom:0xBE4ED8
+arn_04_UnkFunc4 = 0x80241728; // type:func rom:0xBE4ED8
 arn_04_UnkNpcAIFunc2 = 0x80241A6C; // type:func rom:0xBE521C
 arn_04_func_80241AE4_BE5294 = 0x80241AE4; // type:func rom:0xBE5294
 arn_04_UnkNpcAIFunc14 = 0x80241B50; // type:func rom:0xBE5300
 arn_04_UnkNpcAIFunc3 = 0x80241C84; // type:func rom:0xBE5434
-arn_04_func_80241CE8_BE5498 = 0x80241CE8; // type:func rom:0xBE5498
-arn_04_func_80242078_BE5828 = 0x80242078; // type:func rom:0xBE5828
+arn_04_UnkFunc6 = 0x80241CE8; // type:func rom:0xBE5498
+arn_04_UnkFunc5 = 0x80242078; // type:func rom:0xBE5828
 arn_04_func_8024219C_BE594C = 0x8024219C; // type:func rom:0xBE594C
 arn_04_func_80242388_BE5B38 = 0x80242388; // type:func rom:0xBE5B38
 arn_04_UnkNpcAIFunc18 = 0x802424E8; // type:func rom:0xBE5C98
@@ -12183,12 +12455,12 @@ arn_04_func_8024255C_BE5D0C = 0x8024255C; // type:func rom:0xBE5D0C
 arn_04_UnkNpcAIFunc21 = 0x8024268C; // type:func rom:0xBE5E3C
 arn_04_UnkNpcAIFunc20 = 0x80242728; // type:func rom:0xBE5ED8
 arn_04_UnkNpcAIFunc22 = 0x802427B0; // type:func rom:0xBE5F60
-arn_04_func_80242858_BE6008 = 0x80242858; // type:func rom:0xBE6008
+arn_04_UnkFunc8 = 0x80242858; // type:func rom:0xBE6008
 arn_04_UnkNpcAIFunc16 = 0x802429CC; // type:func rom:0xBE617C
 arn_04_func_80242A1C_BE61CC = 0x80242A1C; // type:func rom:0xBE61CC
-arn_04_func_80242BBC_BE636C = 0x80242BBC; // type:func rom:0xBE636C
+arn_04_UnkFunc10 = 0x80242BBC; // type:func rom:0xBE636C
 arn_04_func_80242D0C_BE64BC = 0x80242D0C; // type:func rom:0xBE64BC
-arn_04_func_80242DB8_BE6568 = 0x80242DB8; // type:func rom:0xBE6568
+arn_04_UnkFunc9 = 0x80242DB8; // type:func rom:0xBE6568
 arn_04_UnkNpcAIFunc19 = 0x80242EF0; // type:func rom:0xBE66A0
 arn_04_UnkNpcAIFunc17 = 0x80242F6C; // type:func rom:0xBE671C
 arn_04_UnkDurationCheck = 0x80242FD4; // type:func rom:0xBE6784
@@ -12228,16 +12500,16 @@ D_80244338_BE7AE8 = 0x80244338; // type:data rom:0xBE7AE8
 D_80244340_BE7AF0 = 0x80244340; // type:data rom:0xBE7AF0
 D_80244348_BE7AF8 = 0x80244348; // type:data rom:0xBE7AF8
 arn_05_func_80240000_BE7BE0 = 0x80240000; // type:func rom:0xBE7BE0
-arn_05_func_80240158_BE7D38 = 0x80240158; // type:func rom:0xBE7D38
+arn_05_UnkFunc13 = 0x80240158; // type:func rom:0xBE7D38
 arn_05_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBE7FE0
-arn_05_func_802404C0_BE80A0 = 0x802404C0; // type:func rom:0xBE80A0
+arn_05_UnkFunc14 = 0x802404C0; // type:func rom:0xBE80A0
 arn_05_func_8024067C_BE825C = 0x8024067C; // type:func rom:0xBE825C
 arn_05_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBE8310
 arn_05_NpcJumpFunc = 0x802407A4; // type:func rom:0xBE8384
 arn_05_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE83FC
-arn_05_func_8024094C_BE852C = 0x8024094C; // type:func rom:0xBE852C
+arn_05_UnkFunc15 = 0x8024094C; // type:func rom:0xBE852C
 arn_05_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE864C
-arn_05_func_80240AD4_BE86B4 = 0x80240AD4; // type:func rom:0xBE86B4
+arn_05_UnkFunc16 = 0x80240AD4; // type:func rom:0xBE86B4
 arn_05_func_80240B94_BE8774 = 0x80240B94; // type:func rom:0xBE8774
 arn_05_func_80240E90_BE8A70 = 0x80240E90; // type:func rom:0xBE8A70
 arn_05_func_80241068_BE8C48 = 0x80241068; // type:func rom:0xBE8C48
@@ -12299,15 +12571,15 @@ arn_07_func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0
 arn_07_SetEntityFlags100000 = 0x80240870; // type:func rom:0xBED660
 arn_07_GetEntityPosition = 0x802408A4; // type:func rom:0xBED694
 arn_07_func_80240950_BED740 = 0x80240950; // type:func rom:0xBED740
-arn_07_func_80240B00_BED8F0 = 0x80240B00; // type:func rom:0xBED8F0
+func_80240B00_BED8F0 = 0x80240B00; // type:func rom:0xBED8F0
 arn_07_UnkNpcAIFunc1 = 0x80241128; // type:func rom:0xBEDF18
-arn_07_func_802411E8_BEDFD8 = 0x802411E8; // type:func rom:0xBEDFD8
+arn_07_UnkFunc4 = 0x802411E8; // type:func rom:0xBEDFD8
 arn_07_UnkNpcAIFunc2 = 0x8024152C; // type:func rom:0xBEE31C
 arn_07_func_802415A4_BEE394 = 0x802415A4; // type:func rom:0xBEE394
 arn_07_UnkNpcAIFunc14 = 0x80241610; // type:func rom:0xBEE400
 arn_07_UnkNpcAIFunc3 = 0x80241744; // type:func rom:0xBEE534
-arn_07_func_802417A8_BEE598 = 0x802417A8; // type:func rom:0xBEE598
-arn_07_func_80241B38_BEE928 = 0x80241B38; // type:func rom:0xBEE928
+arn_07_UnkFunc6 = 0x802417A8; // type:func rom:0xBEE598
+arn_07_UnkFunc5 = 0x80241B38; // type:func rom:0xBEE928
 arn_07_func_80241C5C_BEEA4C = 0x80241C5C; // type:func rom:0xBEEA4C
 PostChapter3StatUpdate = 0x80241E48; // type:func rom:0xBEEC38
 arn_07_entryList = 0x80241E90; // type:data rom:0xBEEC80
@@ -12575,13 +12847,13 @@ dgb_01_GetEntityPosition = 0x80240074; // type:func rom:0xBFD8F4
 dgb_01_func_80240120_BFD9A0 = 0x80240120; // type:func rom:0xBFD9A0
 func_802402D0_BFDB50 = 0x802402D0; // type:func rom:0xBFDB50
 dgb_01_UnkNpcAIFunc1 = 0x802408F8; // type:func rom:0xBFE178
-dgb_01_func_802409B8_BFE238 = 0x802409B8; // type:func rom:0xBFE238
+dgb_01_UnkFunc4 = 0x802409B8; // type:func rom:0xBFE238
 dgb_01_UnkNpcAIFunc2 = 0x80240CFC; // type:func rom:0xBFE57C
 dgb_01_func_80240D74_BFE5F4 = 0x80240D74; // type:func rom:0xBFE5F4
 dgb_01_UnkNpcAIFunc14 = 0x80240DE0; // type:func rom:0xBFE660
 dgb_01_UnkNpcAIFunc3 = 0x80240F14; // type:func rom:0xBFE794
-dgb_01_func_80240F78_BFE7F8 = 0x80240F78; // type:func rom:0xBFE7F8
-dgb_01_func_80241308_BFEB88 = 0x80241308; // type:func rom:0xBFEB88
+dgb_01_UnkFunc6 = 0x80240F78; // type:func rom:0xBFE7F8
+dgb_01_UnkFunc5 = 0x80241308; // type:func rom:0xBFEB88
 dgb_01_func_8024142C_BFECAC = 0x8024142C; // type:func rom:0xBFECAC
 dgb_01_func_80241618_BFEE98 = 0x80241618; // type:func rom:0xBFEE98
 dgb_01_func_80241770_BFEFF0 = 0x80241770; // type:func rom:0xBFEFF0
@@ -12595,16 +12867,16 @@ dgb_01_func_80241EF0_BFF770 = 0x80241EF0; // type:func rom:0xBFF770
 dgb_01_func_80241F98_BFF818 = 0x80241F98; // type:func rom:0xBFF818
 dgb_01_func_802422B0_BFFB30 = 0x802422B0; // type:func rom:0xBFFB30
 dgb_01_func_8024252C_BFFDAC = 0x8024252C; // type:func rom:0xBFFDAC
-dgb_01_func_80242684_BFFF04 = 0x80242684; // type:func rom:0xBFFF04
+dgb_01_UnkFunc13 = 0x80242684; // type:func rom:0xBFFF04
 dgb_01_UnkNpcAIFunc1_copy = 0x8024292C; // type:func rom:0xC001AC
-dgb_01_func_802429EC_C0026C = 0x802429EC; // type:func rom:0xC0026C
+dgb_01_UnkFunc14 = 0x802429EC; // type:func rom:0xC0026C
 dgb_01_func_80242BA8_C00428 = 0x80242BA8; // type:func rom:0xC00428
 dgb_01_NpcJumpFunc2 = 0x80242C5C; // type:func rom:0xC004DC
 dgb_01_NpcJumpFunc = 0x80242CD0; // type:func rom:0xC00550
 dgb_01_UnkNpcAIFunc13 = 0x80242D48; // type:func rom:0xC005C8
-dgb_01_func_80242E78_C006F8 = 0x80242E78; // type:func rom:0xC006F8
+dgb_01_UnkFunc15 = 0x80242E78; // type:func rom:0xC006F8
 dgb_01_UnkNpcDurationFlagFunc = 0x80242F98; // type:func rom:0xC00818
-dgb_01_func_80243000_C00880 = 0x80243000; // type:func rom:0xC00880
+dgb_01_UnkFunc16 = 0x80243000; // type:func rom:0xC00880
 dgb_01_func_802430C0_C00940 = 0x802430C0; // type:func rom:0xC00940
 dgb_01_UnkFunc1 = 0x802433BC; // type:func rom:0xC00C3C
 dgb_01_entryList = 0x802433F0; // type:data rom:0xC00C70
@@ -13008,7 +13280,7 @@ dgb_02_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC2EC0C
 dgb_02_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC2EC7C
 dgb_02_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC2ED54
 dgb_02_func_80240208_C2EDA8 = 0x80240208; // type:func rom:0xC2EDA8
-dgb_02_update_starpoints_display_C2EF5C = 0x802403BC; // type:func rom:0xC2EF5C
+dgb_02_UnkFunc7 = 0x802403BC; // type:func rom:0xC2EF5C
 dgb_02_func_8024061C_C2F1BC = 0x8024061C; // type:func rom:0xC2F1BC
 dgb_02_func_802408D0_C2F470 = 0x802408D0; // type:func rom:0xC2F470
 dgb_02_func_80240958_C2F4F8 = 0x80240958; // type:func rom:0xC2F4F8
@@ -13043,8 +13315,8 @@ dgb_02_npcGroup_80241E08 = 0x80241E08; // type:data rom:0xC309A8
 dgb_02_npcGroup_802421E8 = 0x802421E8; // type:data rom:0xC30D88
 dgb_02_npcGroupList_802425C8 = 0x802425C8; // type:data rom:0xC31168
 D_80242610_C311B0 = 0x80242610; // type:data rom:0xC311B0
-dgb_03_func_80240000_C314E0 = 0x80240000; // type:func rom:0xC314E0
-dgb_03_func_802400BC_C3159C = 0x802400BC; // type:func rom:0xC3159C
+dgb_03_UnkFunc11 = 0x80240000; // type:func rom:0xC314E0
+dgb_03_UnkFunc12 = 0x802400BC; // type:func rom:0xC3159C
 dgb_03_SetEntityFlags100000 = 0x80240170; // type:func rom:0xC31650
 dgb_03_GetEntityPosition = 0x802401A4; // type:func rom:0xC31684
 dgb_03_UnkNpcAIFunc6 = 0x80240250; // type:func rom:0xC31730
@@ -13052,19 +13324,19 @@ dgb_03_UnkNpcAIFunc7 = 0x802402BC; // type:func rom:0xC3179C
 dgb_03_UnkNpcAIFunc8 = 0x8024032C; // type:func rom:0xC3180C
 dgb_03_UnkNpcAIFunc5 = 0x80240404; // type:func rom:0xC318E4
 dgb_03_func_80240458_C31938 = 0x80240458; // type:func rom:0xC31938
-dgb_03_func_8024060C_C31AEC = 0x8024060C; // type:func rom:0xC31AEC
+dgb_03_UnkFunc7 = 0x8024060C; // type:func rom:0xC31AEC
 dgb_03_func_8024086C_C31D4C = 0x8024086C; // type:func rom:0xC31D4C
 dgb_03_func_80240B20_C32000 = 0x80240B20; // type:func rom:0xC32000
-dgb_03_func_80240C78_C32158 = 0x80240C78; // type:func rom:0xC32158
+dgb_03_UnkFunc13 = 0x80240C78; // type:func rom:0xC32158
 dgb_03_UnkNpcAIFunc1 = 0x80240F20; // type:func rom:0xC32400
-dgb_03_func_80240FE0_C324C0 = 0x80240FE0; // type:func rom:0xC324C0
+dgb_03_UnkFunc14 = 0x80240FE0; // type:func rom:0xC324C0
 dgb_03_func_8024119C_C3267C = 0x8024119C; // type:func rom:0xC3267C
 dgb_03_NpcJumpFunc2 = 0x80241250; // type:func rom:0xC32730
 dgb_03_NpcJumpFunc = 0x802412C4; // type:func rom:0xC327A4
 dgb_03_UnkNpcAIFunc13 = 0x8024133C; // type:func rom:0xC3281C
-dgb_03_func_8024146C_C3294C = 0x8024146C; // type:func rom:0xC3294C
+dgb_03_UnkFunc15 = 0x8024146C; // type:func rom:0xC3294C
 dgb_03_UnkNpcDurationFlagFunc = 0x8024158C; // type:func rom:0xC32A6C
-dgb_03_func_802415F4_C32AD4 = 0x802415F4; // type:func rom:0xC32AD4
+dgb_03_UnkFunc16 = 0x802415F4; // type:func rom:0xC32AD4
 dgb_03_func_802416B4_C32B94 = 0x802416B4; // type:func rom:0xC32B94
 dgb_03_func_802419B0_C32E90 = 0x802419B0; // type:func rom:0xC32E90
 dgb_03_func_80241C7C_C3315C = 0x80241C7C; // type:func rom:0xC3315C
@@ -13122,13 +13394,13 @@ D_80244EB8_C36398 = 0x80244EB8; // type:data rom:0xC36398
 dgb_04_func_80240000_C36530 = 0x80240000; // type:func rom:0xC36530
 dgb_04_func_802401B0_C366E0 = 0x802401B0; // type:func rom:0xC366E0
 dgb_04_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0xC36D08
-dgb_04_func_80240898_C36DC8 = 0x80240898; // type:func rom:0xC36DC8
+dgb_04_UnkFunc4 = 0x80240898; // type:func rom:0xC36DC8
 dgb_04_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0xC3710C
 dgb_04_func_80240C54_C37184 = 0x80240C54; // type:func rom:0xC37184
 dgb_04_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0xC371F0
 dgb_04_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0xC37324
-dgb_04_func_80240E58_C37388 = 0x80240E58; // type:func rom:0xC37388
-dgb_04_func_802411E8_C37718 = 0x802411E8; // type:func rom:0xC37718
+dgb_04_UnkFunc6 = 0x80240E58; // type:func rom:0xC37388
+dgb_04_UnkFunc5 = 0x802411E8; // type:func rom:0xC37718
 dgb_04_func_8024130C_C3783C = 0x8024130C; // type:func rom:0xC3783C
 dgb_04_func_802414F8_C37A28 = 0x802414F8; // type:func rom:0xC37A28
 dgb_04_func_80241650_C37B80 = 0x80241650; // type:func rom:0xC37B80
@@ -13142,23 +13414,23 @@ dgb_04_func_80241D94_C382C4 = 0x80241D94; // type:func rom:0xC382C4
 dgb_04_func_80241E3C_C3836C = 0x80241E3C; // type:func rom:0xC3836C
 dgb_04_func_80242154_C38684 = 0x80242154; // type:func rom:0xC38684
 dgb_04_SetOverrideFlags_40 = 0x802423D0; // type:func rom:0xC38900
-dgb_04_func_802423EC_C3891C = 0x802423EC; // type:func rom:0xC3891C
+dgb_04_UnkFunc17 = 0x802423EC; // type:func rom:0xC3891C
 dgb_04_func_8024240C_C3893C = 0x8024240C; // type:func rom:0xC3893C
-dgb_04_func_80242438_C38968 = 0x80242438; // type:func rom:0xC38968
-dgb_04_func_802424A4_C389D4 = 0x802424A4; // type:func rom:0xC389D4
-dgb_04_func_802424F0_C38A20 = 0x802424F0; // type:func rom:0xC38A20
+dgb_04_UnkFunc18 = 0x80242438; // type:func rom:0xC38968
+dgb_04_UnkFunc37 = 0x802424A4; // type:func rom:0xC389D4
+dgb_04_UnkFunc38 = 0x802424F0; // type:func rom:0xC38A20
 dgb_04_func_8024259C_C38ACC = 0x8024259C; // type:func rom:0xC38ACC
 dgb_04_func_802427EC_C38D1C = 0x802427EC; // type:func rom:0xC38D1C
-dgb_04_func_80242818_C38D48 = 0x80242818; // type:func rom:0xC38D48
-dgb_04_func_80242850_C38D80 = 0x80242850; // type:func rom:0xC38D80
-dgb_04_func_802428E0_C38E10 = 0x802428E0; // type:func rom:0xC38E10
-dgb_04_func_80242914_C38E44 = 0x80242914; // type:func rom:0xC38E44
-dgb_04_func_80242978_C38EA8 = 0x80242978; // type:func rom:0xC38EA8
+dgb_04_UnkFunc19 = 0x80242818; // type:func rom:0xC38D48
+dgb_04_UnkFunc20 = 0x80242850; // type:func rom:0xC38D80
+dgb_04_UnkFunc39 = 0x802428E0; // type:func rom:0xC38E10
+dgb_04_UnkFunc21 = 0x80242914; // type:func rom:0xC38E44
+dgb_04_UnkFunc22 = 0x80242978; // type:func rom:0xC38EA8
 dgb_04_func_802429D0_C38F00 = 0x802429D0; // type:func rom:0xC38F00
 dgb_04_func_80242F08_C39438 = 0x80242F08; // type:func rom:0xC39438
 dgb_04_UnkPartnerPosFunc = 0x80243048; // type:func rom:0xC39578
 dgb_04_UnkPartnerPosFunc2 = 0x80243090; // type:func rom:0xC395C0
-dgb_04_func_802430D8_C39608 = 0x802430D8; // type:func rom:0xC39608
+dgb_04_UnkFunc24 = 0x802430D8; // type:func rom:0xC39608
 dgb_04_entryList = 0x80243110; // type:data rom:0xC39640
 dgb_04_config = 0x80243130; // type:data rom:0xC39660
 dgb_04_80243170 = 0x80243170; // type:data rom:0xC396A0
@@ -13195,7 +13467,7 @@ dgb_05_UnkNpcAIFunc7 = 0x802400CC; // type:func rom:0xC3AADC
 dgb_05_UnkNpcAIFunc8 = 0x8024013C; // type:func rom:0xC3AB4C
 dgb_05_UnkNpcAIFunc5 = 0x80240214; // type:func rom:0xC3AC24
 dgb_05_func_80240268_C3AC78 = 0x80240268; // type:func rom:0xC3AC78
-dgb_05_func_8024041C_C3AE2C = 0x8024041C; // type:func rom:0xC3AE2C
+dgb_05_UnkFunc7 = 0x8024041C; // type:func rom:0xC3AE2C
 dgb_05_func_8024067C_C3B08C = 0x8024067C; // type:func rom:0xC3B08C
 dgb_05_func_80240704_C3B114 = 0x80240704; // type:func rom:0xC3B114
 dgb_05_func_802409BC_C3B3CC = 0x802409BC; // type:func rom:0xC3B3CC
@@ -13252,7 +13524,7 @@ dgb_07_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC3DC5C
 dgb_07_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC3DCCC
 dgb_07_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC3DDA4
 dgb_07_func_80240208_C3DDF8 = 0x80240208; // type:func rom:0xC3DDF8
-dgb_07_update_starpoints_display_C3DFAC = 0x802403BC; // type:func rom:0xC3DFAC
+dgb_07_UnkFunc7 = 0x802403BC; // type:func rom:0xC3DFAC
 dgb_07_func_8024061C_C3E20C = 0x8024061C; // type:func rom:0xC3E20C
 dgb_07_func_802406A4_C3E294 = 0x802406A4; // type:func rom:0xC3E294
 dgb_07_func_8024095C_C3E54C = 0x8024095C; // type:func rom:0xC3E54C
@@ -13283,34 +13555,34 @@ dgb_07_npcGroupList_80241E5C = 0x80241E5C; // type:data rom:0xC3FA4C
 D_80241E90_C3FA80 = 0x80241E90; // type:data rom:0xC3FA80
 D_80241E98_C3FA88 = 0x80241E98; // type:data rom:0xC3FA88
 dgb_08_func_80240000_C3FDB0 = 0x80240000; // type:func rom:0xC3FDB0
-dgb_08_func_80240158_C3FF08 = 0x80240158; // type:func rom:0xC3FF08
+dgb_08_UnkFunc13 = 0x80240158; // type:func rom:0xC3FF08
 dgb_08_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC401B0
-dgb_08_func_802404C0_C40270 = 0x802404C0; // type:func rom:0xC40270
+dgb_08_UnkFunc14 = 0x802404C0; // type:func rom:0xC40270
 dgb_08_func_8024067C_C4042C = 0x8024067C; // type:func rom:0xC4042C
 dgb_08_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC404E0
 dgb_08_NpcJumpFunc = 0x802407A4; // type:func rom:0xC40554
 dgb_08_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC405CC
-dgb_08_func_8024094C_C406FC = 0x8024094C; // type:func rom:0xC406FC
+dgb_08_UnkFunc15 = 0x8024094C; // type:func rom:0xC406FC
 dgb_08_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xC4081C
-dgb_08_func_80240AD4_C40884 = 0x80240AD4; // type:func rom:0xC40884
+dgb_08_UnkFunc16 = 0x80240AD4; // type:func rom:0xC40884
 dgb_08_func_80240B94_C40944 = 0x80240B94; // type:func rom:0xC40944
 dgb_08_UnkNpcAIFunc6 = 0x80240E90; // type:func rom:0xC40C40
 dgb_08_UnkNpcAIFunc7 = 0x80240EFC; // type:func rom:0xC40CAC
 dgb_08_UnkNpcAIFunc8 = 0x80240F6C; // type:func rom:0xC40D1C
 dgb_08_UnkNpcAIFunc5 = 0x80241044; // type:func rom:0xC40DF4
 dgb_08_func_80241098_C40E48 = 0x80241098; // type:func rom:0xC40E48
-dgb_08_func_8024124C_C40FFC = 0x8024124C; // type:func rom:0xC40FFC
+dgb_08_UnkFunc7 = 0x8024124C; // type:func rom:0xC40FFC
 dgb_08_func_802414AC_C4125C = 0x802414AC; // type:func rom:0xC4125C
 dgb_08_func_80241760_C41510 = 0x80241760; // type:func rom:0xC41510
 dgb_08_func_80241910_C416C0 = 0x80241910; // type:func rom:0xC416C0
 dgb_08_UnkNpcAIFunc1_copy = 0x80241F38; // type:func rom:0xC41CE8
-dgb_08_func_80241FF8_C41DA8 = 0x80241FF8; // type:func rom:0xC41DA8
+dgb_08_UnkFunc4 = 0x80241FF8; // type:func rom:0xC41DA8
 dgb_08_UnkNpcAIFunc2 = 0x8024233C; // type:func rom:0xC420EC
 dgb_08_func_802423B4_C42164 = 0x802423B4; // type:func rom:0xC42164
 dgb_08_UnkNpcAIFunc14 = 0x80242420; // type:func rom:0xC421D0
 dgb_08_UnkNpcAIFunc3 = 0x80242554; // type:func rom:0xC42304
-dgb_08_func_802425B8_C42368 = 0x802425B8; // type:func rom:0xC42368
-dgb_08_func_80242948_C426F8 = 0x80242948; // type:func rom:0xC426F8
+dgb_08_UnkFunc6 = 0x802425B8; // type:func rom:0xC42368
+dgb_08_UnkFunc5 = 0x80242948; // type:func rom:0xC426F8
 dgb_08_func_80242A6C_C4281C = 0x80242A6C; // type:func rom:0xC4281C
 dgb_08_func_80242C58_C42A08 = 0x80242C58; // type:func rom:0xC42A08
 dgb_08_func_80242DB0_C42B60 = 0x80242DB0; // type:func rom:0xC42B60
@@ -13393,7 +13665,7 @@ dgb_09_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC46C4C
 dgb_09_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC46CBC
 dgb_09_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC46D94
 dgb_09_func_80240208_C46DE8 = 0x80240208; // type:func rom:0xC46DE8
-dgb_09_update_starpoints_display_C46F9C = 0x802403BC; // type:func rom:0xC46F9C
+dgb_09_UnkFunc7 = 0x802403BC; // type:func rom:0xC46F9C
 dgb_09_func_8024061C_C471FC = 0x8024061C; // type:func rom:0xC471FC
 dgb_09_func_802408D0_C474B0 = 0x802408D0; // type:func rom:0xC474B0
 dgb_09_func_80240958_C47538 = 0x80240958; // type:func rom:0xC47538
@@ -13407,13 +13679,13 @@ dgb_09_func_802410D4_C47CB4 = 0x802410D4; // type:func rom:0xC47CB4
 dgb_09_func_80241424_C48004 = 0x80241424; // type:func rom:0xC48004
 dgb_09_func_802415D4_C481B4 = 0x802415D4; // type:func rom:0xC481B4
 dgb_09_UnkNpcAIFunc1 = 0x80241BFC; // type:func rom:0xC487DC
-dgb_09_func_80241CBC_C4889C = 0x80241CBC; // type:func rom:0xC4889C
+dgb_09_UnkFunc4 = 0x80241CBC; // type:func rom:0xC4889C
 dgb_09_UnkNpcAIFunc2 = 0x80242000; // type:func rom:0xC48BE0
 dgb_09_func_80242078_C48C58 = 0x80242078; // type:func rom:0xC48C58
 dgb_09_UnkNpcAIFunc14 = 0x802420E4; // type:func rom:0xC48CC4
 dgb_09_UnkNpcAIFunc3 = 0x80242218; // type:func rom:0xC48DF8
-dgb_09_func_8024227C_C48E5C = 0x8024227C; // type:func rom:0xC48E5C
-dgb_09_func_8024260C_C491EC = 0x8024260C; // type:func rom:0xC491EC
+dgb_09_UnkFunc6 = 0x8024227C; // type:func rom:0xC48E5C
+dgb_09_UnkFunc5 = 0x8024260C; // type:func rom:0xC491EC
 dgb_09_func_80242730_C49310 = 0x80242730; // type:func rom:0xC49310
 dgb_09_func_8024291C_C494FC = 0x8024291C; // type:func rom:0xC494FC
 dgb_09_func_80242A74_C49654 = 0x80242A74; // type:func rom:0xC49654
@@ -13545,19 +13817,19 @@ dgb_15_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC4F57C
 dgb_15_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC4F5EC
 dgb_15_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC4F6C4
 dgb_15_func_80240208_C4F718 = 0x80240208; // type:func rom:0xC4F718
-dgb_15_update_starpoints_display_C4F8CC = 0x802403BC; // type:func rom:0xC4F8CC
+dgb_15_UnkFunc7 = 0x802403BC; // type:func rom:0xC4F8CC
 dgb_15_func_8024061C_C4FB2C = 0x8024061C; // type:func rom:0xC4FB2C
 dgb_15_func_802408D0_C4FDE0 = 0x802408D0; // type:func rom:0xC4FDE0
-dgb_15_func_80240A28_C4FF38 = 0x80240A28; // type:func rom:0xC4FF38
+dgb_15_UnkFunc13 = 0x80240A28; // type:func rom:0xC4FF38
 dgb_15_UnkNpcAIFunc1 = 0x80240CD0; // type:func rom:0xC501E0
-dgb_15_func_80240D90_C502A0 = 0x80240D90; // type:func rom:0xC502A0
+dgb_15_UnkFunc14 = 0x80240D90; // type:func rom:0xC502A0
 dgb_15_func_80240F4C_C5045C = 0x80240F4C; // type:func rom:0xC5045C
 dgb_15_NpcJumpFunc2 = 0x80241000; // type:func rom:0xC50510
 dgb_15_NpcJumpFunc = 0x80241074; // type:func rom:0xC50584
 dgb_15_UnkNpcAIFunc13 = 0x802410EC; // type:func rom:0xC505FC
-dgb_15_func_8024121C_C5072C = 0x8024121C; // type:func rom:0xC5072C
+dgb_15_UnkFunc15 = 0x8024121C; // type:func rom:0xC5072C
 dgb_15_UnkNpcDurationFlagFunc = 0x8024133C; // type:func rom:0xC5084C
-dgb_15_func_802413A4_C508B4 = 0x802413A4; // type:func rom:0xC508B4
+dgb_15_UnkFunc16 = 0x802413A4; // type:func rom:0xC508B4
 dgb_15_func_80241464_C50974 = 0x80241464; // type:func rom:0xC50974
 dgb_15_UnkFunc1 = 0x80241760; // type:func rom:0xC50C70
 dgb_15_GetEntityPosition = 0x80241790; // type:func rom:0xC50CA0
@@ -13603,7 +13875,7 @@ dgb_16_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC525AC
 dgb_16_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC5261C
 dgb_16_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC526F4
 dgb_16_func_80240208_C52748 = 0x80240208; // type:func rom:0xC52748
-dgb_16_update_starpoints_display_C528FC = 0x802403BC; // type:func rom:0xC528FC
+dgb_16_UnkFunc7 = 0x802403BC; // type:func rom:0xC528FC
 dgb_16_func_8024061C_C52B5C = 0x8024061C; // type:func rom:0xC52B5C
 dgb_16_func_802406A4_C52BE4 = 0x802406A4; // type:func rom:0xC52BE4
 dgb_16_func_8024095C_C52E9C = 0x8024095C; // type:func rom:0xC52E9C
@@ -13649,16 +13921,16 @@ dgb_17_enterDoubleDoor_802402B0 = 0x802402B0; // type:data rom:0xC55D10
 dgb_17_main = 0x802403B8; // type:data rom:0xC55E18
 dgb_17_makeEntities = 0x80240470; // type:data rom:0xC55ED0
 dgb_18_func_80240000_C55F40 = 0x80240000; // type:func rom:0xC55F40
-dgb_18_func_80240158_C56098 = 0x80240158; // type:func rom:0xC56098
+dgb_18_UnkFunc13 = 0x80240158; // type:func rom:0xC56098
 dgb_18_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC56340
-dgb_18_func_802404C0_C56400 = 0x802404C0; // type:func rom:0xC56400
+dgb_18_UnkFunc14 = 0x802404C0; // type:func rom:0xC56400
 dgb_18_func_8024067C_C565BC = 0x8024067C; // type:func rom:0xC565BC
 dgb_18_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC56670
 dgb_18_NpcJumpFunc = 0x802407A4; // type:func rom:0xC566E4
 dgb_18_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC5675C
-dgb_18_func_8024094C_C5688C = 0x8024094C; // type:func rom:0xC5688C
+dgb_18_UnkFunc15 = 0x8024094C; // type:func rom:0xC5688C
 dgb_18_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xC569AC
-dgb_18_func_80240AD4_C56A14 = 0x80240AD4; // type:func rom:0xC56A14
+dgb_18_UnkFunc16 = 0x80240AD4; // type:func rom:0xC56A14
 dgb_18_func_80240B94_C56AD4 = 0x80240B94; // type:func rom:0xC56AD4
 dgb_18_UnkFunc1 = 0x80240E90; // type:func rom:0xC56DD0
 dgb_18_func_80240EBC_C56DFC = 0x80240EBC; // type:func rom:0xC56DFC
@@ -13702,7 +13974,7 @@ kzn_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC59AF4
 kzn_02_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC5A740
 kzn_02_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC5A864
 func_80240310_C5AA50 = 0x80240310; // type:func rom:0xC5AA50
-func_80240384_C5AAC4 = 0x80240384; // type:func rom:0xC5AAC4
+kzn_02_UnkFunc30 = 0x80240384; // type:func rom:0xC5AAC4
 func_802403B0_C5AAF0 = 0x802403B0; // type:func rom:0xC5AAF0
 func_802403DC_C5AB1C = 0x802403DC; // type:func rom:0xC5AB1C
 func_802404E0_C5AC20 = 0x802404E0; // type:func rom:0xC5AC20
@@ -13718,7 +13990,7 @@ kzn_02_UnkFunc5 = 0x802416C8; // type:func rom:0xC5BE08
 func_802417EC_C5BF2C = 0x802417EC; // type:func rom:0xC5BF2C
 kzn_02_UnkNpcAIFunc13 = 0x802419D8; // type:func rom:0xC5C118
 func_80241B08_C5C248 = 0x80241B08; // type:func rom:0xC5C248
-func_80241D88_C5C4C8 = 0x80241D88; // type:func rom:0xC5C4C8
+kzn_02_UnkFunc45 = 0x80241D88; // type:func rom:0xC5C4C8
 func_80241DE4_C5C524 = 0x80241DE4; // type:func rom:0xC5C524
 func_80241FCC_C5C70C = 0x80241FCC; // type:func rom:0xC5C70C
 kzn_02_GetItemName = 0x80242080; // type:func rom:0xC5C7C0
@@ -13802,20 +14074,20 @@ kzn_04_SetOverrideFlags_40 = 0x80240310; // type:func rom:0xC68440
 kzn_04_UnkFunc17 = 0x8024032C; // type:func rom:0xC6845C
 func_8024034C_C6847C = 0x8024034C; // type:func rom:0xC6847C
 kzn_04_UnkFunc18 = 0x80240378; // type:func rom:0xC684A8
-func_802403E4_C68514 = 0x802403E4; // type:func rom:0xC68514
-func_80240430_C68560 = 0x80240430; // type:func rom:0xC68560
+kzn_04_UnkFunc37 = 0x802403E4; // type:func rom:0xC68514
+kzn_04_UnkFunc38 = 0x80240430; // type:func rom:0xC68560
 func_802404DC_C6860C = 0x802404DC; // type:func rom:0xC6860C
 func_8024072C_C6885C = 0x8024072C; // type:func rom:0xC6885C
 kzn_04_UnkFunc19 = 0x80240758; // type:func rom:0xC68888
 kzn_04_UnkFunc20 = 0x80240790; // type:func rom:0xC688C0
-func_80240820_C68950 = 0x80240820; // type:func rom:0xC68950
+kzn_04_UnkFunc39 = 0x80240820; // type:func rom:0xC68950
 kzn_04_UnkFunc21 = 0x80240854; // type:func rom:0xC68984
 kzn_04_UnkFunc22 = 0x802408B8; // type:func rom:0xC689E8
 func_80240910_C68A40 = 0x80240910; // type:func rom:0xC68A40
 kzn_04_UnkFunc23 = 0x80240E48; // type:func rom:0xC68F78
 kzn_04_UnkPartnerPosFunc = 0x80240F88; // type:func rom:0xC690B8
 kzn_04_UnkPartnerPosFunc2 = 0x80240FD0; // type:func rom:0xC69100
-func_80241018_C69148 = 0x80241018; // type:func rom:0xC69148
+kzn_04_UnkFunc40 = 0x80241018; // type:func rom:0xC69148
 func_80241050_C69180 = 0x80241050; // type:func rom:0xC69180
 func_80241644_C69774 = 0x80241644; // type:func rom:0xC69774
 D_80241C40_C69D70 = 0x80241C40; // type:data rom:0xC69D70
@@ -13855,7 +14127,7 @@ kzn_07_UnkFunc5 = 0x80241A08; // type:func rom:0xC6FD38
 func_80241B2C_C6FE5C = 0x80241B2C; // type:func rom:0xC6FE5C
 kzn_07_UnkNpcAIFunc13 = 0x80241D18; // type:func rom:0xC70048
 func_80241E48_C70178 = 0x80241E48; // type:func rom:0xC70178
-func_802420C8_C703F8 = 0x802420C8; // type:func rom:0xC703F8
+kzn_07_UnkFunc45 = 0x802420C8; // type:func rom:0xC703F8
 func_80242124_C70454 = 0x80242124; // type:func rom:0xC70454
 D_802423E0_C70710 = 0x802423E0; // type:data rom:0xC70710
 D_80242930_C70C60 = 0x80242930; // type:data rom:0xC70C60
@@ -13887,7 +14159,7 @@ kzn_08_UnkFunc5 = 0x80241C38; // type:func rom:0xC730B8
 func_80241D5C_C731DC = 0x80241D5C; // type:func rom:0xC731DC
 kzn_08_UnkNpcAIFunc13 = 0x80241F48; // type:func rom:0xC733C8
 func_80242078_C734F8 = 0x80242078; // type:func rom:0xC734F8
-func_802422F8_C73778 = 0x802422F8; // type:func rom:0xC73778
+kzn_08_UnkFunc45 = 0x802422F8; // type:func rom:0xC73778
 func_80242354_C737D4 = 0x80242354; // type:func rom:0xC737D4
 kzn_08_UnkNpcAIFunc6 = 0x8024253C; // type:func rom:0xC739BC
 kzn_08_UnkNpcAIFunc7 = 0x802425A8; // type:func rom:0xC73A28
@@ -13924,20 +14196,20 @@ kzn_09_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xC76CE0
 kzn_09_UnkFunc17 = 0x8024001C; // type:func rom:0xC76CFC
 func_8024003C_C76D1C = 0x8024003C; // type:func rom:0xC76D1C
 kzn_09_UnkFunc18 = 0x80240068; // type:func rom:0xC76D48
-func_802400D4_C76DB4 = 0x802400D4; // type:func rom:0xC76DB4
-func_80240120_C76E00 = 0x80240120; // type:func rom:0xC76E00
+kzn_09_UnkFunc37 = 0x802400D4; // type:func rom:0xC76DB4
+kzn_09_UnkFunc38 = 0x80240120; // type:func rom:0xC76E00
 func_802401CC_C76EAC = 0x802401CC; // type:func rom:0xC76EAC
 func_8024041C_C770FC = 0x8024041C; // type:func rom:0xC770FC
 kzn_09_UnkFunc19 = 0x80240448; // type:func rom:0xC77128
 kzn_09_UnkFunc20 = 0x80240480; // type:func rom:0xC77160
-func_80240510_C771F0 = 0x80240510; // type:func rom:0xC771F0
+kzn_09_UnkFunc39 = 0x80240510; // type:func rom:0xC771F0
 kzn_09_UnkFunc21 = 0x80240544; // type:func rom:0xC77224
 kzn_09_UnkFunc22 = 0x802405A8; // type:func rom:0xC77288
 func_80240600_C772E0 = 0x80240600; // type:func rom:0xC772E0
 kzn_09_UnkFunc23 = 0x80240B38; // type:func rom:0xC77818
 kzn_09_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xC77958
 kzn_09_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xC779A0
-func_80240D08_C779E8 = 0x80240D08; // type:func rom:0xC779E8
+kzn_09_UnkFunc40 = 0x80240D08; // type:func rom:0xC779E8
 func_80240D40_C77A20 = 0x80240D40; // type:func rom:0xC77A20
 func_80240DE4_C77AC4 = 0x80240DE4; // type:func rom:0xC77AC4
 func_80240E88_C77B68 = 0x80240E88; // type:func rom:0xC77B68
@@ -14008,7 +14280,7 @@ D_80242010_C80190 = 0x80242010; // type:data rom:0xC80190
 kzn_11_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC801A0
 kzn_11_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC802C4
 func_80240310_C804B0 = 0x80240310; // type:func rom:0xC804B0
-func_80240408_C805A8 = 0x80240408; // type:func rom:0xC805A8
+kzn_11_UnkFunc30 = 0x80240408; // type:func rom:0xC805A8
 func_80240434_C805D4 = 0x80240434; // type:func rom:0xC805D4
 func_80240460_C80600 = 0x80240460; // type:func rom:0xC80600
 func_80240610_C807B0 = 0x80240610; // type:func rom:0xC807B0
@@ -14023,7 +14295,7 @@ kzn_11_UnkFunc5 = 0x80241648; // type:func rom:0xC817E8
 func_8024176C_C8190C = 0x8024176C; // type:func rom:0xC8190C
 kzn_11_UnkNpcAIFunc13 = 0x80241958; // type:func rom:0xC81AF8
 func_80241A88_C81C28 = 0x80241A88; // type:func rom:0xC81C28
-func_80241D08_C81EA8 = 0x80241D08; // type:func rom:0xC81EA8
+kzn_11_UnkFunc45 = 0x80241D08; // type:func rom:0xC81EA8
 func_80241D64_C81F04 = 0x80241D64; // type:func rom:0xC81F04
 func_80241F4C_C820EC = 0x80241F4C; // type:func rom:0xC820EC
 func_80242540_C826E0 = 0x80242540; // type:func rom:0xC826E0
@@ -14098,7 +14370,7 @@ kzn_18_UnkTexturePanFunc = 0x80240040; // type:func rom:0xC8C0E0
 kzn_18_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xC8C204
 func_80240350_C8C3F0 = 0x80240350; // type:func rom:0xC8C3F0
 func_8024036C_C8C40C = 0x8024036C; // type:func rom:0xC8C40C
-func_80240388_C8C428 = 0x80240388; // type:func rom:0xC8C428
+kzn_18_UnkFunc30 = 0x80240388; // type:func rom:0xC8C428
 kzn_19_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC8DBB0
 kzn_19_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC8DCD4
 func_8024030C_C8DEBC = 0x8024030C; // type:func rom:0xC8DEBC
@@ -14147,14 +14419,14 @@ kzn_20_UnkYawFunc = 0x8024086C; // type:func rom:0xC9679C
 func_802409F8_C96928 = 0x802409F8; // type:func rom:0xC96928
 func_80240A3C_C9696C = 0x80240A3C; // type:func rom:0xC9696C
 func_80240A68_C96998 = 0x80240A68; // type:func rom:0xC96998
-func_80240A8C_C969BC = 0x80240A8C; // type:func rom:0xC969BC
+kzn_20_UnkFunc30 = 0x80240A8C; // type:func rom:0xC969BC
 D_80241780_C976B0 = 0x80241780; // type:data rom:0xC976B0
 D_802417E4_C97714 = 0x802417E4; // type:data rom:0xC97714
 D_802417E8_C97718 = 0x802417E8; // type:data rom:0xC97718
 kzn_22_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC9A200
 kzn_22_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC9A324
-func_8024030C_C9A50C = 0x8024030C; // type:func rom:0xC9A50C
-func_80240340_C9A540 = 0x80240340; // type:func rom:0xC9A540
+kzn_22_UnkFunc30 = 0x8024030C; // type:func rom:0xC9A50C
+dup_kzn_22_UnkFunc30 = 0x80240340; // type:func rom:0xC9A540
 func_8024036C_C9A56C = 0x8024036C; // type:func rom:0xC9A56C
 kzn_23_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC9C300
 kzn_23_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC9C424
@@ -14164,165 +14436,582 @@ func_80240478_C9C778 = 0x80240478; // type:func rom:0xC9C778
 kzn_23_UnsetCamera0MoveFlag1 = 0x80240504; // type:func rom:0xC9C804
 func_80240520_C9C820 = 0x80240520; // type:func rom:0xC9C820
 D_80241C10_C9DF10 = 0x80241C10; // type:data rom:0xC9DF10
-func_80240000_C9DF20 = 0x80240000; // type:func rom:0xC9DF20
-func_80240040_C9DF60 = 0x80240040; // type:func rom:0xC9DF60
+flo_00_func_80240000_C9DF20 = 0x80240000; // type:func rom:0xC9DF20
+flo_00_func_80240040_C9DF60 = 0x80240040; // type:func rom:0xC9DF60
 flo_00_UnkFunc13 = 0x80240198; // type:func rom:0xC9E0B8
 flo_00_UnkNpcAIFunc1 = 0x80240440; // type:func rom:0xC9E360
 flo_00_UnkFunc14 = 0x80240500; // type:func rom:0xC9E420
-func_802406BC_C9E5DC = 0x802406BC; // type:func rom:0xC9E5DC
+flo_00_func_802406BC_C9E5DC = 0x802406BC; // type:func rom:0xC9E5DC
 flo_00_NpcJumpFunc2 = 0x80240770; // type:func rom:0xC9E690
 flo_00_NpcJumpFunc = 0x802407E4; // type:func rom:0xC9E704
 flo_00_UnkNpcAIFunc13 = 0x8024085C; // type:func rom:0xC9E77C
 flo_00_UnkFunc15 = 0x8024098C; // type:func rom:0xC9E8AC
 flo_00_UnkNpcDurationFlagFunc = 0x80240AAC; // type:func rom:0xC9E9CC
 flo_00_UnkFunc16 = 0x80240B14; // type:func rom:0xC9EA34
-func_80240BD4_C9EAF4 = 0x80240BD4; // type:func rom:0xC9EAF4
-PostChapter6StatUpdate = 0x80240ED0; // type:func rom:0xC9EDF0
-func_80240F10_C9EE30 = 0x80240F10; // type:func rom:0xC9EE30
-func_80240F80_C9EEA0 = 0x80240F80; // type:func rom:0xC9EEA0
-func_802410B4_C9EFD4 = 0x802410B4; // type:func rom:0xC9EFD4
+flo_00_func_80240BD4_C9EAF4 = 0x80240BD4; // type:func rom:0xC9EAF4
+flo_00_PostChapter6StatUpdate = 0x80240ED0; // type:func rom:0xC9EDF0
+flo_00_func_80240F10_C9EE30 = 0x80240F10; // type:func rom:0xC9EE30
+flo_00_func_80240F80_C9EEA0 = 0x80240F80; // type:func rom:0xC9EEA0
+flo_00_func_802410B4_C9EFD4 = 0x802410B4; // type:func rom:0xC9EFD4
 flo_00_UnkFloatFunc = 0x802411EC; // type:func rom:0xC9F10C
 flo_00_SyncStatusMenu = 0x8024137C; // type:func rom:0xC9F29C
-func_8024139C_C9F2BC = 0x8024139C; // type:func rom:0xC9F2BC
-func_802413BC_C9F2DC = 0x802413BC; // type:func rom:0xC9F2DC
+flo_00_func_8024139C_C9F2BC = 0x8024139C; // type:func rom:0xC9F2BC
+flo_00_func_802413BC_C9F2DC = 0x802413BC; // type:func rom:0xC9F2DC
+flo_00_entryList = 0x802413E0; // type:data rom:0xC9F300
+flo_00_config = 0x80241490; // type:data rom:0xC9F3B0
+flo_00_802414D0 = 0x802414D0; // type:data rom:0xC9F3F0
+flo_00_802416C0 = 0x802416C0; // type:data rom:0xC9F5E0
+flo_00_8024196C = 0x8024196C; // type:data rom:0xC9F88C
+flo_00_80241B90 = 0x80241B90; // type:data rom:0xC9FAB0
+flo_00_exitWalk_80241D7C = 0x80241D7C; // type:data rom:0xC9FC9C
+flo_00_exitWalk_80241DD8 = 0x80241DD8; // type:data rom:0xC9FCF8
+flo_00_exitWalk_80241E34 = 0x80241E34; // type:data rom:0xC9FD54
+flo_00_exitWalk_80241E90 = 0x80241E90; // type:data rom:0xC9FDB0
+flo_00_exitWalk_80241EEC = 0x80241EEC; // type:data rom:0xC9FE0C
+flo_00_exitWalk_80241F48 = 0x80241F48; // type:data rom:0xC9FE68
+flo_00_80241FA4 = 0x80241FA4; // type:data rom:0xC9FEC4
+flo_00_enterWalk_8024205C = 0x8024205C; // type:data rom:0xC9FF7C
+flo_00_main = 0x80242248; // type:data rom:0xCA0168
+flo_00_npcSettings_80242840 = 0x80242840; // type:data rom:0xCA0760
+flo_00_npcAISettings_8024286C = 0x8024286C; // type:data rom:0xCA078C
+flo_00_npcAI_8024289C = 0x8024289C; // type:data rom:0xCA07BC
+flo_00_npcSettings_802428BC = 0x802428BC; // type:data rom:0xCA07DC
+flo_00_npcSettings_802428E8 = 0x802428E8; // type:data rom:0xCA0808
+flo_00_npcSettings_80242914 = 0x80242914; // type:data rom:0xCA0834
+flo_00_npcSettings_80242940 = 0x80242940; // type:data rom:0xCA0860
+flo_00_npcSettings_8024296C = 0x8024296C; // type:data rom:0xCA088C
+flo_00_80242998 = 0x80242998; // type:data rom:0xCA08B8
+flo_00_80242AF0 = 0x80242AF0; // type:data rom:0xCA0A10
+flo_00_80242FCC = 0x80242FCC; // type:data rom:0xCA0EEC
+flo_00_80243368 = 0x80243368; // type:data rom:0xCA1288
+flo_00_init_80243474 = 0x80243474; // type:data rom:0xCA1394
+flo_00_interact_8024352C = 0x8024352C; // type:data rom:0xCA144C
+flo_00_interact_802436C0 = 0x802436C0; // type:data rom:0xCA15E0
+flo_00_interact_80243854 = 0x80243854; // type:data rom:0xCA1774
+flo_00_interact_802439E8 = 0x802439E8; // type:data rom:0xCA1908
+flo_00_init_80243B7C = 0x80243B7C; // type:data rom:0xCA1A9C
+flo_00_init_80243BB0 = 0x80243BB0; // type:data rom:0xCA1AD0
+flo_00_init_80243BE4 = 0x80243BE4; // type:data rom:0xCA1B04
+flo_00_init_80243C18 = 0x80243C18; // type:data rom:0xCA1B38
+flo_00_interact_80243C4C = 0x80243C4C; // type:data rom:0xCA1B6C
+flo_00_init_8024414C = 0x8024414C; // type:data rom:0xCA206C
+flo_00_idle_80244188 = 0x80244188; // type:data rom:0xCA20A8
+flo_00_8024427C = 0x8024427C; // type:data rom:0xCA219C
+flo_00_init_80244BF4 = 0x80244BF4; // type:data rom:0xCA2B14
+flo_00_interact_80244C98 = 0x80244C98; // type:data rom:0xCA2BB8
+flo_00_init_80244DD0 = 0x80244DD0; // type:data rom:0xCA2CF0
+flo_00_npcGroup_80244E64 = 0x80244E64; // type:data rom:0xCA2D84
+flo_00_npcGroup_80245054 = 0x80245054; // type:data rom:0xCA2F74
+flo_00_npcGroup_80245814 = 0x80245814; // type:data rom:0xCA3734
+flo_00_npcGroup_80245A04 = 0x80245A04; // type:data rom:0xCA3924
+flo_00_npcGroup_80245BF4 = 0x80245BF4; // type:data rom:0xCA3B14
+flo_00_npcGroupList_80245DE4 = 0x80245DE4; // type:data rom:0xCA3D04
+flo_00_npcSettings_80245E30 = 0x80245E30; // type:data rom:0xCA3D50
+flo_00_npcSettings_80245E5C = 0x80245E5C; // type:data rom:0xCA3D7C
+flo_00_D_80245E88_CA3DA8 = 0x80245E88; // type:data rom:0xCA3DA8
+flo_00_80245EB8 = 0x80245EB8; // type:data rom:0xCA3DD8
+flo_00_init_80246170 = 0x80246170; // type:data rom:0xCA4090
+flo_00_init_802461E4 = 0x802461E4; // type:data rom:0xCA4104
+flo_00_init_80246224 = 0x80246224; // type:data rom:0xCA4144
+flo_00_npcGroup_80246264 = 0x80246264; // type:data rom:0xCA4184
+flo_00_npcGroupList_80246834 = 0x80246834; // type:data rom:0xCA4754
+flo_00_80246850 = 0x80246850; // type:data rom:0xCA4770
+flo_00_80247488 = 0x80247488; // type:data rom:0xCA53A8
+flo_00_80247588 = 0x80247588; // type:data rom:0xCA54A8
+flo_00_802476F4 = 0x802476F4; // type:data rom:0xCA5614
+flo_00_80247770 = 0x80247770; // type:data rom:0xCA5690
+flo_00_802477EC = 0x802477EC; // type:data rom:0xCA570C
+flo_00_80247BCC = 0x80247BCC; // type:data rom:0xCA5AEC
+flo_00_80247FAC = 0x80247FAC; // type:data rom:0xCA5ECC
+flo_00_8024834C = 0x8024834C; // type:data rom:0xCA626C
+flo_00_itemList_80248598 = 0x80248598; // type:data rom:0xCA64B8
+flo_00_802485A8 = 0x802485A8; // type:data rom:0xCA64C8
+flo_00_80248D3C = 0x80248D3C; // type:data rom:0xCA6C5C
+flo_00_80248E30 = 0x80248E30; // type:data rom:0xCA6D50
+flo_00_80248F48 = 0x80248F48; // type:data rom:0xCA6E68
+flo_00_makeEntities = 0x80249130; // type:data rom:0xCA7050
+flo_00_pad_XXXX = 0x802491B8; // type:data rom:0xCA70D8
 D_802491C0_CA70E0 = 0x802491C0; // type:data rom:0xCA70E0
 D_802491C8_CA70E8 = 0x802491C8; // type:data rom:0xCA70E8
-func_80240000_CA72A0 = 0x80240000; // type:func rom:0xCA72A0
-func_80240040_CA72E0 = 0x80240040; // type:func rom:0xCA72E0
+flo_00_flo_07_name_hack = 0x80249360; // type:data rom:0xCA7280
+flo_00_pad_XXX = 0x80249368; // type:data rom:0xCA7288
+flo_00_sam_11_name_hack = 0x80249370; // type:data rom:0xCA7290
+flo_00_flo_19_name_hack = 0x80249378; // type:data rom:0xCA7298
+flo_03_func_80240000_CA72A0 = 0x80240000; // type:func rom:0xCA72A0
+flo_03_func_80240040_CA72E0 = 0x80240040; // type:func rom:0xCA72E0
 flo_03_GetItemName = 0x802400F4; // type:func rom:0xCA7394
-func_80240158_CA73F8 = 0x80240158; // type:func rom:0xCA73F8
+flo_03_func_80240158_CA73F8 = 0x80240158; // type:func rom:0xCA73F8
 flo_03_foliage_setup_shear_mtx = 0x802403F0; // type:func rom:0xCA7690
 flo_03_TransformFoliage = 0x80240460; // type:func rom:0xCA7700
-D_80240F08_CA81A8 = 0x80240F08; // type:data rom:0xCA81A8
+flo_03_entryList = 0x80240630; // type:data rom:0xCA78D0
+flo_03_config = 0x80240660; // type:data rom:0xCA7900
+flo_03_802406A0 = 0x802406A0; // type:data rom:0xCA7940
+flo_03_802407C0 = 0x802407C0; // type:data rom:0xCA7A60
+flo_03_80240814 = 0x80240814; // type:data rom:0xCA7AB4
+flo_03_80240880 = 0x80240880; // type:data rom:0xCA7B20
+flo_03_exitWalk_80240B2C = 0x80240B2C; // type:data rom:0xCA7DCC
+flo_03_exitWalk_80240B88 = 0x80240B88; // type:data rom:0xCA7E28
+flo_03_80240BE4 = 0x80240BE4; // type:data rom:0xCA7E84
+flo_03_main = 0x80240C2C; // type:data rom:0xCA7ECC
+flo_03_npcSettings_80240EB0 = 0x80240EB0; // type:data rom:0xCA8150
+flo_03_npcSettings_80240EDC = 0x80240EDC; // type:data rom:0xCA817C
+flo_03_D_80240F08_CA81A8 = 0x80240F08; // type:data rom:0xCA81A8
+flo_03_80240F0C = 0x80240F0C; // type:data rom:0xCA81AC
+flo_03_80240F3C = 0x80240F3C; // type:data rom:0xCA81DC
+flo_03_intTable_80240F6C = 0x80240F6C; // type:data rom:0xCA820C
+flo_03_intTable_80240F90 = 0x80240F90; // type:data rom:0xCA8230
+flo_03_intTable_80240FB4 = 0x80240FB4; // type:data rom:0xCA8254
+flo_03_intTable_80240FD8 = 0x80240FD8; // type:data rom:0xCA8278
+flo_03_80240FFC = 0x80240FFC; // type:data rom:0xCA829C
+flo_03_npcAI_8024119C = 0x8024119C; // type:data rom:0xCA843C
+flo_03_defeat_802411B8 = 0x802411B8; // type:data rom:0xCA8458
+flo_03_8024122C = 0x8024122C; // type:data rom:0xCA84CC
+flo_03_interact_802412BC = 0x802412BC; // type:data rom:0xCA855C
+flo_03_init_80241DA4 = 0x80241DA4; // type:data rom:0xCA9044
+flo_03_init_80241E10 = 0x80241E10; // type:data rom:0xCA90B0
+flo_03_80241EF4 = 0x80241EF4; // type:data rom:0xCA9194
+flo_03_defeat_80241F64 = 0x80241F64; // type:data rom:0xCA9204
+flo_03_hit_80242138 = 0x80242138; // type:data rom:0xCA93D8
+flo_03_idle_8024219C = 0x8024219C; // type:data rom:0xCA943C
+flo_03_idle_80242618 = 0x80242618; // type:data rom:0xCA98B8
+flo_03_idle_80242A94 = 0x80242A94; // type:data rom:0xCA9D34
+flo_03_idle_80242F10 = 0x80242F10; // type:data rom:0xCAA1B0
+flo_03_init_8024338C = 0x8024338C; // type:data rom:0xCAA62C
+flo_03_init_802434CC = 0x802434CC; // type:data rom:0xCAA76C
+flo_03_init_8024360C = 0x8024360C; // type:data rom:0xCAA8AC
+flo_03_init_8024374C = 0x8024374C; // type:data rom:0xCAA9EC
+flo_03_npcGroup_8024388C = 0x8024388C; // type:data rom:0xCAAB2C
+flo_03_npcGroup_80243A7C = 0x80243A7C; // type:data rom:0xCAAD1C
+flo_03_npcGroup_80243C6C = 0x80243C6C; // type:data rom:0xCAAF0C
+flo_03_npcGroup_80243E5C = 0x80243E5C; // type:data rom:0xCAB0FC
+flo_03_npcGroup_8024404C = 0x8024404C; // type:data rom:0xCAB2EC
+flo_03_npcGroup_8024423C = 0x8024423C; // type:data rom:0xCAB4DC
+flo_03_npcGroupList_8024442C = 0x8024442C; // type:data rom:0xCAB6CC
+flo_03_searchBush_80244480 = 0x80244480; // type:data rom:0xCAB720
+flo_03_shakeTree_802447E0 = 0x802447E0; // type:data rom:0xCABA80
+flo_03_treeModelList_Tree1_Leaves = 0x80244DE4; // type:data rom:0xCAC084
+flo_03_treeModelList_Tree1_Trunk = 0x80244DEC; // type:data rom:0xCAC08C
+flo_03_treeDropList_Tree1 = 0x80244DF4; // type:data rom:0xCAC094
+flo_03_shakeTreeEvent_Tree1 = 0x80244E30; // type:data rom:0xCAC0D0
+flo_03_triggerCoord_80244E44 = 0x80244E44; // type:data rom:0xCAC0E4
+flo_03_80244E54 = 0x80244E54; // type:data rom:0xCAC0F4
+flo_03_80244ED0 = 0x80244ED0; // type:data rom:0xCAC170
+flo_03_makeEntities = 0x80244EE0; // type:data rom:0xCAC180
 D_80244F48_CAC1E8 = 0x80244F48; // type:data rom:0xCAC1E8
 flo_07_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCAC1F0
 flo_07_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCAC314
 flo_07_SpawnSunEffect = 0x8024030C; // type:func rom:0xCAC4FC
-func_80240344_CAC534 = 0x80240344; // type:func rom:0xCAC534
+flo_07_func_80240344_CAC534 = 0x80240344; // type:func rom:0xCAC534
 flo_07_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xCAC5D0
 flo_07_TransformFoliage = 0x80240450; // type:func rom:0xCAC640
-func_8024061C_CAC80C = 0x8024061C; // type:func rom:0xCAC80C
+flo_07_func_8024061C_CAC80C = 0x8024061C; // type:func rom:0xCAC80C
 flo_07_GetItemName = 0x802406D0; // type:func rom:0xCAC8C0
-D_80241BB0_CADDA0 = 0x80241BB0; // type:data rom:0xCADDA0
+flo_07_entryList = 0x80240740; // type:data rom:0xCAC930
+flo_07_config = 0x80240760; // type:data rom:0xCAC950
+flo_07_802407A0 = 0x802407A0; // type:data rom:0xCAC990
+flo_07_8024086C = 0x8024086C; // type:data rom:0xCACA5C
+flo_07_80240890 = 0x80240890; // type:data rom:0xCACA80
+flo_07_updateTexturePan_802408D0 = 0x802408D0; // type:data rom:0xCACAC0
+flo_07_8024096C = 0x8024096C; // type:data rom:0xCACB5C
+flo_07_exitWalk_80240C18 = 0x80240C18; // type:data rom:0xCACE08
+flo_07_80240C74 = 0x80240C74; // type:data rom:0xCACE64
+flo_07_main = 0x80240CA0; // type:data rom:0xCACE90
+flo_07_npcSettings_80241220 = 0x80241220; // type:data rom:0xCAD410
+flo_07_searchBush_8024124C = 0x8024124C; // type:data rom:0xCAD43C
+flo_07_shakeTree_802415AC = 0x802415AC; // type:data rom:0xCAD79C
+flo_07_D_80241BB0_CADDA0 = 0x80241BB0; // type:data rom:0xCADDA0
+flo_07_80241BB4 = 0x80241BB4; // type:data rom:0xCADDA4
+flo_07_80241BE4 = 0x80241BE4; // type:data rom:0xCADDD4
+flo_07_80241C14 = 0x80241C14; // type:data rom:0xCADE04
+flo_07_80241D6C = 0x80241D6C; // type:data rom:0xCADF5C
+flo_07_80241DBC = 0x80241DBC; // type:data rom:0xCADFAC
+flo_07_interact_80242044 = 0x80242044; // type:data rom:0xCAE234
+flo_07_init_80242428 = 0x80242428; // type:data rom:0xCAE618
+flo_07_802424F4 = 0x802424F4; // type:data rom:0xCAE6E4
+flo_07_tree1_Callback = 0x802425F8; // type:data rom:0xCAE7E8
+flo_07_treeModelList_Tree1_Leaves = 0x80242888; // type:data rom:0xCAEA78
+flo_07_treeModelList_Tree1_Trunk = 0x80242898; // type:data rom:0xCAEA88
+flo_07_shakeTreeEvent_Tree1 = 0x802428A0; // type:data rom:0xCAEA90
+flo_07_triggerCoord_802428B4 = 0x802428B4; // type:data rom:0xCAEAA4
+flo_07_802428C4 = 0x802428C4; // type:data rom:0xCAEAB4
+flo_07_npcGroup_8024291C = 0x8024291C; // type:data rom:0xCAEB0C
+flo_07_npcGroupList_80242B0C = 0x80242B0C; // type:data rom:0xCAECFC
+flo_07_flo_25_name_hack = 0x80242B40; // type:data rom:0xCAED30
 flo_08_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xCAED40
 flo_08_UnkFunc17 = 0x8024001C; // type:func rom:0xCAED5C
-func_8024003C_CAED7C = 0x8024003C; // type:func rom:0xCAED7C
+flo_08_func_8024003C_CAED7C = 0x8024003C; // type:func rom:0xCAED7C
 flo_08_UnkFunc18 = 0x80240068; // type:func rom:0xCAEDA8
-func_802400D4_CAEE14 = 0x802400D4; // type:func rom:0xCAEE14
-func_80240120_CAEE60 = 0x80240120; // type:func rom:0xCAEE60
-func_802401CC_CAEF0C = 0x802401CC; // type:func rom:0xCAEF0C
-func_8024041C_CAF15C = 0x8024041C; // type:func rom:0xCAF15C
+flo_08_UnkFunc37 = 0x802400D4; // type:func rom:0xCAEE14
+flo_08_UnkFunc38 = 0x80240120; // type:func rom:0xCAEE60
+flo_08_func_802401CC_CAEF0C = 0x802401CC; // type:func rom:0xCAEF0C
+flo_08_func_8024041C_CAF15C = 0x8024041C; // type:func rom:0xCAF15C
 flo_08_UnkFunc19 = 0x80240448; // type:func rom:0xCAF188
 flo_08_UnkFunc20 = 0x80240480; // type:func rom:0xCAF1C0
-func_80240510_CAF250 = 0x80240510; // type:func rom:0xCAF250
+flo_08_UnkFunc39 = 0x80240510; // type:func rom:0xCAF250
 flo_08_UnkFunc21 = 0x80240544; // type:func rom:0xCAF284
 flo_08_UnkFunc22 = 0x802405A8; // type:func rom:0xCAF2E8
-func_80240600_CAF340 = 0x80240600; // type:func rom:0xCAF340
+flo_08_func_80240600_CAF340 = 0x80240600; // type:func rom:0xCAF340
 flo_08_UnkFunc23 = 0x80240B38; // type:func rom:0xCAF878
 flo_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xCAF9B8
 flo_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xCAFA00
-func_80240D08_CAFA48 = 0x80240D08; // type:func rom:0xCAFA48
-func_80240D40_CAFA80 = 0x80240D40; // type:func rom:0xCAFA80
-func_80240D80_CAFAC0 = 0x80240D80; // type:func rom:0xCAFAC0
-func_80241364_CB00A4 = 0x80241364; // type:func rom:0xCB00A4
-func_802414C8_CB0208 = 0x802414C8; // type:func rom:0xCB0208
-func_8024150C_CB024C = 0x8024150C; // type:func rom:0xCB024C
+flo_08_UnkFunc40 = 0x80240D08; // type:func rom:0xCAFA48
+flo_08_func_80240D40_CAFA80 = 0x80240D40; // type:func rom:0xCAFA80
+flo_08_func_80240D80_CAFAC0 = 0x80240D80; // type:func rom:0xCAFAC0
+flo_08_func_80241364_CB00A4 = 0x80241364; // type:func rom:0xCB00A4
+flo_08_func_802414C8_CB0208 = 0x802414C8; // type:func rom:0xCB0208
+flo_08_func_8024150C_CB024C = 0x8024150C; // type:func rom:0xCB024C
 flo_08_GetNpcCollisionHeight = 0x80241744; // type:func rom:0xCB0484
 flo_08_AddPlayerHandsOffset = 0x802417A0; // type:func rom:0xCB04E0
-func_80241970_CB06B0 = 0x80241970; // type:func rom:0xCB06B0
-func_802419C4_CB0704 = 0x802419C4; // type:func rom:0xCB0704
-func_802419FC_CB073C = 0x802419FC; // type:func rom:0xCB073C
-func_80241A98_CB07D8 = 0x80241A98; // type:func rom:0xCB07D8
-func_80241B5C_CB089C = 0x80241B5C; // type:func rom:0xCB089C
-func_80241BCC_CB090C = 0x80241BCC; // type:func rom:0xCB090C
+flo_08_func_80241970_CB06B0 = 0x80241970; // type:func rom:0xCB06B0
+flo_08_func_802419C4_CB0704 = 0x802419C4; // type:func rom:0xCB0704
+flo_08_func_802419FC_CB073C = 0x802419FC; // type:func rom:0xCB073C
+flo_08_func_80241A98_CB07D8 = 0x80241A98; // type:func rom:0xCB07D8
+flo_08_func_80241B5C_CB089C = 0x80241B5C; // type:func rom:0xCB089C
+flo_08_func_80241BCC_CB090C = 0x80241BCC; // type:func rom:0xCB090C
 flo_08_foliage_setup_shear_mtx = 0x80241C00; // type:func rom:0xCB0940
 flo_08_TransformFoliage = 0x80241C70; // type:func rom:0xCB09B0
-func_80241E40_CB0B80 = 0x80241E40; // type:func rom:0xCB0B80
-D_80241FB0_CB0CF0 = 0x80241FB0; // type:data rom:0xCB0CF0
-D_80241FB8_CB0CF8 = 0x80241FB8; // type:data rom:0xCB0CF8
-D_80241FC8_CB0D08 = 0x80241FC8; // type:data rom:0xCB0D08
-D_80242008_CB0D48 = 0x80242008; // type:data rom:0xCB0D48
-D_80243088_CB1DC8 = 0x80243088; // type:data rom:0xCB1DC8
-D_8024308C_CB1DCC = 0x8024308C; // type:data rom:0xCB1DCC
-func_80240000_CB5000 = 0x80240000; // type:func rom:0xCB5000
-func_80240040_CB5040 = 0x80240040; // type:func rom:0xCB5040
+flo_08_UnkFunc43 = 0x80241E40; // type:func rom:0xCB0B80
+flo_08_entryList = 0x80241EE0; // type:data rom:0xCB0C20
+flo_08_config = 0x80241F00; // type:data rom:0xCB0C40
+flo_08_80241F40 = 0x80241F40; // type:data rom:0xCB0C80
+flo_08_D_80241FB0_CB0CF0 = 0x80241FB0; // type:data rom:0xCB0CF0
+flo_08_D_80241FB8_CB0CF8 = 0x80241FB8; // type:data rom:0xCB0CF8
+flo_08_D_80241FC8_CB0D08 = 0x80241FC8; // type:data rom:0xCB0D08
+flo_08_D_80242008_CB0D48 = 0x80242008; // type:data rom:0xCB0D48
+flo_08_80242014 = 0x80242014; // type:data rom:0xCB0D54
+flo_08_80242178 = 0x80242178; // type:data rom:0xCB0EB8
+flo_08_makeEntities = 0x802425F8; // type:data rom:0xCB1338
+flo_08_80242680 = 0x80242680; // type:data rom:0xCB13C0
+flo_08_exitWalk_8024292C = 0x8024292C; // type:data rom:0xCB166C
+flo_08_exitWalk_80242988 = 0x80242988; // type:data rom:0xCB16C8
+flo_08_802429E4 = 0x802429E4; // type:data rom:0xCB1724
+flo_08_lavaResetList_80242A2C = 0x80242A2C; // type:data rom:0xCB176C
+flo_08_main = 0x80242A6C; // type:data rom:0xCB17AC
+flo_08_npcAISettings_80242EB0 = 0x80242EB0; // type:data rom:0xCB1BF0
+flo_08_npcAI_80242EE0 = 0x80242EE0; // type:data rom:0xCB1C20
+flo_08_80242F00 = 0x80242F00; // type:data rom:0xCB1C40
+flo_08_npcSettings_80242FB4 = 0x80242FB4; // type:data rom:0xCB1CF4
+flo_08_npcSettings_80242FE0 = 0x80242FE0; // type:data rom:0xCB1D20
+flo_08_npcAISettings_8024300C = 0x8024300C; // type:data rom:0xCB1D4C
+flo_08_npcAI_8024303C = 0x8024303C; // type:data rom:0xCB1D7C
+flo_08_npcSettings_8024305C = 0x8024305C; // type:data rom:0xCB1D9C
+flo_08_D_80243088_CB1DC8 = 0x80243088; // type:data rom:0xCB1DC8
+flo_08_D_8024308C_CB1DCC = 0x8024308C; // type:data rom:0xCB1DCC
+flo_08_80243090 = 0x80243090; // type:data rom:0xCB1DD0
+flo_08_802431C4 = 0x802431C4; // type:data rom:0xCB1F04
+flo_08_interact_80243214 = 0x80243214; // type:data rom:0xCB1F54
+flo_08_init_80243B20 = 0x80243B20; // type:data rom:0xCB2860
+flo_08_npcGroup_80243C48 = 0x80243C48; // type:data rom:0xCB2988
+flo_08_npcGroup_80243E38 = 0x80243E38; // type:data rom:0xCB2B78
+flo_08_npcGroup_80244028 = 0x80244028; // type:data rom:0xCB2D68
+flo_08_npcGroup_80244218 = 0x80244218; // type:data rom:0xCB2F58
+flo_08_npcGroup_80244408 = 0x80244408; // type:data rom:0xCB3148
+flo_08_npcGroup_802445F8 = 0x802445F8; // type:data rom:0xCB3338
+flo_08_npcGroup_802447E8 = 0x802447E8; // type:data rom:0xCB3528
+flo_08_npcGroup_802449D8 = 0x802449D8; // type:data rom:0xCB3718
+flo_08_init_80244BC8 = 0x80244BC8; // type:data rom:0xCB3908
+flo_08_npcGroup_80244CD4 = 0x80244CD4; // type:data rom:0xCB3A14
+flo_08_npcGroupList_80244EC4 = 0x80244EC4; // type:data rom:0xCB3C04
+flo_08_searchBush_80244F40 = 0x80244F40; // type:data rom:0xCB3C80
+flo_08_shakeTree_802452A0 = 0x802452A0; // type:data rom:0xCB3FE0
+flo_08_treeModelList_Tree1_Leaves = 0x802458A4; // type:data rom:0xCB45E4
+flo_08_treeModelList_Tree1_Trunk = 0x802458AC; // type:data rom:0xCB45EC
+flo_08_treeDropList_Tree1 = 0x802458B4; // type:data rom:0xCB45F4
+flo_08_shakeTreeEvent_Tree1 = 0x802458F0; // type:data rom:0xCB4630
+flo_08_triggerCoord_80245904 = 0x80245904; // type:data rom:0xCB4644
+flo_08_80245914 = 0x80245914; // type:data rom:0xCB4654
+flo_08_80245990 = 0x80245990; // type:data rom:0xCB46D0
+flo_08_80245C3C = 0x80245C3C; // type:data rom:0xCB497C
+flo_08_80245F5C = 0x80245F5C; // type:data rom:0xCB4C9C
+flo_09_func_80240000_CB5000 = 0x80240000; // type:func rom:0xCB5000
+flo_09_UnkFunc43 = 0x80240040; // type:func rom:0xCB5040
 flo_09_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xCB50E0
 flo_09_TransformFoliage = 0x80240150; // type:func rom:0xCB5150
-func_80240320_CB5320 = 0x80240320; // type:func rom:0xCB5320
-func_802404D0_CB54D0 = 0x802404D0; // type:func rom:0xCB54D0
+flo_09_func_80240320_CB5320 = 0x80240320; // type:func rom:0xCB5320
+flo_09_func_802404D0_CB54D0 = 0x802404D0; // type:func rom:0xCB54D0
 flo_09_UnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xCB5AF8
 flo_09_UnkFunc4 = 0x80240BB8; // type:func rom:0xCB5BB8
 flo_09_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xCB5EFC
-func_80240F74_CB5F74 = 0x80240F74; // type:func rom:0xCB5F74
+flo_09_func_80240F74_CB5F74 = 0x80240F74; // type:func rom:0xCB5F74
 flo_09_UnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xCB5FE0
 flo_09_UnkNpcAIFunc3 = 0x80241114; // type:func rom:0xCB6114
 flo_09_UnkFunc6 = 0x80241178; // type:func rom:0xCB6178
 flo_09_UnkFunc5 = 0x80241508; // type:func rom:0xCB6508
-func_8024162C_CB662C = 0x8024162C; // type:func rom:0xCB662C
-D_8024362C_CB862C = 0x8024362C; // type:data rom:0xCB862C
+flo_09_func_8024162C_CB662C = 0x8024162C; // type:func rom:0xCB662C
+flo_09_entryList = 0x80241820; // type:data rom:0xCB6820
+flo_09_config = 0x80241840; // type:data rom:0xCB6840
+flo_09_80241880 = 0x80241880; // type:data rom:0xCB6880
+flo_09_802418F0 = 0x802418F0; // type:data rom:0xCB68F0
+flo_09_exitWalk_80241B9C = 0x80241B9C; // type:data rom:0xCB6B9C
+flo_09_exitWalk_80241BF8 = 0x80241BF8; // type:data rom:0xCB6BF8
+flo_09_80241C54 = 0x80241C54; // type:data rom:0xCB6C54
+flo_09_main = 0x80241C9C; // type:data rom:0xCB6C9C
+flo_09_80242010 = 0x80242010; // type:data rom:0xCB7010
+flo_09_802422BC = 0x802422BC; // type:data rom:0xCB72BC
+flo_09_802425DC = 0x802425DC; // type:data rom:0xCB75DC
+flo_09_searchBush_80242880 = 0x80242880; // type:data rom:0xCB7880
+flo_09_shakeTree_80242BE0 = 0x80242BE0; // type:data rom:0xCB7BE0
+flo_09_802431E4 = 0x802431E4; // type:data rom:0xCB81E4
+flo_09_tree1_Callback = 0x80243264; // type:data rom:0xCB8264
+flo_09_tree2_Callback = 0x8024330C; // type:data rom:0xCB830C
+flo_09_tree3_Callback = 0x80243354; // type:data rom:0xCB8354
+flo_09_treeModelList_Tree1_Leaves = 0x80243400; // type:data rom:0xCB8400
+flo_09_treeModelList_Tree1_Trunk = 0x8024340C; // type:data rom:0xCB840C
+flo_09_shakeTreeEvent_Tree1 = 0x80243414; // type:data rom:0xCB8414
+flo_09_triggerCoord_80243428 = 0x80243428; // type:data rom:0xCB8428
+flo_09_treeModelList_Tree2_Leaves = 0x80243438; // type:data rom:0xCB8438
+flo_09_treeModelList_Tree2_Trunk = 0x80243444; // type:data rom:0xCB8444
+flo_09_shakeTreeEvent_Tree2 = 0x8024344C; // type:data rom:0xCB844C
+flo_09_triggerCoord_80243460 = 0x80243460; // type:data rom:0xCB8460
+flo_09_treeModelList_Tree3_Leaves = 0x80243470; // type:data rom:0xCB8470
+flo_09_treeModelList_Tree3_Trunk = 0x8024347C; // type:data rom:0xCB847C
+flo_09_shakeTreeEvent_Tree3 = 0x80243484; // type:data rom:0xCB8484
+flo_09_triggerCoord_80243498 = 0x80243498; // type:data rom:0xCB8498
+flo_09_802434A8 = 0x802434A8; // type:data rom:0xCB84A8
+flo_09_npcAISettings_802435B0 = 0x802435B0; // type:data rom:0xCB85B0
+flo_09_npcAI_802435E0 = 0x802435E0; // type:data rom:0xCB85E0
+flo_09_npcSettings_80243600 = 0x80243600; // type:data rom:0xCB8600
+flo_09_D_8024362C_CB862C = 0x8024362C; // type:data rom:0xCB862C
+flo_09_npcAISettings_80243644 = 0x80243644; // type:data rom:0xCB8644
+flo_09_npcAI_80243674 = 0x80243674; // type:data rom:0xCB8674
+flo_09_npcSettings_802436E4 = 0x802436E4; // type:data rom:0xCB86E4
+flo_09_npcSettings_80243710 = 0x80243710; // type:data rom:0xCB8710
+flo_09_npcAI_8024373C = 0x8024373C; // type:data rom:0xCB873C
+flo_09_defeat_802438C8 = 0x802438C8; // type:data rom:0xCB88C8
+flo_09_init_80243954 = 0x80243954; // type:data rom:0xCB8954
+flo_09_npcGroup_8024398C = 0x8024398C; // type:data rom:0xCB898C
+flo_09_npcGroup_80243B7C = 0x80243B7C; // type:data rom:0xCB8B7C
+flo_09_npcGroup_80243D6C = 0x80243D6C; // type:data rom:0xCB8D6C
+flo_09_npcGroup_80243F5C = 0x80243F5C; // type:data rom:0xCB8F5C
+flo_09_npcGroupList_8024414C = 0x8024414C; // type:data rom:0xCB914C
 D_802441A0_CB91A0 = 0x802441A0; // type:data rom:0xCB91A0
 D_802441A8_CB91A8 = 0x802441A8; // type:data rom:0xCB91A8
 D_802441B0_CB91B0 = 0x802441B0; // type:data rom:0xCB91B0
-func_80240000_CB9200 = 0x80240000; // type:func rom:0xCB9200
-func_80240040_CB9240 = 0x80240040; // type:func rom:0xCB9240
-func_80240080_CB9280 = 0x80240080; // type:func rom:0xCB9280
+flo_10_func_80240000_CB9200 = 0x80240000; // type:func rom:0xCB9200
+flo_10_func_80240040_CB9240 = 0x80240040; // type:func rom:0xCB9240
+flo_10_func_80240080_CB9280 = 0x80240080; // type:func rom:0xCB9280
 flo_10_GetItemName = 0x80240134; // type:func rom:0xCB9334
 flo_10_UnkTexturePanFunc = 0x80240198; // type:func rom:0xCB9398
 flo_10_UnkTexturePanFunc2 = 0x802402BC; // type:func rom:0xCB94BC
-func_802404B0_CB96B0 = 0x802404B0; // type:func rom:0xCB96B0
-func_80240A98_CB9C98 = 0x80240A98; // type:func rom:0xCB9C98
+flo_10_func_802404B0_CB96B0 = 0x802404B0; // type:func rom:0xCB96B0
+flo_10_func_80240A98_CB9C98 = 0x80240A98; // type:func rom:0xCB9C98
 flo_10_foliage_setup_shear_mtx = 0x80241230; // type:func rom:0xCBA430
 flo_10_TransformFoliage = 0x802412A0; // type:func rom:0xCBA4A0
-D_80241CB0_CBAEB0 = 0x80241CB0; // type:data rom:0xCBAEB0
-D_80244070_CBD270 = 0x80244070; // type:data rom:0xCBD270
+flo_10_entryList = 0x80241470; // type:data rom:0xCBA670
+flo_10_config = 0x802414A0; // type:data rom:0xCBA6A0
+flo_10_802414E0 = 0x802414E0; // type:data rom:0xCBA6E0
+flo_10_802415C4 = 0x802415C4; // type:data rom:0xCBA7C4
+flo_10_802415E8 = 0x802415E8; // type:data rom:0xCBA7E8
+flo_10_80241630 = 0x80241630; // type:data rom:0xCBA830
+flo_10_80241680 = 0x80241680; // type:data rom:0xCBA880
+flo_10_exitWalk_8024192C = 0x8024192C; // type:data rom:0xCBAB2C
+flo_10_80241988 = 0x80241988; // type:data rom:0xCBAB88
+flo_10_main = 0x802419B4; // type:data rom:0xCBABB4
+flo_10_D_80241CB0_CBAEB0 = 0x80241CB0; // type:data rom:0xCBAEB0
+flo_10_80241CB4 = 0x80241CB4; // type:data rom:0xCBAEB4
+flo_10_80241CE4 = 0x80241CE4; // type:data rom:0xCBAEE4
+flo_10_updateTexturePan_80241D14 = 0x80241D14; // type:data rom:0xCBAF14
+flo_10_80241DB0 = 0x80241DB0; // type:data rom:0xCBAFB0
+flo_10_80241E40 = 0x80241E40; // type:data rom:0xCBB040
+flo_10_80241F20 = 0x80241F20; // type:data rom:0xCBB120
+flo_10_80242030 = 0x80242030; // type:data rom:0xCBB230
+flo_10_8024206C = 0x8024206C; // type:data rom:0xCBB26C
+flo_10_80242188 = 0x80242188; // type:data rom:0xCBB388
+flo_10_8024230C = 0x8024230C; // type:data rom:0xCBB50C
+flo_10_802423E4 = 0x802423E4; // type:data rom:0xCBB5E4
+flo_10_8024244C = 0x8024244C; // type:data rom:0xCBB64C
+flo_10_802424DC = 0x802424DC; // type:data rom:0xCBB6DC
+flo_10_802425BC = 0x802425BC; // type:data rom:0xCBB7BC
+flo_10_802425E4 = 0x802425E4; // type:data rom:0xCBB7E4
+flo_10_802427EC = 0x802427EC; // type:data rom:0xCBB9EC
+flo_10_80242AE8 = 0x80242AE8; // type:data rom:0xCBBCE8
+flo_10_npcSettings_80243220 = 0x80243220; // type:data rom:0xCBC420
+flo_10_8024324C = 0x8024324C; // type:data rom:0xCBC44C
+flo_10_itemList_80243394 = 0x80243394; // type:data rom:0xCBC594
+flo_10_8024339C = 0x8024339C; // type:data rom:0xCBC59C
+flo_10_802435F8 = 0x802435F8; // type:data rom:0xCBC7F8
+flo_10_80243628 = 0x80243628; // type:data rom:0xCBC828
+flo_10_interact_802437C8 = 0x802437C8; // type:data rom:0xCBC9C8
+flo_10_init_80243D78 = 0x80243D78; // type:data rom:0xCBCF78
+flo_10_npcGroup_80243E64 = 0x80243E64; // type:data rom:0xCBD064
+flo_10_npcGroupList_80244054 = 0x80244054; // type:data rom:0xCBD254
+flo_10_D_80244070_CBD270 = 0x80244070; // type:data rom:0xCBD270
+flo_10_80244074 = 0x80244074; // type:data rom:0xCBD274
+flo_10_searchBush_80244090 = 0x80244090; // type:data rom:0xCBD290
+flo_10_shakeTree_802443F0 = 0x802443F0; // type:data rom:0xCBD5F0
+flo_10_treeModelList_Tree1_Leaves = 0x802449F4; // type:data rom:0xCBDBF4
+flo_10_treeModelList_Tree1_Trunk = 0x80244A04; // type:data rom:0xCBDC04
+flo_10_treeDropList_Tree1 = 0x80244A0C; // type:data rom:0xCBDC0C
+flo_10_shakeTreeEvent_Tree1 = 0x80244A2C; // type:data rom:0xCBDC2C
+flo_10_triggerCoord_80244A40 = 0x80244A40; // type:data rom:0xCBDC40
+flo_10_80244A50 = 0x80244A50; // type:data rom:0xCBDC50
+flo_10_flo_24_name_hack = 0x80244AB8; // type:data rom:0xCBDCB8
 flo_11_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xCBDCD0
 flo_11_GetCurrentFloor = 0x80240020; // type:func rom:0xCBDCF0
-func_80240034_CBDD04 = 0x80240034; // type:func rom:0xCBDD04
+flo_11_UnkFunc25 = 0x80240034; // type:func rom:0xCBDD04
 flo_11_GetEntryPos = 0x802400F0; // type:func rom:0xCBDDC0
 flo_11_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xCBDEA0
 flo_11_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xCBDF0C
-func_802402E0_CBDFB0 = 0x802402E0; // type:func rom:0xCBDFB0
-func_80240000_CC0E30 = 0x80240000; // type:func rom:0xCC0E30
+flo_11_func_802402E0_CBDFB0 = 0x802402E0; // type:func rom:0xCBDFB0
+flo_11_entryList = 0x80240320; // type:data rom:0xCBDFF0
+flo_11_config = 0x802403A0; // type:data rom:0xCBE070
+flo_11_802403E0 = 0x802403E0; // type:data rom:0xCBE0B0
+flo_11_80240450 = 0x80240450; // type:data rom:0xCBE120
+flo_11_802406FC = 0x802406FC; // type:data rom:0xCBE3CC
+flo_11_80240A50 = 0x80240A50; // type:data rom:0xCBE720
+flo_11_80240E40 = 0x80240E40; // type:data rom:0xCBEB10
+flo_11_80240F1C = 0x80240F1C; // type:data rom:0xCBEBEC
+flo_11_802410F8 = 0x802410F8; // type:data rom:0xCBEDC8
+flo_11_exitWalk_8024142C = 0x8024142C; // type:data rom:0xCBF0FC
+flo_11_exitWalk_80241488 = 0x80241488; // type:data rom:0xCBF158
+flo_11_802414E4 = 0x802414E4; // type:data rom:0xCBF1B4
+flo_11_80241520 = 0x80241520; // type:data rom:0xCBF1F0
+flo_11_8024155C = 0x8024155C; // type:data rom:0xCBF22C
+flo_11_80241598 = 0x80241598; // type:data rom:0xCBF268
+flo_11_802415D4 = 0x802415D4; // type:data rom:0xCBF2A4
+flo_11_80241610 = 0x80241610; // type:data rom:0xCBF2E0
+flo_11_8024164C = 0x8024164C; // type:data rom:0xCBF31C
+flo_11_80241698 = 0x80241698; // type:data rom:0xCBF368
+flo_11_main = 0x802418A8; // type:data rom:0xCBF578
+flo_11_npcSettings_80241AC0 = 0x80241AC0; // type:data rom:0xCBF790
+flo_11_vectorList_80241AEC = 0x80241AEC; // type:data rom:0xCBF7BC
+flo_11_vectorList_80241B4C = 0x80241B4C; // type:data rom:0xCBF81C
+flo_11_vectorList_80241BAC = 0x80241BAC; // type:data rom:0xCBF87C
+flo_11_vectorList_80241BDC = 0x80241BDC; // type:data rom:0xCBF8AC
+flo_11_vectorList_80241C0C = 0x80241C0C; // type:data rom:0xCBF8DC
+flo_11_vectorList_80241C30 = 0x80241C30; // type:data rom:0xCBF900
+flo_11_vectorList_80241C54 = 0x80241C54; // type:data rom:0xCBF924
+flo_11_vectorList_80241C84 = 0x80241C84; // type:data rom:0xCBF954
+flo_11_80241CB4 = 0x80241CB4; // type:data rom:0xCBF984
+flo_11_80241CF4 = 0x80241CF4; // type:data rom:0xCBF9C4
+flo_11_80241E4C = 0x80241E4C; // type:data rom:0xCBFB1C
+flo_11_80241F80 = 0x80241F80; // type:data rom:0xCBFC50
+flo_11_802420C8 = 0x802420C8; // type:data rom:0xCBFD98
+flo_11_80242240 = 0x80242240; // type:data rom:0xCBFF10
+flo_11_idle_80242810 = 0x80242810; // type:data rom:0xCC04E0
+flo_11_defeat_802428B8 = 0x802428B8; // type:data rom:0xCC0588
+flo_11_defeat_80242AC4 = 0x80242AC4; // type:data rom:0xCC0794
+flo_11_init_80242B58 = 0x80242B58; // type:data rom:0xCC0828
+flo_11_init_80242C38 = 0x80242C38; // type:data rom:0xCC0908
+flo_11_npcGroup_80242CF4 = 0x80242CF4; // type:data rom:0xCC09C4
+flo_11_npcGroupList_802430D4 = 0x802430D4; // type:data rom:0xCC0DA4
+flo_11_makeEntities = 0x802430F0; // type:data rom:0xCC0DC0
+flo_12_func_80240000_CC0E30 = 0x80240000; // type:func rom:0xCC0E30
 flo_12_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xCC0E70
 flo_12_TransformFoliage = 0x802400B0; // type:func rom:0xCC0EE0
-func_8024027C_CC10AC = 0x8024027C; // type:func rom:0xCC10AC
+flo_12_func_8024027C_CC10AC = 0x8024027C; // type:func rom:0xCC10AC
 flo_12_GetItemName = 0x80240330; // type:func rom:0xCC1160
 flo_12_GetNpcCollisionHeight = 0x80240394; // type:func rom:0xCC11C4
 flo_12_AddPlayerHandsOffset = 0x802403F0; // type:func rom:0xCC1220
-func_802405C0_CC13F0 = 0x802405C0; // type:func rom:0xCC13F0
-func_80240614_CC1444 = 0x80240614; // type:func rom:0xCC1444
-func_8024064C_CC147C = 0x8024064C; // type:func rom:0xCC147C
-D_802417EC_CC261C = 0x802417EC; // type:data rom:0xCC261C
-D_80241850_CC2680 = 0x80241850; // type:data rom:0xCC2680
-D_80241854_CC2684 = 0x80241854; // type:data rom:0xCC2684
-func_80240000_CC3810 = 0x80240000; // type:func rom:0xCC3810
-func_80240040_CC3850 = 0x80240040; // type:func rom:0xCC3850
-func_802401C4_CC39D4 = 0x802401C4; // type:func rom:0xCC39D4
-func_80240374_CC3B84 = 0x80240374; // type:func rom:0xCC3B84
+flo_12_func_802405C0_CC13F0 = 0x802405C0; // type:func rom:0xCC13F0
+flo_12_func_80240614_CC1444 = 0x80240614; // type:func rom:0xCC1444
+flo_12_func_8024064C_CC147C = 0x8024064C; // type:func rom:0xCC147C
+flo_12_entryList = 0x802406F0; // type:data rom:0xCC1520
+flo_12_config = 0x80240710; // type:data rom:0xCC1540
+flo_12_80240750 = 0x80240750; // type:data rom:0xCC1580
+flo_12_8024080C = 0x8024080C; // type:data rom:0xCC163C
+flo_12_80240830 = 0x80240830; // type:data rom:0xCC1660
+flo_12_80240870 = 0x80240870; // type:data rom:0xCC16A0
+flo_12_exitWalk_80240B1C = 0x80240B1C; // type:data rom:0xCC194C
+flo_12_80240B78 = 0x80240B78; // type:data rom:0xCC19A8
+flo_12_main = 0x80240BA4; // type:data rom:0xCC19D4
+flo_12_npcSettings_80240E30 = 0x80240E30; // type:data rom:0xCC1C60
+flo_12_npcSettings_80240E5C = 0x80240E5C; // type:data rom:0xCC1C8C
+flo_12_searchBush_80240E88 = 0x80240E88; // type:data rom:0xCC1CB8
+flo_12_shakeTree_802411E8 = 0x802411E8; // type:data rom:0xCC2018
+flo_12_D_802417EC_CC261C = 0x802417EC; // type:data rom:0xCC261C
+flo_12_802417F0 = 0x802417F0; // type:data rom:0xCC2620
+flo_12_80241820 = 0x80241820; // type:data rom:0xCC2650
+flo_12_D_80241850_CC2680 = 0x80241850; // type:data rom:0xCC2680
+flo_12_D_80241854_CC2684 = 0x80241854; // type:data rom:0xCC2684
+flo_12_80241858 = 0x80241858; // type:data rom:0xCC2688
+flo_12_8024199C = 0x8024199C; // type:data rom:0xCC27CC
+flo_12_D_802419EC_CC281C = 0x802419EC; // type:data rom:0xCC281C
+flo_12_802419F4 = 0x802419F4; // type:data rom:0xCC2824
+flo_12_80241B6C = 0x80241B6C; // type:data rom:0xCC299C
+flo_12_80241BE4 = 0x80241BE4; // type:data rom:0xCC2A14
+flo_12_interact_80241C8C = 0x80241C8C; // type:data rom:0xCC2ABC
+flo_12_init_802423D0 = 0x802423D0; // type:data rom:0xCC3200
+flo_12_npcGroup_802425D8 = 0x802425D8; // type:data rom:0xCC3408
+flo_12_npcGroupList_802429B8 = 0x802429B8; // type:data rom:0xCC37E8
+flo_13_func_80240000_CC3810 = 0x80240000; // type:func rom:0xCC3810
+flo_13_UnkFunc41 = 0x80240040; // type:func rom:0xCC3850
+flo_13_func_802401C4_CC39D4 = 0x802401C4; // type:func rom:0xCC39D4
+flo_13_func_80240374_CC3B84 = 0x80240374; // type:func rom:0xCC3B84
 flo_13_UnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xCC41AC
 flo_13_UnkFunc4 = 0x80240A5C; // type:func rom:0xCC426C
 flo_13_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xCC45B0
-func_80240E18_CC4628 = 0x80240E18; // type:func rom:0xCC4628
+flo_13_func_80240E18_CC4628 = 0x80240E18; // type:func rom:0xCC4628
 flo_13_UnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xCC4694
 flo_13_UnkNpcAIFunc3 = 0x80240FB8; // type:func rom:0xCC47C8
 flo_13_UnkFunc6 = 0x8024101C; // type:func rom:0xCC482C
 flo_13_UnkFunc5 = 0x802413AC; // type:func rom:0xCC4BBC
-func_802414D0_CC4CE0 = 0x802414D0; // type:func rom:0xCC4CE0
-func_802416BC_CC4ECC = 0x802416BC; // type:func rom:0xCC4ECC
-func_80241704_CC4F14 = 0x80241704; // type:func rom:0xCC4F14
-func_80241B68_CC5378 = 0x80241B68; // type:func rom:0xCC5378
-func_80241DB8_CC55C8 = 0x80241DB8; // type:func rom:0xCC55C8
+flo_13_func_802414D0_CC4CE0 = 0x802414D0; // type:func rom:0xCC4CE0
+flo_13_func_802416BC_CC4ECC = 0x802416BC; // type:func rom:0xCC4ECC
+flo_13_func_80241704_CC4F14 = 0x80241704; // type:func rom:0xCC4F14
+flo_13_func_80241B68_CC5378 = 0x80241B68; // type:func rom:0xCC5378
+flo_13_func_80241DB8_CC55C8 = 0x80241DB8; // type:func rom:0xCC55C8
 flo_13_set_script_owner_npc_anim = 0x80242298; // type:func rom:0xCC5AA8
-func_80242314_CC5B24 = 0x80242314; // type:func rom:0xCC5B24
+flo_13_func_80242314_CC5B24 = 0x80242314; // type:func rom:0xCC5B24
 flo_13_UnkNpcAIFunc12 = 0x80242448; // type:func rom:0xCC5C58
 flo_13_set_script_owner_npc_col_height = 0x802425AC; // type:func rom:0xCC5DBC
-func_8024262C_CC5E3C = 0x8024262C; // type:func rom:0xCC5E3C
-func_80242A6C_CC627C = 0x80242A6C; // type:func rom:0xCC627C
-func_80243368_CC6B78 = 0x80243368; // type:func rom:0xCC6B78
-func_802433C0_CC6BD0 = 0x802433C0; // type:func rom:0xCC6BD0
-func_802434D4_CC6CE4 = 0x802434D4; // type:func rom:0xCC6CE4
-func_802435D0_CC6DE0 = 0x802435D0; // type:func rom:0xCC6DE0
-D_8024412C_CC793C = 0x8024412C; // type:data rom:0xCC793C
+flo_13_func_8024262C_CC5E3C = 0x8024262C; // type:func rom:0xCC5E3C
+flo_13_func_80242A6C_CC627C = 0x80242A6C; // type:func rom:0xCC627C
+flo_13_UnkFunc42 = 0x80243368; // type:func rom:0xCC6B78
+flo_13_func_802433C0_CC6BD0 = 0x802433C0; // type:func rom:0xCC6BD0
+flo_13_func_802434D4_CC6CE4 = 0x802434D4; // type:func rom:0xCC6CE4
+flo_13_func_802435D0_CC6DE0 = 0x802435D0; // type:func rom:0xCC6DE0
+flo_13_entryList = 0x80243670; // type:data rom:0xCC6E80
+flo_13_config = 0x80243690; // type:data rom:0xCC6EA0
+flo_13_802436D0 = 0x802436D0; // type:data rom:0xCC6EE0
+flo_13_802438B0 = 0x802438B0; // type:data rom:0xCC70C0
+flo_13_802438CC = 0x802438CC; // type:data rom:0xCC70DC
+flo_13_802438F8 = 0x802438F8; // type:data rom:0xCC7108
+flo_13_80243950 = 0x80243950; // type:data rom:0xCC7160
+flo_13_makeEntities = 0x80243978; // type:data rom:0xCC7188
+flo_13_80243A40 = 0x80243A40; // type:data rom:0xCC7250
+flo_13_exitWalk_80243CEC = 0x80243CEC; // type:data rom:0xCC74FC
+flo_13_exitWalk_80243D48 = 0x80243D48; // type:data rom:0xCC7558
+flo_13_80243DA4 = 0x80243DA4; // type:data rom:0xCC75B4
+flo_13_main = 0x80243DEC; // type:data rom:0xCC75FC
+flo_13_npcSettings_80244100 = 0x80244100; // type:data rom:0xCC7910
+flo_13_D_8024412C_CC793C = 0x8024412C; // type:data rom:0xCC793C
+flo_13_npcAISettings_80244144 = 0x80244144; // type:data rom:0xCC7954
+flo_13_npcAI_80244174 = 0x80244174; // type:data rom:0xCC7984
+flo_13_npcSettings_802441E4 = 0x802441E4; // type:data rom:0xCC79F4
+flo_13_npcAISettings_80244210 = 0x80244210; // type:data rom:0xCC7A20
+flo_13_npcAI_80244240 = 0x80244240; // type:data rom:0xCC7A50
+flo_13_802442B0 = 0x802442B0; // type:data rom:0xCC7AC0
+flo_13_npcSettings_8024437C = 0x8024437C; // type:data rom:0xCC7B8C
+flo_13_vectorList_802443A8 = 0x802443A8; // type:data rom:0xCC7BB8
+flo_13_vectorList_802443E4 = 0x802443E4; // type:data rom:0xCC7BF4
+flo_13_vectorList_80244420 = 0x80244420; // type:data rom:0xCC7C30
+flo_13_8024445C = 0x8024445C; // type:data rom:0xCC7C6C
+flo_13_80244560 = 0x80244560; // type:data rom:0xCC7D70
+flo_13_802446AC = 0x802446AC; // type:data rom:0xCC7EBC
+flo_13_80244888 = 0x80244888; // type:data rom:0xCC8098
+flo_13_idle_80244BF8 = 0x80244BF8; // type:data rom:0xCC8408
+flo_13_80245014 = 0x80245014; // type:data rom:0xCC8824
+flo_13_80245444 = 0x80245444; // type:data rom:0xCC8C54
+flo_13_defeat_80246038 = 0x80246038; // type:data rom:0xCC9848
+flo_13_interact_802461C0 = 0x802461C0; // type:data rom:0xCC99D0
+flo_13_init_80246280 = 0x80246280; // type:data rom:0xCC9A90
+flo_13_init_802462D0 = 0x802462D0; // type:data rom:0xCC9AE0
+flo_13_init_80246370 = 0x80246370; // type:data rom:0xCC9B80
+flo_13_init_802463B0 = 0x802463B0; // type:data rom:0xCC9BC0
+flo_13_init_802463E8 = 0x802463E8; // type:data rom:0xCC9BF8
+flo_13_npcGroup_80246434 = 0x80246434; // type:data rom:0xCC9C44
+flo_13_npcGroup_80246624 = 0x80246624; // type:data rom:0xCC9E34
+flo_13_npcGroup_80246814 = 0x80246814; // type:data rom:0xCCA024
+flo_13_npcGroup_80246A04 = 0x80246A04; // type:data rom:0xCCA214
+flo_13_npcGroup_80246BF4 = 0x80246BF4; // type:data rom:0xCCA404
+flo_13_npcGroup_80246DE4 = 0x80246DE4; // type:data rom:0xCCA5F4
+flo_13_npcGroup_80246FD4 = 0x80246FD4; // type:data rom:0xCCA7E4
+flo_13_npcGroup_802471C4 = 0x802471C4; // type:data rom:0xCCA9D4
+flo_13_npcGroup_802473B4 = 0x802473B4; // type:data rom:0xCCABC4
+flo_13_npcGroup_802475A4 = 0x802475A4; // type:data rom:0xCCADB4
+flo_13_npcGroup_80247794 = 0x80247794; // type:data rom:0xCCAFA4
+flo_13_npcGroupList_80247984 = 0x80247984; // type:data rom:0xCCB194
 D_80247A30_CCB240 = 0x80247A30; // type:data rom:0xCCB240
 D_80247A38_CCB248 = 0x80247A38; // type:data rom:0xCCB248
 D_80247A40_CCB250 = 0x80247A40; // type:data rom:0xCCB250
@@ -14331,38 +15020,73 @@ D_80247AE8_CCB2F8 = 0x80247AE8; // type:data rom:0xCCB2F8
 D_80247AF0_CCB300 = 0x80247AF0; // type:data rom:0xCCB300
 flo_14_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCCB310
 flo_14_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCCB434
-func_8024030C_CCB61C = 0x8024030C; // type:func rom:0xCCB61C
-func_80240340_CCB650 = 0x80240340; // type:func rom:0xCCB650
-func_802403D4_CCB6E4 = 0x802403D4; // type:func rom:0xCCB6E4
-func_8024042C_CCB73C = 0x8024042C; // type:func rom:0xCCB73C
-func_8024046C_CCB77C = 0x8024046C; // type:func rom:0xCCB77C
+flo_14_func_8024030C_CCB61C = 0x8024030C; // type:func rom:0xCCB61C
+flo_14_UnkFunc43 = 0x80240340; // type:func rom:0xCCB650
+flo_14_func_802403D4_CCB6E4 = 0x802403D4; // type:func rom:0xCCB6E4
+flo_14_func_8024042C_CCB73C = 0x8024042C; // type:func rom:0xCCB73C
+flo_14_func_8024046C_CCB77C = 0x8024046C; // type:func rom:0xCCB77C
 func_80240504_CCB814 = 0x80240504; // type:func rom:0xCCB814
-func_802407D4_CCBAE4 = 0x802407D4; // type:func rom:0xCCBAE4
-func_80240B10_CCBE20 = 0x80240B10; // type:func rom:0xCCBE20
-func_80240CC0_CCBFD0 = 0x80240CC0; // type:func rom:0xCCBFD0
+flo_14_func_802407D4_CCBAE4 = 0x802407D4; // type:func rom:0xCCBAE4
+flo_14_func_80240B10_CCBE20 = 0x80240B10; // type:func rom:0xCCBE20
+flo_14_func_80240CC0_CCBFD0 = 0x80240CC0; // type:func rom:0xCCBFD0
 flo_14_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xCCC5F8
 flo_14_UnkFunc4 = 0x802413A8; // type:func rom:0xCCC6B8
 flo_14_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xCCC9FC
-func_80241764_CCCA74 = 0x80241764; // type:func rom:0xCCCA74
+flo_14_func_80241764_CCCA74 = 0x80241764; // type:func rom:0xCCCA74
 flo_14_UnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xCCCAE0
 flo_14_UnkNpcAIFunc3 = 0x80241904; // type:func rom:0xCCCC14
 flo_14_UnkFunc6 = 0x80241968; // type:func rom:0xCCCC78
 flo_14_UnkFunc5 = 0x80241CF8; // type:func rom:0xCCD008
-func_80241E1C_CCD12C = 0x80241E1C; // type:func rom:0xCCD12C
+flo_14_func_80241E1C_CCD12C = 0x80241E1C; // type:func rom:0xCCD12C
 flo_14_GetNpcCollisionHeight = 0x80242008; // type:func rom:0xCCD318
 flo_14_AddPlayerHandsOffset = 0x80242064; // type:func rom:0xCCD374
-func_80242234_CCD544 = 0x80242234; // type:func rom:0xCCD544
-func_80242288_CCD598 = 0x80242288; // type:func rom:0xCCD598
-func_802422C0_CCD5D0 = 0x802422C0; // type:func rom:0xCCD5D0
-func_80242360_CCD670 = 0x80242360; // type:func rom:0xCCD670
-D_802431CC_CCE4DC = 0x802431CC; // type:data rom:0xCCE4DC
-D_80243B14_CCEE24 = 0x80243B14; // type:data rom:0xCCEE24
-D_80243B18_CCEE28 = 0x80243B18; // type:data rom:0xCCEE28
-D_802444C0_CCF7D0 = 0x802444C0; // type:data rom:0xCCF7D0
-D_802445FC_CCF90C = 0x802445FC; // type:data rom:0xCCF90C
-D_80244600_CCF910 = 0x80244600; // type:data rom:0xCCF910
-D_80245320_CD0630 = 0x80245320; // type:data rom:0xCD0630
-D_80245328_CD0638 = 0x80245328; // type:data rom:0xCD0638
+flo_14_func_80242234_CCD544 = 0x80242234; // type:func rom:0xCCD544
+flo_14_func_80242288_CCD598 = 0x80242288; // type:func rom:0xCCD598
+flo_14_func_802422C0_CCD5D0 = 0x802422C0; // type:func rom:0xCCD5D0
+flo_14_func_80242360_CCD670 = 0x80242360; // type:func rom:0xCCD670
+flo_14_entryList = 0x80242390; // type:data rom:0xCCD6A0
+flo_14_config = 0x802423B0; // type:data rom:0xCCD6C0
+flo_14_802423F0 = 0x802423F0; // type:data rom:0xCCD700
+flo_14_updateTexturePan_80242460 = 0x80242460; // type:data rom:0xCCD770
+flo_14_exitWalk_802424FC = 0x802424FC; // type:data rom:0xCCD80C
+flo_14_exitWalk_80242558 = 0x80242558; // type:data rom:0xCCD868
+flo_14_802425B4 = 0x802425B4; // type:data rom:0xCCD8C4
+flo_14_lavaResetList_802425FC = 0x802425FC; // type:data rom:0xCCD90C
+flo_14_main = 0x802426BC; // type:data rom:0xCCD9CC
+flo_14_80242C00 = 0x80242C00; // type:data rom:0xCCDF10
+flo_14_80242EAC = 0x80242EAC; // type:data rom:0xCCE1BC
+flo_14_D_802431CC_CCE4DC = 0x802431CC; // type:data rom:0xCCE4DC
+flo_14_802431D0 = 0x802431D0; // type:data rom:0xCCE4E0
+flo_14_802432E8 = 0x802432E8; // type:data rom:0xCCE5F8
+flo_14_vectorList_80243384 = 0x80243384; // type:data rom:0xCCE694
+flo_14_80243420 = 0x80243420; // type:data rom:0xCCE730
+flo_14_8024352C = 0x8024352C; // type:data rom:0xCCE83C
+flo_14_80243870 = 0x80243870; // type:data rom:0xCCEB80
+flo_14_D_80243B14_CCEE24 = 0x80243B14; // type:data rom:0xCCEE24
+flo_14_D_80243B18_CCEE28 = 0x80243B18; // type:data rom:0xCCEE28
+flo_14_80243B1C = 0x80243B1C; // type:data rom:0xCCEE2C
+flo_14_80243E78 = 0x80243E78; // type:data rom:0xCCF188
+flo_14_D_802444C0_CCF7D0 = 0x802444C0; // type:data rom:0xCCF7D0
+flo_14_npcAISettings_802444D8 = 0x802444D8; // type:data rom:0xCCF7E8
+flo_14_npcAI_80244508 = 0x80244508; // type:data rom:0xCCF818
+flo_14_npcSettings_80244578 = 0x80244578; // type:data rom:0xCCF888
+flo_14_npcSettings_802445A4 = 0x802445A4; // type:data rom:0xCCF8B4
+flo_14_npcSettings_802445D0 = 0x802445D0; // type:data rom:0xCCF8E0
+flo_14_D_802445FC_CCF90C = 0x802445FC; // type:data rom:0xCCF90C
+flo_14_D_80244600_CCF910 = 0x80244600; // type:data rom:0xCCF910
+flo_14_80244604 = 0x80244604; // type:data rom:0xCCF914
+flo_14_80244738 = 0x80244738; // type:data rom:0xCCFA48
+flo_14_D_80244788_CCFA98 = 0x80244788; // type:data rom:0xCCFA98
+flo_14_interact_80244790 = 0x80244790; // type:data rom:0xCCFAA0
+flo_14_init_80244ADC = 0x80244ADC; // type:data rom:0xCCFDEC
+flo_14_npcGroup_80244B20 = 0x80244B20; // type:data rom:0xCCFE30
+flo_14_npcGroup_80244D10 = 0x80244D10; // type:data rom:0xCD0020
+flo_14_npcGroupList_80244F00 = 0x80244F00; // type:data rom:0xCD0210
+flo_14_80244F30 = 0x80244F30; // type:data rom:0xCD0240
+flo_14_80244F70 = 0x80244F70; // type:data rom:0xCD0280
+flo_14_80245224 = 0x80245224; // type:data rom:0xCD0534
+flo_14_D_80245320_CD0630 = 0x80245320; // type:data rom:0xCD0630
+flo_14_D_80245328_CD0638 = 0x80245328; // type:data rom:0xCD0638
 D_80245330_CD0640 = 0x80245330; // type:data rom:0xCD0640
 D_80245338_CD0648 = 0x80245338; // type:data rom:0xCD0648
 D_80245340_CD0650 = 0x80245340; // type:data rom:0xCD0650
@@ -14370,76 +15094,150 @@ D_80245348_CD0658 = 0x80245348; // type:data rom:0xCD0658
 D_80245350_CD0660 = 0x80245350; // type:data rom:0xCD0660
 D_80245358_CD0668 = 0x80245358; // type:data rom:0xCD0668
 D_80245360_CD0670 = 0x80245360; // type:data rom:0xCD0670
-func_80240000_CD1E30 = 0x80240000; // type:func rom:0xCD1E30
-func_80240040_CD1E70 = 0x80240040; // type:func rom:0xCD1E70
+flo_15_entryList = 0x80240000; // type:data rom:0xCD06C0
+flo_15_config = 0x80240020; // type:data rom:0xCD06E0
+flo_15_80240060 = 0x80240060; // type:data rom:0xCD0720
+flo_15_exitWalk_80240120 = 0x80240120; // type:data rom:0xCD07E0
+flo_15_8024017C = 0x8024017C; // type:data rom:0xCD083C
+flo_15_main = 0x802401A8; // type:data rom:0xCD0868
+flo_15_npcSettings_80240300 = 0x80240300; // type:data rom:0xCD09C0
+flo_15_8024032C = 0x8024032C; // type:data rom:0xCD09EC
+flo_15_802404D8 = 0x802404D8; // type:data rom:0xCD0B98
+flo_15_aux_8024079C = 0x8024079C; // type:data rom:0xCD0E5C
+flo_15_8024094C = 0x8024094C; // type:data rom:0xCD100C
+flo_15_interact_80240B28 = 0x80240B28; // type:data rom:0xCD11E8
+flo_15_init_80240CD0 = 0x80240CD0; // type:data rom:0xCD1390
+flo_15_init_80240DB4 = 0x80240DB4; // type:data rom:0xCD1474
+flo_15_npcGroup_80240EE0 = 0x80240EE0; // type:data rom:0xCD15A0
+flo_15_npcGroupList_802412C0 = 0x802412C0; // type:data rom:0xCD1980
+flo_15_802412E0 = 0x802412E0; // type:data rom:0xCD19A0
+flo_15_makeEntities = 0x80241300; // type:data rom:0xCD19C0
+flo_15_intTable_80241360 = 0x80241360; // type:data rom:0xCD1A20
+flo_15_802413B0 = 0x802413B0; // type:data rom:0xCD1A70
+flo_16_func_80240000_CD1E30 = 0x80240000; // type:func rom:0xCD1E30
+flo_16_UnkFunc43 = 0x80240040; // type:func rom:0xCD1E70
 flo_16_SetOverrideFlags_40 = 0x802400E0; // type:func rom:0xCD1F10
 flo_16_UnkFunc17 = 0x802400FC; // type:func rom:0xCD1F2C
-func_8024011C_CD1F4C = 0x8024011C; // type:func rom:0xCD1F4C
+flo_16_func_8024011C_CD1F4C = 0x8024011C; // type:func rom:0xCD1F4C
 flo_16_UnkFunc18 = 0x80240148; // type:func rom:0xCD1F78
-func_802401B4_CD1FE4 = 0x802401B4; // type:func rom:0xCD1FE4
-func_80240200_CD2030 = 0x80240200; // type:func rom:0xCD2030
+flo_16_UnkFunc37 = 0x802401B4; // type:func rom:0xCD1FE4
+flo_16_UnkFunc38 = 0x80240200; // type:func rom:0xCD2030
 func_802402AC_CD20DC = 0x802402AC; // type:func rom:0xCD20DC
-func_802404FC_CD232C = 0x802404FC; // type:func rom:0xCD232C
+flo_16_func_802404FC_CD232C = 0x802404FC; // type:func rom:0xCD232C
 flo_16_UnkFunc19 = 0x80240528; // type:func rom:0xCD2358
 flo_16_UnkFunc20 = 0x80240560; // type:func rom:0xCD2390
-func_802405F0_CD2420 = 0x802405F0; // type:func rom:0xCD2420
+flo_16_UnkFunc39 = 0x802405F0; // type:func rom:0xCD2420
 flo_16_UnkFunc21 = 0x80240624; // type:func rom:0xCD2454
 flo_16_UnkFunc22 = 0x80240688; // type:func rom:0xCD24B8
-func_802406E0_CD2510 = 0x802406E0; // type:func rom:0xCD2510
+flo_16_func_802406E0_CD2510 = 0x802406E0; // type:func rom:0xCD2510
 flo_16_UnkFunc23 = 0x80240C18; // type:func rom:0xCD2A48
 flo_16_UnkPartnerPosFunc = 0x80240D58; // type:func rom:0xCD2B88
 flo_16_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xCD2BD0
 flo_16_UnkFunc24 = 0x80240DE8; // type:func rom:0xCD2C18
-func_80240E18_CD2C48 = 0x80240E18; // type:func rom:0xCD2C48
-func_80240E50_CD2C80 = 0x80240E50; // type:func rom:0xCD2C80
+flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xCD2C48
+flo_16_func_80240E50_CD2C80 = 0x80240E50; // type:func rom:0xCD2C80
 func_80241000_CD2E30 = 0x80241000; // type:func rom:0xCD2E30
 flo_16_UnkNpcAIFunc1 = 0x80241628; // type:func rom:0xCD3458
 flo_16_UnkFunc4 = 0x802416E8; // type:func rom:0xCD3518
 flo_16_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xCD385C
-func_80241AA4_CD38D4 = 0x80241AA4; // type:func rom:0xCD38D4
+flo_16_func_80241AA4_CD38D4 = 0x80241AA4; // type:func rom:0xCD38D4
 flo_16_UnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xCD3940
 flo_16_UnkNpcAIFunc3 = 0x80241C44; // type:func rom:0xCD3A74
 flo_16_UnkFunc6 = 0x80241CA8; // type:func rom:0xCD3AD8
 flo_16_UnkFunc5 = 0x80242038; // type:func rom:0xCD3E68
-func_8024215C_CD3F8C = 0x8024215C; // type:func rom:0xCD3F8C
+flo_16_func_8024215C_CD3F8C = 0x8024215C; // type:func rom:0xCD3F8C
 flo_16_UnkNpcAIFunc13 = 0x80242348; // type:func rom:0xCD4178
-func_80242478_CD42A8 = 0x80242478; // type:func rom:0xCD42A8
-func_802426F8_CD4528 = 0x802426F8; // type:func rom:0xCD4528
-func_80242754_CD4584 = 0x80242754; // type:func rom:0xCD4584
-func_80242940_CD4770 = 0x80242940; // type:func rom:0xCD4770
-D_80243700_CD5530 = 0x80243700; // type:data rom:0xCD5530
-D_80243708_CD5538 = 0x80243708; // type:data rom:0xCD5538
-D_80243718_CD5548 = 0x80243718; // type:data rom:0xCD5548
-D_80243758_CD5588 = 0x80243758; // type:data rom:0xCD5588
-D_80244010_CD5E40 = 0x80244010; // type:data rom:0xCD5E40
+flo_16_func_80242478_CD42A8 = 0x80242478; // type:func rom:0xCD42A8
+flo_16_UnkFunc45 = 0x802426F8; // type:func rom:0xCD4528
+flo_16_func_80242754_CD4584 = 0x80242754; // type:func rom:0xCD4584
+flo_16_func_80242940_CD4770 = 0x80242940; // type:func rom:0xCD4770
+flo_16_entryList = 0x80242970; // type:data rom:0xCD47A0
+flo_16_config = 0x80242990; // type:data rom:0xCD47C0
+flo_16_802429D0 = 0x802429D0; // type:data rom:0xCD4800
+flo_16_exitWalk_80242A40 = 0x80242A40; // type:data rom:0xCD4870
+flo_16_exitWalk_80242A9C = 0x80242A9C; // type:data rom:0xCD48CC
+flo_16_80242AF8 = 0x80242AF8; // type:data rom:0xCD4928
+flo_16_lavaResetList_80242B40 = 0x80242B40; // type:data rom:0xCD4970
+flo_16_main = 0x80242B70; // type:data rom:0xCD49A0
+flo_16_80242EA0 = 0x80242EA0; // type:data rom:0xCD4CD0
+flo_16_8024314C = 0x8024314C; // type:data rom:0xCD4F7C
+flo_16_8024346C = 0x8024346C; // type:data rom:0xCD529C
+flo_16_D_80243700_CD5530 = 0x80243700; // type:data rom:0xCD5530
+flo_16_D_80243708_CD5538 = 0x80243708; // type:data rom:0xCD5538
+flo_16_D_80243718_CD5548 = 0x80243718; // type:data rom:0xCD5548
+flo_16_D_80243758_CD5588 = 0x80243758; // type:data rom:0xCD5588
+flo_16_80243764 = 0x80243764; // type:data rom:0xCD5594
+flo_16_802438C8 = 0x802438C8; // type:data rom:0xCD56F8
+flo_16_80243D48 = 0x80243D48; // type:data rom:0xCD5B78
+flo_16_80243DB0 = 0x80243DB0; // type:data rom:0xCD5BE0
+flo_16_80243E80 = 0x80243E80; // type:data rom:0xCD5CB0
+flo_16_makeEntities = 0x80243F44; // type:data rom:0xCD5D74
+flo_16_D_80244010_CD5E40 = 0x80244010; // type:data rom:0xCD5E40
+flo_16_npcAISettings_80244028 = 0x80244028; // type:data rom:0xCD5E58
+flo_16_npcAI_80244058 = 0x80244058; // type:data rom:0xCD5E88
+flo_16_npcSettings_802440C8 = 0x802440C8; // type:data rom:0xCD5EF8
+flo_16_npcGroup_802440F4 = 0x802440F4; // type:data rom:0xCD5F24
+flo_16_npcGroup_802442E4 = 0x802442E4; // type:data rom:0xCD6114
+flo_16_npcGroupList_802444D4 = 0x802444D4; // type:data rom:0xCD6304
+flo_16_80244500 = 0x80244500; // type:data rom:0xCD6330
+flo_16_802448FC = 0x802448FC; // type:data rom:0xCD672C
+flo_16_80244DC8 = 0x80244DC8; // type:data rom:0xCD6BF8
+flo_16_802451C4 = 0x802451C4; // type:data rom:0xCD6FF4
 D_802453F0_CD7220 = 0x802453F0; // type:data rom:0xCD7220
 D_802453F8_CD7228 = 0x802453F8; // type:data rom:0xCD7228
 D_80245400_CD7230 = 0x80245400; // type:data rom:0xCD7230
 D_80245448_CD7278 = 0x80245448; // type:data rom:0xCD7278
-func_80240000_CD72E0 = 0x80240000; // type:func rom:0xCD72E0
-func_80240040_CD7320 = 0x80240040; // type:func rom:0xCD7320
-func_80240070_CD7350 = 0x80240070; // type:func rom:0xCD7350
+flo_17_func_80240000_CD72E0 = 0x80240000; // type:func rom:0xCD72E0
+flo_17_func_80240040_CD7320 = 0x80240040; // type:func rom:0xCD7320
+flo_17_func_80240070_CD7350 = 0x80240070; // type:func rom:0xCD7350
 func_80240220_CD7500 = 0x80240220; // type:func rom:0xCD7500
 flo_17_UnkNpcAIFunc1 = 0x80240848; // type:func rom:0xCD7B28
 flo_17_UnkFunc4 = 0x80240908; // type:func rom:0xCD7BE8
 flo_17_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xCD7F2C
-func_80240CC4_CD7FA4 = 0x80240CC4; // type:func rom:0xCD7FA4
+flo_17_func_80240CC4_CD7FA4 = 0x80240CC4; // type:func rom:0xCD7FA4
 flo_17_UnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xCD8010
 flo_17_UnkNpcAIFunc3 = 0x80240E64; // type:func rom:0xCD8144
 flo_17_UnkFunc6 = 0x80240EC8; // type:func rom:0xCD81A8
 flo_17_UnkFunc5 = 0x80241258; // type:func rom:0xCD8538
-func_8024137C_CD865C = 0x8024137C; // type:func rom:0xCD865C
-func_80241568_CD8848 = 0x80241568; // type:func rom:0xCD8848
-func_802415B0_CD8890 = 0x802415B0; // type:func rom:0xCD8890
-func_80241A14_CD8CF4 = 0x80241A14; // type:func rom:0xCD8CF4
-func_80241C64_CD8F44 = 0x80241C64; // type:func rom:0xCD8F44
+flo_17_func_8024137C_CD865C = 0x8024137C; // type:func rom:0xCD865C
+flo_17_func_80241568_CD8848 = 0x80241568; // type:func rom:0xCD8848
+flo_17_func_802415B0_CD8890 = 0x802415B0; // type:func rom:0xCD8890
+flo_17_func_80241A14_CD8CF4 = 0x80241A14; // type:func rom:0xCD8CF4
+flo_17_func_80241C64_CD8F44 = 0x80241C64; // type:func rom:0xCD8F44
 flo_17_set_script_owner_npc_anim = 0x80242144; // type:func rom:0xCD9424
-func_802421C0_CD94A0 = 0x802421C0; // type:func rom:0xCD94A0
+flo_17_func_802421C0_CD94A0 = 0x802421C0; // type:func rom:0xCD94A0
 flo_17_UnkNpcAIFunc12 = 0x802422F4; // type:func rom:0xCD95D4
 flo_17_set_script_owner_npc_col_height = 0x80242458; // type:func rom:0xCD9738
-func_802424D8_CD97B8 = 0x802424D8; // type:func rom:0xCD97B8
-func_80242918_CD9BF8 = 0x80242918; // type:func rom:0xCD9BF8
-D_8024440C_CDB6EC = 0x8024440C; // type:data rom:0xCDB6EC
+flo_17_func_802424D8_CD97B8 = 0x802424D8; // type:func rom:0xCD97B8
+flo_17_func_80242918_CD9BF8 = 0x80242918; // type:func rom:0xCD9BF8
+flo_17_entryList = 0x80243220; // type:data rom:0xCDA500
+flo_17_config = 0x80243240; // type:data rom:0xCDA520
+flo_17_80243280 = 0x80243280; // type:data rom:0xCDA560
+flo_17_802432F0 = 0x802432F0; // type:data rom:0xCDA5D0
+flo_17_exitWalk_8024359C = 0x8024359C; // type:data rom:0xCDA87C
+flo_17_exitWalk_802435F8 = 0x802435F8; // type:data rom:0xCDA8D8
+flo_17_80243654 = 0x80243654; // type:data rom:0xCDA934
+flo_17_lavaResetList_8024369C = 0x8024369C; // type:data rom:0xCDA97C
+flo_17_main = 0x802437DC; // type:data rom:0xCDAABC
+flo_17_80243FD0 = 0x80243FD0; // type:data rom:0xCDB2B0
+flo_17_80244284 = 0x80244284; // type:data rom:0xCDB564
+flo_17_npcSettings_802443D8 = 0x802443E0; // type:data rom:0xCDB6C0
+flo_17_D_8024440C_CDB6EC = 0x8024440C; // type:data rom:0xCDB6EC
+flo_17_npcAISettings_80244424 = 0x80244424; // type:data rom:0xCDB704
+flo_17_npcAI_80244454 = 0x80244454; // type:data rom:0xCDB734
+flo_17_npcSettings_802444C4 = 0x802444C4; // type:data rom:0xCDB7A4
+flo_17_npcAISettings_802444F0 = 0x802444F0; // type:data rom:0xCDB7D0
+flo_17_npcAI_80244520 = 0x80244520; // type:data rom:0xCDB800
+flo_17_80244590 = 0x80244590; // type:data rom:0xCDB870
+flo_17_npcSettings_8024465C = 0x8024465C; // type:data rom:0xCDB93C
+flo_17_npcGroup_80244688 = 0x80244688; // type:data rom:0xCDB968
+flo_17_npcGroup_80244878 = 0x80244878; // type:data rom:0xCDBB58
+flo_17_npcGroup_80244A68 = 0x80244A68; // type:data rom:0xCDBD48
+flo_17_npcGroup_80244C58 = 0x80244C58; // type:data rom:0xCDBF38
+flo_17_npcGroup_80244E48 = 0x80244E48; // type:data rom:0xCDC128
+flo_17_npcGroup_80245038 = 0x80245038; // type:data rom:0xCDC318
+flo_17_npcGroupList_80245228 = 0x80245228; // type:data rom:0xCDC508
+flo_17_makeEntities = 0x80245280; // type:data rom:0xCDC560
 D_80245300_CDC5E0 = 0x80245300; // type:data rom:0xCDC5E0
 D_80245308_CDC5E8 = 0x80245308; // type:data rom:0xCDC5E8
 D_80245310_CDC5F0 = 0x80245310; // type:data rom:0xCDC5F0
@@ -14447,88 +15245,329 @@ D_80245358_CDC638 = 0x80245358; // type:data rom:0xCDC638
 D_802453B8_CDC698 = 0x802453B8; // type:data rom:0xCDC698
 flo_18_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCDC6A0
 flo_18_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCDC7C4
-func_8024030C_CDC9AC = 0x8024030C; // type:func rom:0xCDC9AC
-func_80240340_CDC9E0 = 0x80240340; // type:func rom:0xCDC9E0
+flo_18_func_8024030C_CDC9AC = 0x8024030C; // type:func rom:0xCDC9AC
+flo_18_func_80240340_CDC9E0 = 0x80240340; // type:func rom:0xCDC9E0
 flo_18_UnkFloatFunc = 0x80240394; // type:func rom:0xCDCA34
-func_80240530_CDCBD0 = 0x80240530; // type:func rom:0xCDCBD0
+flo_18_UnkFunc42 = 0x80240530; // type:func rom:0xCDCBD0
 flo_18_foliage_setup_shear_mtx = 0x80240590; // type:func rom:0xCDCC30
 flo_18_TransformFoliage = 0x80240600; // type:func rom:0xCDCCA0
+flo_18_entryList = 0x802407D0; // type:data rom:0xCDCE70
+flo_18_config = 0x802407F0; // type:data rom:0xCDCE90
+flo_18_80240830 = 0x80240830; // type:data rom:0xCDCED0
+flo_18_updateTexturePan_802408C0 = 0x802408C0; // type:data rom:0xCDCF60
+flo_18_exitWalk_8024095C = 0x8024095C; // type:data rom:0xCDCFFC
+flo_18_802409B8 = 0x802409B8; // type:data rom:0xCDD058
+flo_18_lavaResetList_802409E4 = 0x802409E4; // type:data rom:0xCDD084
+flo_18_main = 0x80240A24; // type:data rom:0xCDD0C4
+flo_18_80240E90 = 0x80240E90; // type:data rom:0xCDD530
+flo_18_80241094 = 0x80241094; // type:data rom:0xCDD734
+flo_18_80241284 = 0x80241284; // type:data rom:0xCDD924
+flo_18_802413F0 = 0x802413F0; // type:data rom:0xCDDA90
+flo_18_80241ED4 = 0x80241ED4; // type:data rom:0xCDE574
+flo_18_80242174 = 0x80242174; // type:data rom:0xCDE814
+flo_18_80242474 = 0x80242474; // type:data rom:0xCDEB14
+flo_18_80242620 = 0x80242620; // type:data rom:0xCDECC0
+flo_18_80242910 = 0x80242910; // type:data rom:0xCDEFB0
+flo_18_80242B18 = 0x80242B18; // type:data rom:0xCDF1B8
+flo_18_intTable_80242DC8 = 0x80242DC8; // type:data rom:0xCDF468
+flo_18_80242E28 = 0x80242E28; // type:data rom:0xCDF4C8
+flo_18_triggerCoord_8024367C = 0x8024367C; // type:data rom:0xCDFD1C
+flo_18_triggerCoord_8024368C = 0x8024368C; // type:data rom:0xCDFD2C
+flo_18_triggerCoord_8024369C = 0x8024369C; // type:data rom:0xCDFD3C
+flo_18_triggerCoord_802436AC = 0x802436AC; // type:data rom:0xCDFD4C
+flo_18_802436BC = 0x802436BC; // type:data rom:0xCDFD5C
+flo_18_npcSettings_80243F10 = 0x80243F10; // type:data rom:0xCE05B0
+flo_18_npcSettings_80243F3C = 0x80243F3C; // type:data rom:0xCE05DC
+flo_18_vectorList_80243F68 = 0x80243F68; // type:data rom:0xCE0608
+flo_18_vectorList_80243FA4 = 0x80243FA4; // type:data rom:0xCE0644
+flo_18_vectorList_80243FE0 = 0x80243FE0; // type:data rom:0xCE0680
+flo_18_vectorList_8024401C = 0x8024401C; // type:data rom:0xCE06BC
+flo_18_80244058 = 0x80244058; // type:data rom:0xCE06F8
+flo_18_80244270 = 0x80244270; // type:data rom:0xCE0910
+flo_18_802445D4 = 0x802445D4; // type:data rom:0xCE0C74
+flo_18_80244774 = 0x80244774; // type:data rom:0xCE0E14
+flo_18_idle_80244B3C = 0x80244B3C; // type:data rom:0xCE11DC
+flo_18_defeat_80244C84 = 0x80244C84; // type:data rom:0xCE1324
+flo_18_80244E2C = 0x80244E2C; // type:data rom:0xCE14CC
+flo_18_80244ED0 = 0x80244ED0; // type:data rom:0xCE1570
+flo_18_80245004 = 0x80245004; // type:data rom:0xCE16A4
+flo_18_80245108 = 0x80245108; // type:data rom:0xCE17A8
+flo_18_80245228 = 0x80245228; // type:data rom:0xCE18C8
+flo_18_8024527C = 0x8024527C; // type:data rom:0xCE191C
+flo_18_802452D0 = 0x802452D0; // type:data rom:0xCE1970
+flo_18_80245324 = 0x80245324; // type:data rom:0xCE19C4
+flo_18_80245378 = 0x80245378; // type:data rom:0xCE1A18
+flo_18_802454D4 = 0x802454D4; // type:data rom:0xCE1B74
+flo_18_80245544 = 0x80245544; // type:data rom:0xCE1BE4
+flo_18_802455B4 = 0x802455B4; // type:data rom:0xCE1C54
+flo_18_80245624 = 0x80245624; // type:data rom:0xCE1CC4
+flo_18_triggerCoord_80245694 = 0x80245694; // type:data rom:0xCE1D34
+flo_18_triggerCoord_802456A4 = 0x802456A4; // type:data rom:0xCE1D44
+flo_18_triggerCoord_802456B4 = 0x802456B4; // type:data rom:0xCE1D54
+flo_18_triggerCoord_802456C4 = 0x802456C4; // type:data rom:0xCE1D64
+flo_18_802456D4 = 0x802456D4; // type:data rom:0xCE1D74
+flo_18_interact_802457D4 = 0x802457D4; // type:data rom:0xCE1E74
+flo_18_init_80245AA8 = 0x80245AA8; // type:data rom:0xCE2148
+flo_18_init_80245B30 = 0x80245B30; // type:data rom:0xCE21D0
+flo_18_init_80245B90 = 0x80245B90; // type:data rom:0xCE2230
+flo_18_init_80245C04 = 0x80245C04; // type:data rom:0xCE22A4
+flo_18_init_80245C78 = 0x80245C78; // type:data rom:0xCE2318
+flo_18_npcGroup_80245CEC = 0x80245CEC; // type:data rom:0xCE238C
+flo_18_npcGroupList_8024669C = 0x8024669C; // type:data rom:0xCE2D3C
+flo_18_searchBush_802466C0 = 0x802466C0; // type:data rom:0xCE2D60
+flo_18_shakeTree_80246A20 = 0x80246A20; // type:data rom:0xCE30C0
+flo_18_80247024 = 0x80247024; // type:data rom:0xCE36C4
 flo_19_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCE36F0
 flo_19_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCE3814
-func_8024030C_CE39FC = 0x8024030C; // type:func rom:0xCE39FC
-func_80240340_CE3A30 = 0x80240340; // type:func rom:0xCE3A30
-func_802404D0_CE3BC0 = 0x802404D0; // type:func rom:0xCE3BC0
-func_80240540_CE3C30 = 0x80240540; // type:func rom:0xCE3C30
-func_80240660_CE3D50 = 0x80240660; // type:func rom:0xCE3D50
-func_80240784_CE3E74 = 0x80240784; // type:func rom:0xCE3E74
+flo_19_func_8024030C_CE39FC = 0x8024030C; // type:func rom:0xCE39FC
+flo_19_func_80240340_CE3A30 = 0x80240340; // type:func rom:0xCE3A30
+flo_19_func_802404D0_CE3BC0 = 0x802404D0; // type:func rom:0xCE3BC0
+flo_19_func_80240540_CE3C30 = 0x80240540; // type:func rom:0xCE3C30
+flo_19_func_80240660_CE3D50 = 0x80240660; // type:func rom:0xCE3D50
+flo_19_func_80240784_CE3E74 = 0x80240784; // type:func rom:0xCE3E74
 flo_19_UnkFloatFunc = 0x802407B0; // type:func rom:0xCE3EA0
-func_80240000_CE6700 = 0x80240000; // type:func rom:0xCE6700
-func_8024004C_CE674C = 0x8024004C; // type:func rom:0xCE674C
-func_802401AC_CE68AC = 0x802401AC; // type:func rom:0xCE68AC
-func_802405BC_CE6CBC = 0x802405BC; // type:func rom:0xCE6CBC
-func_802405FC_CE6CFC = 0x802405FC; // type:func rom:0xCE6CFC
-func_80240708_CE6E08 = 0x80240708; // type:func rom:0xCE6E08
+flo_19_entryList = 0x80240940; // type:data rom:0xCE4030
+flo_19_config = 0x80240980; // type:data rom:0xCE4070
+flo_19_802409C0 = 0x802409C0; // type:data rom:0xCE40B0
+flo_19_80240AC0 = 0x80240AC0; // type:data rom:0xCE41B0
+flo_19_updateTexturePan_80240B00 = 0x80240B00; // type:data rom:0xCE41F0
+flo_19_exitWalk_80240B9C = 0x80240B9C; // type:data rom:0xCE428C
+flo_19_80240BF8 = 0x80240BF8; // type:data rom:0xCE42E8
+flo_19_main = 0x80240C24; // type:data rom:0xCE4314
+flo_19_80241050 = 0x80241050; // type:data rom:0xCE4740
+flo_19_80241650 = 0x80241650; // type:data rom:0xCE4D40
+flo_19_8024169C = 0x8024169C; // type:data rom:0xCE4D8C
+flo_19_802416E8 = 0x802416E8; // type:data rom:0xCE4DD8
+flo_19_80241734 = 0x80241734; // type:data rom:0xCE4E24
+flo_19_80241780 = 0x80241780; // type:data rom:0xCE4E70
+flo_19_80241A70 = 0x80241A70; // type:data rom:0xCE5160
+flo_19_80241B10 = 0x80241B10; // type:data rom:0xCE5200
+flo_19_80241BB0 = 0x80241BB0; // type:data rom:0xCE52A0
+flo_19_80241C58 = 0x80241C58; // type:data rom:0xCE5348
+flo_19_80241CC4 = 0x80241CC4; // type:data rom:0xCE53B4
+flo_19_802423F8 = 0x802423F8; // type:data rom:0xCE5AE8
+flo_19_80242A2C = 0x80242A2C; // type:data rom:0xCE611C
+flo_19_80242FD0 = 0x80242FD0; // type:data rom:0xCE66C0
+flo_21_func_80240000_CE6700 = 0x80240000; // type:func rom:0xCE6700
+flo_21_func_8024004C_CE674C = 0x8024004C; // type:func rom:0xCE674C
+flo_21_func_802401AC_CE68AC = 0x802401AC; // type:func rom:0xCE68AC
+flo_21_func_802405BC_CE6CBC = 0x802405BC; // type:func rom:0xCE6CBC
+flo_21_func_802405FC_CE6CFC = 0x802405FC; // type:func rom:0xCE6CFC
+flo_21_func_80240708_CE6E08 = 0x80240708; // type:func rom:0xCE6E08
 flo_21_UnkTexturePanFunc = 0x802407F4; // type:func rom:0xCE6EF4
 flo_21_UnkTexturePanFunc2 = 0x80240918; // type:func rom:0xCE7018
-func_80240B00_CE7200 = 0x80240B00; // type:func rom:0xCE7200
+flo_21_func_80240B00_CE7200 = 0x80240B00; // type:func rom:0xCE7200
 flo_21_UnkFloatFunc = 0x80240B40; // type:func rom:0xCE7240
 flo_21_UnsetCamera0MoveFlag1 = 0x80240CD0; // type:func rom:0xCE73D0
-func_80240000_CEC240 = 0x80240000; // type:func rom:0xCEC240
-func_80240040_CEC280 = 0x80240040; // type:func rom:0xCEC280
+flo_21_entryList = 0x80240CF0; // type:data rom:0xCE73F0
+flo_21_config = 0x80240D00; // type:data rom:0xCE7400
+flo_21_80240D40 = 0x80240D40; // type:data rom:0xCE7440
+flo_21_80240DA0 = 0x80240DA0; // type:data rom:0xCE74A0
+flo_21_80240E3C = 0x80240E3C; // type:data rom:0xCE753C
+flo_21_exitWalk_802412F4 = 0x802412F4; // type:data rom:0xCE79F4
+flo_21_80241350 = 0x80241350; // type:data rom:0xCE7A50
+flo_21_main = 0x8024137C; // type:data rom:0xCE7A7C
+flo_21_D_802414FC_CE7BFC = 0x802414FC; // type:data rom:0xCE7BFC
+flo_21_80241560 = 0x80241560; // type:data rom:0xCE7C60
+flo_21_80241580 = 0x80241580; // type:data rom:0xCE7C80
+flo_21_802415A0 = 0x802415A0; // type:data rom:0xCE7CA0
+flo_21_802415C0 = 0x802415C0; // type:data rom:0xCE7CC0
+flo_21_802415E0 = 0x802415E0; // type:data rom:0xCE7CE0
+flo_21_80241600 = 0x80241600; // type:data rom:0xCE7D00
+flo_21_npcSettings_802417C0 = 0x802417C0; // type:data rom:0xCE7EC0
+flo_21_npcSettings_802417EC = 0x802417EC; // type:data rom:0xCE7EEC
+flo_21_npcSettings_80241818 = 0x80241818; // type:data rom:0xCE7F18
+flo_21_npcSettings_80241844 = 0x80241844; // type:data rom:0xCE7F44
+flo_21_npcSettings_80241870 = 0x80241870; // type:data rom:0xCE7F70
+flo_21_vectorList_8024189C = 0x8024189C; // type:data rom:0xCE7F9C
+flo_21_802418C0 = 0x802418C0; // type:data rom:0xCE7FC0
+flo_21_80241920 = 0x80241920; // type:data rom:0xCE8020
+flo_21_80241B98 = 0x80241B98; // type:data rom:0xCE8298
+flo_21_80242290 = 0x80242290; // type:data rom:0xCE8990
+flo_21_intTable_8024249C = 0x8024249C; // type:data rom:0xCE8B9C
+flo_21_intTable_8024258C = 0x8024258C; // type:data rom:0xCE8C8C
+flo_21_intTable_802425D4 = 0x802425D4; // type:data rom:0xCE8CD4
+flo_21_intTable_802425E4 = 0x802425E4; // type:data rom:0xCE8CE4
+flo_21_intTable_8024262C = 0x8024262C; // type:data rom:0xCE8D2C
+flo_21_8024263C = 0x8024263C; // type:data rom:0xCE8D3C
+flo_21_80242918 = 0x80242918; // type:data rom:0xCE9018
+flo_21_80242D34 = 0x80242D34; // type:data rom:0xCE9434
+flo_21_80243010 = 0x80243010; // type:data rom:0xCE9710
+flo_21_idle_80243428 = 0x80243428; // type:data rom:0xCE9B28
+flo_21_defeat_802434D8 = 0x802434D8; // type:data rom:0xCE9BD8
+flo_21_defeat_802435D4 = 0x802435D4; // type:data rom:0xCE9CD4
+flo_21_init_802435E4 = 0x802435E4; // type:data rom:0xCE9CE4
+flo_21_init_80243684 = 0x80243684; // type:data rom:0xCE9D84
+flo_21_init_8024371C = 0x8024371C; // type:data rom:0xCE9E1C
+flo_21_init_802437A8 = 0x802437A8; // type:data rom:0xCE9EA8
+flo_21_extraAnimationList_802437E0 = 0x802437E0; // type:data rom:0xCE9EE0
+flo_21_npcGroup_80243804 = 0x80243804; // type:data rom:0xCE9F04
+flo_21_extraAnimationList_80243DD4 = 0x80243DD4; // type:data rom:0xCEA4D4
+flo_21_npcGroup_80243DDC = 0x80243DDC; // type:data rom:0xCEA4DC
+flo_21_npcGroupList_80245AEC = 0x80245AEC; // type:data rom:0xCEC1EC
+flo_22_func_80240000_CEC240 = 0x80240000; // type:func rom:0xCEC240
+flo_22_UnkFunc36 = 0x80240040; // type:func rom:0xCEC280
 flo_22_foliage_setup_shear_mtx = 0x80240050; // type:func rom:0xCEC290
 flo_22_TransformFoliage = 0x802400C0; // type:func rom:0xCEC300
-func_80240000_CEE260 = 0x80240000; // type:func rom:0xCEE260
+flo_22_entryList = 0x80240290; // type:data rom:0xCEC4D0
+flo_22_config = 0x802402A0; // type:data rom:0xCEC4E0
+flo_22_802402E0 = 0x802402E0; // type:data rom:0xCEC520
+flo_22_exitWalk_80240350 = 0x80240350; // type:data rom:0xCEC590
+flo_22_802403AC = 0x802403AC; // type:data rom:0xCEC5EC
+flo_22_main = 0x802403D8; // type:data rom:0xCEC618
+flo_22_npcSettings_80240520 = 0x80240520; // type:data rom:0xCEC760
+flo_22_idle_8024054C = 0x8024054C; // type:data rom:0xCEC78C
+flo_22_defeat_802405E4 = 0x802405E4; // type:data rom:0xCEC824
+flo_22_init_80240740 = 0x80240740; // type:data rom:0xCEC980
+flo_22_idle_80240778 = 0x80240778; // type:data rom:0xCEC9B8
+flo_22_defeat_80240810 = 0x80240810; // type:data rom:0xCECA50
+flo_22_init_802409CC = 0x802409CC; // type:data rom:0xCECC0C
+flo_22_npcGroup_80240A04 = 0x80240A04; // type:data rom:0xCECC44
+flo_22_npcGroup_80240BF4 = 0x80240BF4; // type:data rom:0xCECE34
+flo_22_npcGroupList_80240DE4 = 0x80240DE4; // type:data rom:0xCED024
+flo_22_itemList_80240E10 = 0x80240E10; // type:data rom:0xCED050
+flo_22_80240E24 = 0x80240E24; // type:data rom:0xCED064
+flo_22_80240E84 = 0x80240E84; // type:data rom:0xCED0C4
+flo_22_80241028 = 0x80241028; // type:data rom:0xCED268
+flo_22_80241528 = 0x80241528; // type:data rom:0xCED768
+flo_22_searchBush_802415A0 = 0x802415A0; // type:data rom:0xCED7E0
+flo_22_shakeTree_80241900 = 0x80241900; // type:data rom:0xCEDB40
+flo_22_treeModelList_Tree1_Trunk = 0x80241F04; // type:data rom:0xCEE144
+flo_22_shakeTreeEvent_Tree1 = 0x80241F14; // type:data rom:0xCEE154
+flo_22_triggerCoord_80241F28 = 0x80241F28; // type:data rom:0xCEE168
+flo_22_treeModelList_Tree2_Trunk = 0x80241F38; // type:data rom:0xCEE178
+flo_22_shakeTreeEvent_Tree2 = 0x80241F48; // type:data rom:0xCEE188
+flo_22_triggerCoord_80241F5C = 0x80241F5C; // type:data rom:0xCEE19C
+flo_22_80241F6C = 0x80241F6C; // type:data rom:0xCEE1AC
+flo_23_func_80240000_CEE260 = 0x80240000; // type:func rom:0xCEE260
 flo_23_GetNpcCollisionHeight = 0x80240040; // type:func rom:0xCEE2A0
 flo_23_AddPlayerHandsOffset = 0x8024009C; // type:func rom:0xCEE2FC
-func_8024026C_CEE4CC = 0x8024026C; // type:func rom:0xCEE4CC
-func_802402C0_CEE520 = 0x802402C0; // type:func rom:0xCEE520
-func_802402F8_CEE558 = 0x802402F8; // type:func rom:0xCEE558
+flo_23_func_8024026C_CEE4CC = 0x8024026C; // type:func rom:0xCEE4CC
+flo_23_func_802402C0_CEE520 = 0x802402C0; // type:func rom:0xCEE520
+flo_23_func_802402F8_CEE558 = 0x802402F8; // type:func rom:0xCEE558
 flo_23_set_script_owner_npc_anim = 0x80240394; // type:func rom:0xCEE5F4
-func_80240410_CEE670 = 0x80240410; // type:func rom:0xCEE670
+flo_23_func_80240410_CEE670 = 0x80240410; // type:func rom:0xCEE670
 flo_23_UnkNpcAIFunc12 = 0x80240544; // type:func rom:0xCEE7A4
 flo_23_set_script_owner_npc_col_height = 0x802406A8; // type:func rom:0xCEE908
-func_80240728_CEE988 = 0x80240728; // type:func rom:0xCEE988
-func_80240B68_CEEDC8 = 0x80240B68; // type:func rom:0xCEEDC8
-func_80240C2C_CEEE8C = 0x80240C2C; // type:func rom:0xCEEE8C
-func_80240C9C_CEEEFC = 0x80240C9C; // type:func rom:0xCEEEFC
-D_8024130C_CEF56C = 0x8024130C; // type:data rom:0xCEF56C
-D_80241310_CEF570 = 0x80241310; // type:data rom:0xCEF570
+flo_23_func_80240728_CEE988 = 0x80240728; // type:func rom:0xCEE988
+flo_23_func_80240B68_CEEDC8 = 0x80240B68; // type:func rom:0xCEEDC8
+flo_23_func_80240C2C_CEEE8C = 0x80240C2C; // type:func rom:0xCEEE8C
+flo_23_func_80240C9C_CEEEFC = 0x80240C9C; // type:func rom:0xCEEEFC
+flo_23_entryList = 0x80240CD0; // type:data rom:0xCEEF30
+flo_23_config = 0x80240CF0; // type:data rom:0xCEEF50
+flo_23_80240D30 = 0x80240D30; // type:data rom:0xCEEF90
+flo_23_80240DA0 = 0x80240DA0; // type:data rom:0xCEF000
+flo_23_exitWalk_8024104C = 0x8024104C; // type:data rom:0xCEF2AC
+flo_23_exitWalk_802410A8 = 0x802410A8; // type:data rom:0xCEF308
+flo_23_80241104 = 0x80241104; // type:data rom:0xCEF364
+flo_23_main = 0x8024114C; // type:data rom:0xCEF3AC
+flo_23_npcSettings_802412E0 = 0x802412E0; // type:data rom:0xCEF540
+flo_23_D_8024130C_CEF56C = 0x8024130C; // type:data rom:0xCEF56C
+flo_23_D_80241310_CEF570 = 0x80241310; // type:data rom:0xCEF570
+flo_23_80241314 = 0x80241314; // type:data rom:0xCEF574
+flo_23_80241448 = 0x80241448; // type:data rom:0xCEF6A8
+flo_23_npcAISettings_80241498 = 0x80241498; // type:data rom:0xCEF6F8
+flo_23_npcAI_802414C8 = 0x802414C8; // type:data rom:0xCEF728
+flo_23_npcSettings_80241538 = 0x80241538; // type:data rom:0xCEF798
+flo_23_interact_80241564 = 0x80241564; // type:data rom:0xCEF7C4
+flo_23_init_80241E70 = 0x80241E70; // type:data rom:0xCF00D0
+flo_23_npcGroup_80241F98 = 0x80241F98; // type:data rom:0xCF01F8
+flo_23_npcGroup_80242188 = 0x80242188; // type:data rom:0xCF03E8
+flo_23_npcGroup_80242378 = 0x80242378; // type:data rom:0xCF05D8
+flo_23_npcGroupList_80242568 = 0x80242568; // type:data rom:0xCF07C8
+flo_23_makeEntities = 0x802425A0; // type:data rom:0xCF0800
 D_80242680_CF08E0 = 0x80242680; // type:data rom:0xCF08E0
-func_80240000_CF0940 = 0x80240000; // type:func rom:0xCF0940
+flo_24_func_80240000_CF0940 = 0x80240000; // type:func rom:0xCF0940
 flo_24_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xCF0980
 flo_24_TransformFoliage = 0x802400B0; // type:func rom:0xCF09F0
 flo_24_UnkTexturePanFunc = 0x80240280; // type:func rom:0xCF0BC0
 flo_24_UnkTexturePanFunc2 = 0x802403A4; // type:func rom:0xCF0CE4
-func_80240000_CF2BD0 = 0x80240000; // type:func rom:0xCF2BD0
-func_80240040_CF2C10 = 0x80240040; // type:func rom:0xCF2C10
-func_802401F0_CF2DC0 = 0x802401F0; // type:func rom:0xCF2DC0
+flo_24_entryList = 0x80240590; // type:data rom:0xCF0ED0
+flo_24_config = 0x802405C0; // type:data rom:0xCF0F00
+flo_24_80240600 = 0x80240600; // type:data rom:0xCF0F40
+flo_24_80240690 = 0x80240690; // type:data rom:0xCF0FD0
+flo_24_exitWalk_8024093C = 0x8024093C; // type:data rom:0xCF127C
+flo_24_exitWalk_80240998 = 0x80240998; // type:data rom:0xCF12D8
+flo_24_802409F4 = 0x802409F4; // type:data rom:0xCF1334
+flo_24_main = 0x80240A3C; // type:data rom:0xCF137C
+flo_24_searchBush_80240D40 = 0x80240D40; // type:data rom:0xCF1680
+flo_24_shakeTree_802410A0 = 0x802410A0; // type:data rom:0xCF19E0
+flo_24_treeModelList_Tree1_Leaves = 0x802416A4; // type:data rom:0xCF1FE4
+flo_24_treeModelList_Tree1_Trunk = 0x802416C0; // type:data rom:0xCF2000
+flo_24_treeDropList_Tree1 = 0x802416C8; // type:data rom:0xCF2008
+flo_24_shakeTreeEvent_Tree1 = 0x80241704; // type:data rom:0xCF2044
+flo_24_triggerCoord_80241718 = 0x80241718; // type:data rom:0xCF2058
+flo_24_80241728 = 0x80241728; // type:data rom:0xCF2068
+flo_24_updateTexturePan_802417A0 = 0x802417A0; // type:data rom:0xCF20E0
+flo_24_8024183C = 0x8024183C; // type:data rom:0xCF217C
+flo_24_80241ABC = 0x80241ABC; // type:data rom:0xCF23FC
+flo_24_makeEntities = 0x802421B0; // type:data rom:0xCF2AF0
+flo_24_flo_10_name_hack = 0x80242280; // type:data rom:0xCF2BC0
+flo_25_func_80240000_CF2BD0 = 0x80240000; // type:func rom:0xCF2BD0
+flo_25_func_80240040_CF2C10 = 0x80240040; // type:func rom:0xCF2C10
+flo_25_func_802401F0_CF2DC0 = 0x802401F0; // type:func rom:0xCF2DC0
 flo_25_UnkNpcAIFunc1 = 0x80240818; // type:func rom:0xCF33E8
 flo_25_UnkFunc4 = 0x802408D8; // type:func rom:0xCF34A8
 flo_25_UnkNpcAIFunc2 = 0x80240C1C; // type:func rom:0xCF37EC
-func_80240C94_CF3864 = 0x80240C94; // type:func rom:0xCF3864
+flo_25_func_80240C94_CF3864 = 0x80240C94; // type:func rom:0xCF3864
 flo_25_UnkNpcAIFunc14 = 0x80240D00; // type:func rom:0xCF38D0
 flo_25_UnkNpcAIFunc3 = 0x80240E34; // type:func rom:0xCF3A04
 flo_25_UnkFunc6 = 0x80240E98; // type:func rom:0xCF3A68
 flo_25_UnkFunc5 = 0x80241228; // type:func rom:0xCF3DF8
-func_8024134C_CF3F1C = 0x8024134C; // type:func rom:0xCF3F1C
+flo_25_func_8024134C_CF3F1C = 0x8024134C; // type:func rom:0xCF3F1C
 flo_25_UnkNpcAIFunc13 = 0x80241538; // type:func rom:0xCF4108
-func_80241668_CF4238 = 0x80241668; // type:func rom:0xCF4238
-func_802418E8_CF44B8 = 0x802418E8; // type:func rom:0xCF44B8
-func_80241944_CF4514 = 0x80241944; // type:func rom:0xCF4514
+flo_25_func_80241668_CF4238 = 0x80241668; // type:func rom:0xCF4238
+flo_25_UnkFunc45 = 0x802418E8; // type:func rom:0xCF44B8
+flo_25_func_80241944_CF4514 = 0x80241944; // type:func rom:0xCF4514
 flo_25_GetNpcCollisionHeight = 0x80241B2C; // type:func rom:0xCF46FC
 flo_25_AddPlayerHandsOffset = 0x80241B88; // type:func rom:0xCF4758
-func_80241D58_CF4928 = 0x80241D58; // type:func rom:0xCF4928
-func_80241DAC_CF497C = 0x80241DAC; // type:func rom:0xCF497C
-func_80241DE4_CF49B4 = 0x80241DE4; // type:func rom:0xCF49B4
-func_80241E80_CF4A50 = 0x80241E80; // type:func rom:0xCF4A50
-func_80241F44_CF4B14 = 0x80241F44; // type:func rom:0xCF4B14
-func_80241FB4_CF4B84 = 0x80241FB4; // type:func rom:0xCF4B84
+flo_25_func_80241D58_CF4928 = 0x80241D58; // type:func rom:0xCF4928
+flo_25_func_80241DAC_CF497C = 0x80241DAC; // type:func rom:0xCF497C
+flo_25_func_80241DE4_CF49B4 = 0x80241DE4; // type:func rom:0xCF49B4
+flo_25_func_80241E80_CF4A50 = 0x80241E80; // type:func rom:0xCF4A50
+flo_25_func_80241F44_CF4B14 = 0x80241F44; // type:func rom:0xCF4B14
+flo_25_func_80241FB4_CF4B84 = 0x80241FB4; // type:func rom:0xCF4B84
 flo_25_foliage_setup_shear_mtx = 0x80241FF0; // type:func rom:0xCF4BC0
 flo_25_TransformFoliage = 0x80242060; // type:func rom:0xCF4C30
-func_80242230_CF4E00 = 0x80242230; // type:func rom:0xCF4E00
-D_8024291C_CF54EC = 0x8024291C; // type:data rom:0xCF54EC
-D_80242ACC_CF569C = 0x80242ACC; // type:data rom:0xCF569C
-D_80242AD0_CF56A0 = 0x80242AD0; // type:data rom:0xCF56A0
+flo_25_UnkFunc43 = 0x80242230; // type:func rom:0xCF4E00
+flo_25_entryList = 0x802422D0; // type:data rom:0xCF4EA0
+flo_25_config = 0x802422F0; // type:data rom:0xCF4EC0
+flo_25_80242330 = 0x80242330; // type:data rom:0xCF4F00
+flo_25_802423A0 = 0x802423A0; // type:data rom:0xCF4F70
+flo_25_exitWalk_8024264C = 0x8024264C; // type:data rom:0xCF521C
+flo_25_exitWalk_802426A8 = 0x802426A8; // type:data rom:0xCF5278
+flo_25_80242704 = 0x80242704; // type:data rom:0xCF52D4
+flo_25_main = 0x8024274C; // type:data rom:0xCF531C
+flo_25_npcSettings_802428F0 = 0x802428F0; // type:data rom:0xCF54C0
+flo_25_D_8024291C_CF54EC = 0x8024291C; // type:data rom:0xCF54EC
+flo_25_npcAISettings_80242934 = 0x80242934; // type:data rom:0xCF5504
+flo_25_npcAI_80242964 = 0x80242964; // type:data rom:0xCF5534
+flo_25_npcSettings_802429D4 = 0x802429D4; // type:data rom:0xCF55A4
+flo_25_npcAISettings_80242A00 = 0x80242A00; // type:data rom:0xCF55D0
+flo_25_npcAI_80242A30 = 0x80242A30; // type:data rom:0xCF5600
+flo_25_npcSettings_80242AA0 = 0x80242AA0; // type:data rom:0xCF5670
+flo_25_D_80242ACC_CF569C = 0x80242ACC; // type:data rom:0xCF569C
+flo_25_D_80242AD0_CF56A0 = 0x80242AD0; // type:data rom:0xCF56A0
+flo_25_80242AD4 = 0x80242AD4; // type:data rom:0xCF56A4
+flo_25_80242C08 = 0x80242C08; // type:data rom:0xCF57D8
+flo_25_interact_80242C58 = 0x80242C58; // type:data rom:0xCF5828
+flo_25_init_80243564 = 0x80243564; // type:data rom:0xCF6134
+flo_25_npcGroup_8024368C = 0x8024368C; // type:data rom:0xCF625C
+flo_25_npcGroup_8024387C = 0x8024387C; // type:data rom:0xCF644C
+flo_25_npcGroup_80243A6C = 0x80243A6C; // type:data rom:0xCF663C
+flo_25_npcGroupList_80243C5C = 0x80243C5C; // type:data rom:0xCF682C
+flo_25_makeEntities = 0x80243C90; // type:data rom:0xCF6860
+flo_25_searchBush_80243CE0 = 0x80243CE0; // type:data rom:0xCF68B0
+flo_25_shakeTree_80244040 = 0x80244040; // type:data rom:0xCF6C10
+flo_25_treeModelList_Tree1_Leaves = 0x80244644; // type:data rom:0xCF7214
+flo_25_treeModelList_Tree1_Trunk = 0x80244654; // type:data rom:0xCF7224
+flo_25_treeDropList_Tree1 = 0x8024465C; // type:data rom:0xCF722C
+flo_25_shakeTreeEvent_Tree1 = 0x80244698; // type:data rom:0xCF7268
+flo_25_triggerCoord_802446AC = 0x802446AC; // type:data rom:0xCF727C
+flo_25_802446BC = 0x802446BC; // type:data rom:0xCF728C
+flo_25_80244740 = 0x80244740; // type:data rom:0xCF7310
+flo_25_802449EC = 0x802449EC; // type:data rom:0xCF75BC
+flo_25_80244D0C = 0x80244D0C; // type:data rom:0xCF78DC
 D_80244EE0_CF7AB0 = 0x80244EE0; // type:data rom:0xCF7AB0
 D_80244EE8_CF7AB8 = 0x80244EE8; // type:data rom:0xCF7AB8
 D_80244EF0_CF7AC0 = 0x80244EF0; // type:data rom:0xCF7AC0
@@ -14546,11 +15585,11 @@ sam_01_GetItemName = 0x802407B4; // type:func rom:0xCF8324
 sam_01_Set80151310_1 = 0x80240818; // type:func rom:0xCF8388
 sam_01_Set80151310_0 = 0x8024082C; // type:func rom:0xCF839C
 func_8024083C_CF83AC = 0x8024083C; // type:func rom:0xCF83AC
-func_80240A60_CF85D0 = 0x80240A60; // type:func rom:0xCF85D0
+sam_01_UnkFunc31 = 0x80240A60; // type:func rom:0xCF85D0
 sam_01_GetNpcUnsafeOwner2 = 0x80240AAC; // type:func rom:0xCF861C
-func_80240ACC_CF863C = 0x80240ACC; // type:func rom:0xCF863C
+sam_01_UnkFunc28 = 0x80240ACC; // type:func rom:0xCF863C
 sam_01_UnkAlphaFunc = 0x80240B2C; // type:func rom:0xCF869C
-func_80240C78_CF87E8 = 0x80240C78; // type:func rom:0xCF87E8
+sam_01_UnkFunc29 = 0x80240C78; // type:func rom:0xCF87E8
 func_80240DEC_CF895C = 0x80240DEC; // type:func rom:0xCF895C
 func_80240E70_CF89E0 = 0x80240E70; // type:func rom:0xCF89E0
 func_80241088_CF8BF8 = 0x80241088; // type:func rom:0xCF8BF8
@@ -14586,7 +15625,7 @@ D_8024373C_CFB2AC = 0x8024373C; // type:data rom:0xCFB2AC
 D_8024D8F0_D05460 = 0x8024D8F0; // type:data rom:0xD05460
 sam_02_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xD05730
 sam_02_GetCurrentFloor = 0x80240020; // type:func rom:0xD05750
-func_80240034_D05764 = 0x80240034; // type:func rom:0xD05764
+sam_02_UnkFunc25 = 0x80240034; // type:func rom:0xD05764
 sam_02_GetEntryPos = 0x802400F0; // type:func rom:0xD05820
 sam_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xD05900
 sam_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xD0596C
@@ -14596,26 +15635,26 @@ sam_02_foliage_setup_shear_mtx = 0x802405EC; // type:func rom:0xD05D1C
 sam_02_TransformFoliage = 0x8024065C; // type:func rom:0xD05D8C
 sam_02_Call800E9894 = 0x80240830; // type:func rom:0xD05F60
 sam_02_Call800E98C4SyncStatusMenu = 0x80240850; // type:func rom:0xD05F80
-func_80240878_D05FA8 = 0x80240878; // type:func rom:0xD05FA8
-func_802408F4_D06024 = 0x802408F4; // type:func rom:0xD06024
+sam_02_UnkFunc32 = 0x80240878; // type:func rom:0xD05FA8
+sam_02_UnkFunc33 = 0x802408F4; // type:func rom:0xD06024
 sam_02_AwaitScriptComplete = 0x80240974; // type:func rom:0xD060A4
 sam_02_PartnerSuspendAbilityScript = 0x802409A4; // type:func rom:0xD060D4
 sam_02_PartnerResumeAbilityScript = 0x802409D0; // type:func rom:0xD06100
-func_802409F0_D06120 = 0x802409F0; // type:func rom:0xD06120
-func_80240A44_D06174 = 0x80240A44; // type:func rom:0xD06174
+sam_02_UnkFunc34 = 0x802409F0; // type:func rom:0xD06120
+sam_02_UnkFunc35 = 0x80240A44; // type:func rom:0xD06174
 sam_02_GetPartnerCall800EB168 = 0x80240AC0; // type:func rom:0xD061F0
 sam_02_Call800EB168 = 0x80240AF4; // type:func rom:0xD06224
-func_80240B24_D06254 = 0x80240B24; // type:func rom:0xD06254
+sam_02_UnkFunc36 = 0x80240B24; // type:func rom:0xD06254
 func_80240B2C_D0625C = 0x80240B2C; // type:func rom:0xD0625C
 sam_02_GetItemName = 0x80240BE0; // type:func rom:0xD06310
 sam_02_Set80151310_1 = 0x80240C44; // type:func rom:0xD06374
 sam_02_Set80151310_0 = 0x80240C58; // type:func rom:0xD06388
 func_80240C68_D06398 = 0x80240C68; // type:func rom:0xD06398
-func_80240E8C_D065BC = 0x80240E8C; // type:func rom:0xD065BC
+sam_02_UnkFunc31 = 0x80240E8C; // type:func rom:0xD065BC
 sam_02_GetNpcUnsafeOwner2 = 0x80240ED8; // type:func rom:0xD06608
-func_80240EF8_D06628 = 0x80240EF8; // type:func rom:0xD06628
+sam_02_UnkFunc28 = 0x80240EF8; // type:func rom:0xD06628
 sam_02_UnkAlphaFunc = 0x80240F58; // type:func rom:0xD06688
-func_802410A4_D067D4 = 0x802410A4; // type:func rom:0xD067D4
+sam_02_UnkFunc29 = 0x802410A4; // type:func rom:0xD067D4
 begin_battle_D06948 = 0x80241218; // type:func rom:0xD06948
 func_8024129C_D069CC = 0x8024129C; // type:func rom:0xD069CC
 func_802414B4_D06BE4 = 0x802414B4; // type:func rom:0xD06BE4
@@ -14706,16 +15745,16 @@ func_80241E18_D21CA8 = 0x80241E18; // type:func rom:0xD21CA8
 func_80241EB4_D21D44 = 0x80241EB4; // type:func rom:0xD21D44
 sam_06_Call800E9894 = 0x80241F50; // type:func rom:0xD21DE0
 sam_06_Call800E98C4SyncStatusMenu = 0x80241F70; // type:func rom:0xD21E00
-func_80241F98_D21E28 = 0x80241F98; // type:func rom:0xD21E28
-func_80242014_D21EA4 = 0x80242014; // type:func rom:0xD21EA4
+sam_06_UnkFunc32 = 0x80241F98; // type:func rom:0xD21E28
+sam_06_UnkFunc33 = 0x80242014; // type:func rom:0xD21EA4
 sam_06_AwaitScriptComplete = 0x80242094; // type:func rom:0xD21F24
 sam_06_PartnerSuspendAbilityScript = 0x802420C4; // type:func rom:0xD21F54
 sam_06_PartnerResumeAbilityScript = 0x802420F0; // type:func rom:0xD21F80
-func_80242110_D21FA0 = 0x80242110; // type:func rom:0xD21FA0
-func_80242164_D21FF4 = 0x80242164; // type:func rom:0xD21FF4
+sam_06_UnkFunc34 = 0x80242110; // type:func rom:0xD21FA0
+sam_06_UnkFunc35 = 0x80242164; // type:func rom:0xD21FF4
 sam_06_GetPartnerCall800EB168 = 0x802421E0; // type:func rom:0xD22070
 sam_06_Call800EB168 = 0x80242214; // type:func rom:0xD220A4
-func_80242244_D220D4 = 0x80242244; // type:func rom:0xD220D4
+sam_06_UnkFunc36 = 0x80242244; // type:func rom:0xD220D4
 sam_06_SetManyVars = 0x8024224C; // type:func rom:0xD220DC
 sam_06_UnkYawFunc = 0x8024233C; // type:func rom:0xD221CC
 func_802424C8_D22358 = 0x802424C8; // type:func rom:0xD22358
@@ -14760,20 +15799,20 @@ sam_08_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xD2FC80
 sam_08_UnkFunc17 = 0x8024001C; // type:func rom:0xD2FC9C
 func_8024003C_D2FCBC = 0x8024003C; // type:func rom:0xD2FCBC
 sam_08_UnkFunc18 = 0x80240068; // type:func rom:0xD2FCE8
-func_802400D4_D2FD54 = 0x802400D4; // type:func rom:0xD2FD54
-func_80240120_D2FDA0 = 0x80240120; // type:func rom:0xD2FDA0
+sam_08_UnkFunc37 = 0x802400D4; // type:func rom:0xD2FD54
+sam_08_UnkFunc38 = 0x80240120; // type:func rom:0xD2FDA0
 func_802401CC_D2FE4C = 0x802401CC; // type:func rom:0xD2FE4C
 func_8024041C_D3009C = 0x8024041C; // type:func rom:0xD3009C
 sam_08_UnkFunc19 = 0x80240448; // type:func rom:0xD300C8
 sam_08_UnkFunc20 = 0x80240480; // type:func rom:0xD30100
-func_80240510_D30190 = 0x80240510; // type:func rom:0xD30190
+sam_08_UnkFunc39 = 0x80240510; // type:func rom:0xD30190
 sam_08_UnkFunc21 = 0x80240544; // type:func rom:0xD301C4
 sam_08_UnkFunc22 = 0x802405A8; // type:func rom:0xD30228
 func_80240600_D30280 = 0x80240600; // type:func rom:0xD30280
 sam_08_UnkFunc23 = 0x80240B38; // type:func rom:0xD307B8
 sam_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xD308F8
 sam_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xD30940
-func_80240D08_D30988 = 0x80240D08; // type:func rom:0xD30988
+sam_08_UnkFunc40 = 0x80240D08; // type:func rom:0xD30988
 sam_08_UnkNpcAIFunc6 = 0x80240D40; // type:func rom:0xD309C0
 sam_08_UnkNpcAIFunc7 = 0x80240DAC; // type:func rom:0xD30A2C
 sam_08_UnkNpcAIFunc8 = 0x80240E1C; // type:func rom:0xD30A9C
@@ -14830,11 +15869,11 @@ sam_11_GetItemName = 0x80240884; // type:func rom:0xD3AE54
 dup_sam_11_Set80151310_1 = 0x802408E8; // type:func rom:0xD3AEB8
 dup_sam_11_Set80151310_0 = 0x802408FC; // type:func rom:0xD3AECC
 func_8024090C_D3AEDC = 0x8024090C; // type:func rom:0xD3AEDC
-func_80240B30_D3B100 = 0x80240B30; // type:func rom:0xD3B100
+sam_11_UnkFunc31 = 0x80240B30; // type:func rom:0xD3B100
 sam_11_GetNpcUnsafeOwner2 = 0x80240B7C; // type:func rom:0xD3B14C
-func_80240B9C_D3B16C = 0x80240B9C; // type:func rom:0xD3B16C
+sam_11_UnkFunc28 = 0x80240B9C; // type:func rom:0xD3B16C
 sam_11_UnkAlphaFunc = 0x80240BFC; // type:func rom:0xD3B1CC
-func_80240D48_D3B318 = 0x80240D48; // type:func rom:0xD3B318
+sam_11_UnkFunc29 = 0x80240D48; // type:func rom:0xD3B318
 func_80240EBC_D3B48C = 0x80240EBC; // type:func rom:0xD3B48C
 func_80240F40_D3B510 = 0x80240F40; // type:func rom:0xD3B510
 func_80241158_D3B728 = 0x80241158; // type:func rom:0xD3B728
@@ -14921,7 +15960,7 @@ func_802411D8_D511C8 = 0x802411D8; // type:func rom:0xD511C8
 func_80241274_D51264 = 0x80241274; // type:func rom:0xD51264
 func_80241310_D51300 = 0x80241310; // type:func rom:0xD51300
 pra_02_GetEntityPosition = 0x802413D8; // type:func rom:0xD513C8
-func_80241478_D51468 = 0x80241478; // type:func rom:0xD51468
+pra_02_UnkFunc44 = 0x80241478; // type:func rom:0xD51468
 func_802414A8_D51498 = 0x802414A8; // type:func rom:0xD51498
 pra_02_SetEntityFlags100000 = 0x80241588; // type:func rom:0xD51578
 dup_pra_02_GetEntityPosition = 0x802415BC; // type:func rom:0xD515AC
@@ -15742,20 +16781,20 @@ omo_11_SetOverrideFlags_40 = 0x80240790; // type:func rom:0xDDCFC0
 omo_11_UnkFunc17 = 0x802407AC; // type:func rom:0xDDCFDC
 func_802407CC_DDCFFC = 0x802407CC; // type:func rom:0xDDCFFC
 omo_11_UnkFunc18 = 0x802407F8; // type:func rom:0xDDD028
-func_80240864_DDD094 = 0x80240864; // type:func rom:0xDDD094
-func_802408B0_DDD0E0 = 0x802408B0; // type:func rom:0xDDD0E0
+omo_11_UnkFunc37 = 0x80240864; // type:func rom:0xDDD094
+omo_11_UnkFunc38 = 0x802408B0; // type:func rom:0xDDD0E0
 func_8024095C_DDD18C = 0x8024095C; // type:func rom:0xDDD18C
 func_80240BAC_DDD3DC = 0x80240BAC; // type:func rom:0xDDD3DC
 omo_11_UnkFunc19 = 0x80240BD8; // type:func rom:0xDDD408
 omo_11_UnkFunc20 = 0x80240C10; // type:func rom:0xDDD440
-func_80240CA0_DDD4D0 = 0x80240CA0; // type:func rom:0xDDD4D0
+omo_11_UnkFunc39 = 0x80240CA0; // type:func rom:0xDDD4D0
 omo_11_UnkFunc21 = 0x80240CD4; // type:func rom:0xDDD504
 omo_11_UnkFunc22 = 0x80240D38; // type:func rom:0xDDD568
 func_80240D90_DDD5C0 = 0x80240D90; // type:func rom:0xDDD5C0
 omo_11_UnkFunc23 = 0x802412C8; // type:func rom:0xDDDAF8
 omo_11_UnkPartnerPosFunc = 0x80241408; // type:func rom:0xDDDC38
 omo_11_UnkPartnerPosFunc2 = 0x80241450; // type:func rom:0xDDDC80
-func_80241498_DDDCC8 = 0x80241498; // type:func rom:0xDDDCC8
+omo_11_UnkFunc40 = 0x80241498; // type:func rom:0xDDDCC8
 D_80241740_DDDF70 = 0x80241740; // type:data rom:0xDDDF70
 D_80241760_DDDF90 = 0x80241760; // type:data rom:0xDDDF90
 D_80241778_DDDFA8 = 0x80241778; // type:data rom:0xDDDFA8
@@ -15763,7 +16802,7 @@ D_80241E40_DDE670 = 0x80241E40; // type:data rom:0xDDE670
 D_80241E48_DDE678 = 0x80241E48; // type:data rom:0xDDE678
 D_80241E58_DDE688 = 0x80241E58; // type:data rom:0xDDE688
 D_80241E98_DDE6C8 = 0x80241E98; // type:data rom:0xDDE6C8
-func_80240000_DDF310 = 0x80240000; // type:func rom:0xDDF310
+omo_12_UnkFunc41 = 0x80240000; // type:func rom:0xDDF310
 func_80240184_DDF494 = 0x80240184; // type:func rom:0xDDF494
 func_802402DC_DDF5EC = 0x802402DC; // type:func rom:0xDDF5EC
 func_802402F8_DDF608 = 0x802402F8; // type:func rom:0xDDF608
@@ -15938,9 +16977,8 @@ func_80242A68_E07DC8 = 0x80242A68; // type:func rom:0xE07DC8
 func_80242B68_E07EC8 = 0x80242B68; // type:func rom:0xE07EC8
 func_80242C68_E07FC8 = 0x80242C68; // type:func rom:0xE07FC8
 func_80242C94_E07FF4 = 0x80242C94; // type:func rom:0xE07FF4
-func_80242CF0_E08050 = 0x80242CF0; // type:func rom:0xE08050
-func_80242E14_E08174 = 0x80242E14; // type:func rom:0xE08174
-D_80243110_E08470 = 0x80243110; // type:data rom:0xE08470
+end_01_UnkFunc27 = 0x80242CF0; // type:func rom:0xE08050
+end_01_UnkFunc26 = 0x80242E14; // type:func rom:0xE08174
 D_80243178_E084D8 = 0x80243178; // type:data rom:0xE084D8
 D_80243200_E08560 = 0x80243200; // type:data rom:0xE08560
 D_80243210_E08570 = 0x80243210; // type:data rom:0xE08570
@@ -15950,7 +16988,7 @@ D_80245D37_E0B097 = 0x80245D37; // type:data rom:0xE0B097
 D_802493A0_E0E700 = 0x802493A0; // type:data rom:0xE0E700
 mgm_00_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xE0E7A0
 mgm_00_GetCurrentFloor = 0x80240020; // type:func rom:0xE0E7C0
-func_80240034_E0E7D4 = 0x80240034; // type:func rom:0xE0E7D4
+mgm_00_UnkFunc25 = 0x80240034; // type:func rom:0xE0E7D4
 mgm_00_GetEntryPos = 0x802400F0; // type:func rom:0xE0E890
 mgm_00_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xE0E970
 mgm_00_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xE0E9DC
@@ -16053,7 +17091,7 @@ D_802484C0_E1E240 = 0x802484C0; // type:data rom:0xE1E240
 D_802484E0_E1E260 = 0x802484E0; // type:data rom:0xE1E260
 gv_01_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xE1E460
 gv_01_GetCurrentFloor = 0x80240020; // type:func rom:0xE1E480
-func_80240034_E1E494 = 0x80240034; // type:func rom:0xE1E494
+gv_01_UnkFunc25 = 0x80240034; // type:func rom:0xE1E494
 gv_01_GetEntryPos = 0x802400F0; // type:func rom:0xE1E550
 gv_01_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xE1E630
 gv_01_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xE1E69C
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index bc133126de..e39869eed9 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -54,7 +54,10 @@ kzn_20_bss = 0x802442D0;
 code_eb1170_bss = 0x802442D0;
 D_000001E4 = 0x1E4;
 gPauseMenuStrings = 0x8026F778;
+broken_kmr_04_function_addr = 0x80243770;
 D_802442D0 = 0x802442D0;
+trd_06_fake_sym = 0x802491C0;
+jan_05_temp_bss = 0x80247AF0;
 D_80244F98_EC7198 = 0x80244F98;
 func_802A123C_73153C = 0x802A123C;
 D_80097E30 = 0x80097E30;
@@ -63,3 +66,8 @@ D_802E9904 = 0x802E9904;
 D_802E98E0 = 0x802E98E0;
 D_802E99DC = 0x802E99DC;
 D_80093DB0 = 0x80093DB0;
+jan_00_fake_sym = 0x80247AF0;
+D_80247AF0_CCB300 = 0x80247AF0;
+D_802491C0_CA70E0 = 0x802491C0;
+pra_09_bss_sym = 0x80246A20;
+obk_01_bss_sym = 0x802458F0;
diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt
index 4d6971d53c..fdef5c823b 100644
--- a/ver/us/undefined_syms_auto.txt
+++ b/ver/us/undefined_syms_auto.txt
@@ -1033,13 +1033,11 @@ D_80242208 = 0x80242208;
 D_80242344 = 0x80242344;
 D_802429BC = 0x802429BC;
 D_802429E0 = 0x802429E0;
-D_80242AC4 = 0x80242AC4;
 D_80242FB0 = 0x80242FB0;
 D_80243190 = 0x80243190;
 D_80243374 = 0x80243374;
 D_80243720 = 0x80243720;
 D_80243BE0 = 0x80243BE0;
-D_80243DA4 = 0x80243DA4;
 D_802440E0 = 0x802440E0;
 D_802440E1 = 0x802440E1;
 D_802440E2 = 0x802440E2;
@@ -1048,7 +1046,6 @@ D_802440E5 = 0x802440E5;
 D_802440EB = 0x802440EB;
 D_802440EF = 0x802440EF;
 D_802440F3 = 0x802440F3;
-D_802440F4 = 0x802440F4;
 D_802440F7 = 0x802440F7;
 D_802440F8 = 0x802440F8;
 D_802440FB = 0x802440FB;
@@ -1063,7 +1060,6 @@ D_80244D88 = 0x80244D88;
 D_802451F0 = 0x802451F0;
 D_80245230 = 0x80245230;
 D_80245278 = 0x80245278;
-D_8024527C = 0x8024527C;
 D_802453D8 = 0x802453D8;
 D_80245430 = 0x80245430;
 D_80245601 = 0x80245601;
@@ -1084,10 +1080,7 @@ D_8024561B = 0x8024561B;
 D_8024561C = 0x8024561C;
 D_8024561F = 0x8024561F;
 D_80245620 = 0x80245620;
-D_80245624 = 0x80245624;
-D_80245630 = 0x80245630;
 D_80245650 = 0x80245650;
-D_802458F0 = 0x802458F0;
 D_80245928 = 0x80245928;
 D_8024592C = 0x8024592C;
 D_802459C0 = 0x802459C0;
@@ -1113,13 +1106,11 @@ D_80246794 = 0x80246794;
 D_802467B4 = 0x802467B4;
 D_80246894 = 0x80246894;
 D_80246990 = 0x80246990;
-D_80246A20 = 0x80246A20;
 D_80246BE8 = 0x80246BE8;
 D_80247050 = 0x80247050;
 D_80247120 = 0x80247120;
 D_802474A0 = 0x802474A0;
 D_80247548 = 0x80247548;
-D_802475E4 = 0x802475E4;
 D_80247664 = 0x80247664;
 D_80247750 = 0x80247750;
 D_802479F0 = 0x802479F0;
@@ -2794,3 +2785,5 @@ jtbl_8022EB80_56DF60 = 0x8022EB80;
 jtbl_80231320_63CEC0 = 0x80231320;
 jtbl_80232A20_6847A0 = 0x80232A20;
 jtbl_80228450_6CBFE0 = 0x80228450;
+pra_09_bss_sym = 0x80246A20;
+obk_01_bss_sym = 0x802458F0;