diff --git a/include/common_structs.h b/include/common_structs.h
index 14115597da..2a81c93b6f 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -1539,13 +1539,14 @@ typedef struct PartnerAnimations {
     /* 0x00 */ s32 anims[9];
 } PartnerAnimations; // size = 0x24
 
+typedef void (*PushBlockFallCallback)(s32 gridSystemID, s32 index);
 typedef struct PushBlockGrid {
-    /* 0x00 */ s8* cells;
+    /* 0x00 */ u8* cells;
     /* 0x04 */ u8 numCellsX;
     /* 0x05 */ u8 numCellsZ;
     /* 0x06 */ char unk_06[2];
     /* 0x08 */ s32 centerPos[3];
-    /* 0x14 */ UNK_FUN_PTR(dropCallback);
+    /* 0x14 */ PushBlockFallCallback(dropCallback);
     /* 0x18 */ char unk_18[4];
 } PushBlockGrid; // size = 0x1C
 
diff --git a/include/enums.h b/include/enums.h
index b575113c2f..a2423f0e71 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -1694,6 +1694,13 @@ enum EntityCollisionFlags {
     ENTITY_COLLISION_PLAYER_LAST_FLOOR                      = 0x00000100
 };
 
+typedef enum PushGridOccupant {
+    PUSH_GRID_EMPTY         = 0,
+    PUSH_GRID_BLOCK         = 1,
+    PUSH_GRID_OBSTRUCTION   = 2,
+    PUSH_GRID_OUT_OF_BOUNDS = 3
+} PushGridOccupant;
+
 enum TriggerFlags {
     TRIGGER_ACTIVE              = 0x00000001,
     TRIGGER_ACTIVATED           = 0x00000002,
diff --git a/include/script_api/macros.h b/include/script_api/macros.h
index bbdaeb76a1..83830e8c7e 100644
--- a/include/script_api/macros.h
+++ b/include/script_api/macros.h
@@ -103,7 +103,8 @@
 
 /// An entity index. Entities are assigned indices in the order they are created with EVT_CALL(MakeEntity, ...).
 /// Supported in EVT_BIND_TRIGGER and EVT_BIND_PADLOCK only.
-#define EVT_ENTITY_INDEX(entityIndex) (((((entityIndex)) + 0x4000)))
+#define EVT_ENTITY_ID_BIT 0x4000
+#define EVT_ENTITY_INDEX(entityIndex) (((((entityIndex)) + EVT_ENTITY_ID_BIT)))
 
 
 /****** INSTRUCTIONS **************************************************************************************************/
diff --git a/src/EA0900.c b/src/EA0900.c
index eefb88ff61..470e5ca35c 100644
--- a/src/EA0900.c
+++ b/src/EA0900.c
@@ -3,5 +3,5 @@
 
 #define NAMESPACE EA0900
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/EA7010.c b/src/EA7010.c
index 8a4adbcabe..6d347a8e1a 100644
--- a/src/EA7010.c
+++ b/src/EA7010.c
@@ -3,5 +3,5 @@
 
 #define NAMESPACE EA7010
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/EA8AE0.c b/src/EA8AE0.c
index 03845fac08..f7d4aeef9d 100644
--- a/src/EA8AE0.c
+++ b/src/EA8AE0.c
@@ -9,7 +9,7 @@
 extern s32 D_80248388[];
 extern s32 D_80248380;
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/StarSpiritEffectFunc.inc.c"
 
diff --git a/src/EB0E60.c b/src/EB0E60.c
index debef309dc..106f9cd56e 100644
--- a/src/EB0E60.c
+++ b/src/EB0E60.c
@@ -3,5 +3,5 @@
 
 #define NAMESPACE EB0E60
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/EB5130.c b/src/EB5130.c
index 928a997c35..5c8950e24e 100644
--- a/src/EB5130.c
+++ b/src/EB5130.c
@@ -3,7 +3,7 @@
 
 #define NAMESPACE EB5130
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 ApiStatus func_8024030C_EB543C(Evt* script, s32 isInitialCall) {
     evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall);
diff --git a/src/EB7230.c b/src/EB7230.c
index f2a125ecb8..18a80d3c4c 100644
--- a/src/EB7230.c
+++ b/src/EB7230.c
@@ -3,5 +3,5 @@
 
 #define NAMESPACE EB7230
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/EC71B0.c b/src/EC71B0.c
index e7ad0a2d33..af86040de9 100644
--- a/src/EC71B0.c
+++ b/src/EC71B0.c
@@ -5,7 +5,7 @@
 
 #define NAMESPACE EC71B0
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/SpawnSunEffect.inc.c"
 
diff --git a/src/ED42A0.c b/src/ED42A0.c
index fb94b7103c..80386a0376 100644
--- a/src/ED42A0.c
+++ b/src/ED42A0.c
@@ -7,5 +7,5 @@
 
 #include "world/common/GetItemName.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/EE65B0.c b/src/EE65B0.c
index 1c067f54f6..60a7a5cd5d 100644
--- a/src/EE65B0.c
+++ b/src/EE65B0.c
@@ -5,7 +5,7 @@
 
 #define NAMESPACE EE65B0
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
     dead_fx_sun(0, 0, 0, 0, 0, 0);
diff --git a/src/EF7A80.c b/src/EF7A80.c
index ff32046835..04b63d36eb 100644
--- a/src/EF7A80.c
+++ b/src/EF7A80.c
@@ -5,7 +5,7 @@
 
 #define NAMESPACE EF7A80
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/DeadUnkFunc1.inc.c"
 
diff --git a/src/EFEB00.c b/src/EFEB00.c
index 2433e72f41..b0d72da4ed 100644
--- a/src/EFEB00.c
+++ b/src/EFEB00.c
@@ -5,7 +5,7 @@
 
 #define NAMESPACE EFEB00
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/DeadUnkFunc1.inc.c"
 
diff --git a/src/battle/area_tik/5EDDF0.c b/src/battle/area_tik/5EDDF0.c
index 03172a6a74..445876742d 100644
--- a/src/battle/area_tik/5EDDF0.c
+++ b/src/battle/area_tik/5EDDF0.c
@@ -4,5 +4,5 @@
 
 INCLUDE_ASM(s32, "battle/area_tik/5EDDF0", func_80219960_5EDDF0);
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/battle/area_tik2/60A470.c b/src/battle/area_tik2/60A470.c
index 70c904f056..1eaade52da 100644
--- a/src/battle/area_tik2/60A470.c
+++ b/src/battle/area_tik2/60A470.c
@@ -4,5 +4,5 @@
 
 INCLUDE_ASM(s32, "battle/area_tik2/60A470", func_802199C0_60A470);
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/battle/area_tik3/6197E0.c b/src/battle/area_tik3/6197E0.c
index 051aaa9f28..a6444b7275 100644
--- a/src/battle/area_tik3/6197E0.c
+++ b/src/battle/area_tik3/6197E0.c
@@ -4,5 +4,5 @@
 
 INCLUDE_ASM(s32, "battle/area_tik3/6197E0", func_802190F0_6197E0);
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/battle/area_trd_part_2/actor/fake_bowser.c b/src/battle/area_trd_part_2/actor/fake_bowser.c
index 93e6cdbf21..983d0ebdcc 100644
--- a/src/battle/area_trd_part_2/actor/fake_bowser.c
+++ b/src/battle/area_trd_part_2/actor/fake_bowser.c
@@ -31,9 +31,7 @@ BSS s32 D_80235FC0[31];
 
 #include "common/StartRumbleWithParams.inc.c"
 
-#include "world/common/UnkFunc27.inc.c"
-
-#include "world/common/UnkFunc26.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
 s32 N(defenseTable_8021A670)[] = {
     ELEMENT_NORMAL, 1,
diff --git a/src/world/area_dro/dro_01/95B200.c b/src/world/area_dro/dro_01/95B200.c
index 2f1e9cc84c..6eae21822b 100644
--- a/src/world/area_dro/dro_01/95B200.c
+++ b/src/world/area_dro/dro_01/95B200.c
@@ -2,6 +2,5 @@
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UnkFunc27.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
-#include "world/common/UnkFunc26.inc.c"
diff --git a/src/world/area_dro/dro_02/9691C0.c b/src/world/area_dro/dro_02/9691C0.c
index 9110f0e622..2c2a08b1cc 100644
--- a/src/world/area_dro/dro_02/9691C0.c
+++ b/src/world/area_dro/dro_02/9691C0.c
@@ -1,5 +1,4 @@
 #include "dro_02.h"
 
-#include "world/common/UnkFunc27.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
-#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 446575f1c9..4d9e597ce9 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -1946,7 +1946,7 @@ EvtScript N(8024AC8C) = {
 };
 
 EvtScript N(interact_8024ADE4) = {
-    EVT_CALL(N(UnkFunc35), 0, 0, 0)
+    EVT_CALL(N(ToadHouse_InitScreenOverlay), 0, 0, 0)
     EVT_EXEC_WAIT(N(8024D434))
     EVT_IF_EQ(EVT_VAR(0), 0)
         EVT_RETURN
@@ -1954,7 +1954,7 @@ EvtScript N(interact_8024ADE4) = {
     EVT_SET(EVT_VAR(9), EVT_VAR(1))
     EVT_SET(EVT_VAR(10), EVT_VAR(2))
     EVT_SET(EVT_VAR(11), EVT_VAR(3))
-    EVT_CALL(N(DoesPlayerNeedSleep))
+    EVT_CALL(N(ToadHouse_DoesPlayerNeedSleep))
     EVT_IF_EQ(EVT_VAR(1), 0)
         EVT_SET(EVT_VAR(8), EVT_VAR(0))
     EVT_END_IF
@@ -1968,19 +1968,19 @@ EvtScript N(interact_8024ADE4) = {
     EVT_CALL(ContinueSpeech, -1, NPC_ANIM_toad_Palette_00_Anim_4, NPC_ANIM_toad_Palette_00_Anim_1, 0, EVT_VAR(10))
     EVT_CALL(SetPlayerJumpscale, 1)
     EVT_CALL(DisablePlayerPhysics, TRUE)
-    EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), TRUE)
-    EVT_CALL(N(Call800E9894))
+    EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE)
+    EVT_CALL(N(ToadHouse_DisableStatusMenu))
     EVT_IF_NE(EVT_VAR(4), 0)
         EVT_EXEC(N(8024AC8C))
     EVT_END_IF
-    EVT_CALL(N(GetPartnerCall800EB168), EVT_VAR(10))
+    EVT_CALL(N(ToadHouse_PutPartnerAway), EVT_VAR(10))
     EVT_WAIT_FRAMES(20)
     EVT_EXEC_WAIT(N(8024D494))
     EVT_THREAD
         EVT_CALL(MakeLerp, 0, 255, 60, 0)
         EVT_LABEL(0)
         EVT_CALL(UpdateLerp)
-        EVT_CALL(N(UnkFunc32), 3, EVT_VAR(0))
+        EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 3, EVT_VAR(0))
         EVT_WAIT_FRAMES(1)
         EVT_IF_EQ(EVT_VAR(1), 1)
             EVT_GOTO(0)
@@ -1990,12 +1990,12 @@ EvtScript N(interact_8024ADE4) = {
         EVT_IF_NE(EVT_VAR(4), 0)
             EVT_EXEC(N(8024AC14))
         EVT_END_IF
-        EVT_CALL(N(Call800EB168), EVT_VAR(10))
+        EVT_CALL(N(ToadHouse_GetPartnerBackOut), EVT_VAR(10))
         EVT_WAIT_FRAMES(45)
         EVT_CALL(MakeLerp, 255, 0, 30, 0)
         EVT_LABEL(1)
         EVT_CALL(UpdateLerp)
-        EVT_CALL(N(UnkFunc32), 0, EVT_VAR(0))
+        EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 0, EVT_VAR(0))
         EVT_WAIT_FRAMES(1)
         EVT_IF_EQ(EVT_VAR(1), 1)
             EVT_GOTO(1)
@@ -2006,7 +2006,7 @@ EvtScript N(interact_8024ADE4) = {
     EVT_CALL(DisablePlayerPhysics, FALSE)
     EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), FALSE)
     EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_toad_Palette_00_Anim_4, NPC_ANIM_toad_Palette_00_Anim_1, 0, EVT_VAR(11))
-    EVT_CALL(N(Call800E98C4SyncStatusMenu))
+    EVT_CALL(N(ToadHouse_ShowStatusMenu))
     EVT_RETURN
     EVT_END
 };
@@ -2646,7 +2646,7 @@ EvtScript N(8024D494) = {
     EVT_CALL(PlayerMoveTo, -179, -198, 0)
     EVT_THREAD
         EVT_WAIT_FRAMES(15)
-        EVT_CALL(N(CamSetFOV), 0, 40)
+        EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40)
         EVT_CALL(SetCamType, 0, 4, 0)
         EVT_CALL(SetCamPitch, 0, 95, -61)
         EVT_CALL(SetCamDistance, 0, 108)
@@ -2669,7 +2669,7 @@ EvtScript N(8024D494) = {
     EVT_WAIT_FRAMES(20)
     EVT_THREAD
         EVT_WAIT_FRAMES(81)
-        EVT_CALL(N(CamSetFOV), 0, 25)
+        EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25)
         EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_CALL(UseSettingsFrom, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
         EVT_WAIT_FRAMES(1)
@@ -3468,25 +3468,7 @@ ApiStatus N(func_802433E8_96C5A8)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 #include "world/common/SetManyVars.inc.c"
 
diff --git a/src/world/area_dro/dro_02/dro_02.h b/src/world/area_dro/dro_02/dro_02.h
index d74334fcb9..5ff054479e 100644
--- a/src/world/area_dro/dro_02/dro_02.h
+++ b/src/world/area_dro/dro_02/dro_02.h
@@ -6,13 +6,13 @@
 
 #define NAMESPACE dro_02
 
-ApiStatus N(Call800E9894)(Evt* script, s32 isInitialCall);
-ApiStatus N(Call800E98C4SyncStatusMenu)(Evt* script, s32 isInitialCall);
-ApiStatus N(Call800EB168)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_DisableStatusMenu)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_ShowStatusMenu)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_GetPartnerBackOut)(Evt* script, s32 isInitialCall);
 ApiStatus N(GetCamVfov)(Evt* script, s32 isInitialCall);
 ApiStatus N(GetGameStatus75)(Evt* script, s32 isInitialCall);
 ApiStatus N(GetNpcUnsafeOwner2)(Evt* script, s32 isInitialCall);
-ApiStatus N(GetPartnerCall800EB168)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_PutPartnerAway)(Evt* script, s32 isInitialCall);
 ApiStatus N(Set80151310_0)(Evt* script, s32 isInitialCall);
 ApiStatus N(Set80151310_1)(Evt* script, s32 isInitialCall);
 ApiStatus N(SetCamVfov)(Evt* script, s32 isInitialCall);
@@ -49,10 +49,10 @@ ApiStatus N(func_802432C0_96C480)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_80243314_96C4D4)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_8024334C_96C50C)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_802433E8_96C5A8)(Evt* script, s32 isInitialCall);
-ApiStatus N(UnkFunc32)(Evt* script, s32 isInitialCall);
-ApiStatus N(CamSetFOV)(Evt* script, s32 isInitialCall);
-ApiStatus N(DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall);
-ApiStatus N(UnkFunc35)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_UpdateScreenOverlay)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_CamSetFOV)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall);
+ApiStatus N(ToadHouse_InitScreenOverlay)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_802439FC_96CBBC)(Evt* script, s32 isInitialCall);
 ApiStatus N(func_80243A40_96CC00)(Evt* script, s32 isInitialCall);
 void N(func_8024240C_96B5CC)(Evt *script, s32 isInitialCall);
diff --git a/src/world/area_end/end_01/E08050.c b/src/world/area_end/end_01/E08050.c
index a6625a6658..4a49b81ee2 100644
--- a/src/world/area_end/end_01/E08050.c
+++ b/src/world/area_end/end_01/E08050.c
@@ -1,5 +1,4 @@
 #include "end_01.h"
 
-#include "world/common/UnkFunc27.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
-#include "world/common/UnkFunc26.inc.c"
diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c
index 3713d6681d..3ca219a69f 100644
--- a/src/world/area_flo/flo_07/CAC1F0.c
+++ b/src/world/area_flo/flo_07/CAC1F0.c
@@ -1,7 +1,7 @@
 #include "flo_07.h"
 #include "effects.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/SpawnSunEffect.inc.c"
 
diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c
index 3e89f5e8e6..f277001f77 100644
--- a/src/world/area_flo/flo_10/CB9280.c
+++ b/src/world/area_flo/flo_10/CB9280.c
@@ -809,5 +809,5 @@ static s32 N(pad_4084)[] = {
 
 #include "world/common/GetItemName.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c
index 2e06919a55..dc8d39f918 100644
--- a/src/world/area_flo/flo_14/CCB310.c
+++ b/src/world/area_flo/flo_14/CCB310.c
@@ -572,7 +572,7 @@ EvtScript N(80243E78) = {
     EVT_END
 };
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 void fx_sun();
 
diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c
index 83f614155e..74281986fa 100644
--- a/src/world/area_flo/flo_18/CDC6A0.c
+++ b/src/world/area_flo/flo_18/CDC6A0.c
@@ -1732,7 +1732,7 @@ static s32 N(pad_66B4)[] = {
     0x00000000, 0x00000000, 0x00000000,
 };
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 // It seems like fx_sun was not properly defined for this file. Having a proper
 // declaration makes it not match.
diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c
index f40576454e..a20db7e05a 100644
--- a/src/world/area_flo/flo_19/CE36F0.c
+++ b/src/world/area_flo/flo_19/CE36F0.c
@@ -691,7 +691,7 @@ EvtScript N(80242FD0) = {
     EVT_END
 };
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 // It seems like fx_sun was not properly defined for this file. Having a proper
 // declaration makes it not match.
diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c
index 9e537e05b9..56a8ce8acf 100644
--- a/src/world/area_flo/flo_21/CE6700.c
+++ b/src/world/area_flo/flo_21/CE6700.c
@@ -1383,7 +1383,7 @@ NpcGroupList N(npcGroupList_80245AEC) = {
     {},
 };
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 EffectInstance* fx_sun();
 
diff --git a/src/world/area_flo/flo_22/CEC280.c b/src/world/area_flo/flo_22/CEC280.c
index 9ccd2dafaa..c3915759b1 100644
--- a/src/world/area_flo/flo_22/CEC280.c
+++ b/src/world/area_flo/flo_22/CEC280.c
@@ -1,3 +1,5 @@
 #include "flo_22.h"
 
-#include "world/common/UnkFunc36.inc.c"
+ApiStatus N(80240040_CEC280)(Evt* script, s32 isInitialCall) {
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/area_flo/flo_24/CF0BC0.c b/src/world/area_flo/flo_24/CF0BC0.c
index 2c5e9671cb..e5c9dc686c 100644
--- a/src/world/area_flo/flo_24/CF0BC0.c
+++ b/src/world/area_flo/flo_24/CF0BC0.c
@@ -1,4 +1,4 @@
 #include "flo_24.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c
index 19d15aaeb8..11615c0706 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/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 ApiStatus func_802405EC_E1EA4C(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c
index b7b7576bbb..a6a0026e73 100644
--- a/src/world/area_hos/hos_01/A11020.c
+++ b/src/world/area_hos/hos_01/A11020.c
@@ -3,7 +3,7 @@
 extern u8 D_80241C2F_A124AF;
 extern u8 D_80241C33_A124B3;
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240AAC_A1132C);
 
diff --git a/src/world/area_hos/hos_02/A16220.c b/src/world/area_hos/hos_02/A16220.c
index ccd196c218..b814ffa6d2 100644
--- a/src/world/area_hos/hos_02/A16220.c
+++ b/src/world/area_hos/hos_02/A16220.c
@@ -3,7 +3,7 @@
 static char* N(exit_str_0) = "hos_01";
 static char* N(exit_str_1) = "hos_03";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_8024030C_A1652C);
 
diff --git a/src/world/area_hos/hos_03/A1B130.c b/src/world/area_hos/hos_03/A1B130.c
index 058bc61550..a044229320 100644
--- a/src/world/area_hos/hos_03/A1B130.c
+++ b/src/world/area_hos/hos_03/A1B130.c
@@ -1,6 +1,6 @@
 #include "hos_03.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024033C_A1B43C);
 
diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c
index cc5678f656..709ab38ee0 100644
--- a/src/world/area_hos/hos_03/A1BDB0.c
+++ b/src/world/area_hos/hos_03/A1BDB0.c
@@ -24,25 +24,7 @@
 
 #include "world/common/UnkNpcAIMainFunc9.inc.c"
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 #include "world/common/StashVars.inc.c"
 
diff --git a/src/world/area_hos/hos_04/A26ED0.c b/src/world/area_hos/hos_04/A26ED0.c
index 60b6695c4c..937c7781c4 100644
--- a/src/world/area_hos/hos_04/A26ED0.c
+++ b/src/world/area_hos/hos_04/A26ED0.c
@@ -7,5 +7,5 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024);
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c
index 2bf130efd3..1e9e47666c 100644
--- a/src/world/area_hos/hos_05/A2A240.c
+++ b/src/world/area_hos/hos_05/A2A240.c
@@ -3,13 +3,20 @@
 static char* N(exit_str_0) = "hos_04";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UnkFunc27.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
-#include "world/common/UnkFunc26.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
+ApiStatus N(AwaitScriptComplete)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 waitingScriptID = evt_get_variable(script, *args++);
+    
+    if (!does_script_exist(waitingScriptID)) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
 
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240634_A2A874);
 
diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c
index 961f79ff33..481c4836b4 100644
--- a/src/world/area_hos/hos_05/A2EF00.c
+++ b/src/world/area_hos/hos_05/A2EF00.c
@@ -5,11 +5,9 @@ extern u8 D_8024DCD3_A37F13;
 extern u8 D_802D9D73;
 
 #define NAMESPACE dup_hos_05
-#include "world/common/UnkFunc27.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
-#include "world/common/UnkFunc26.inc.c"
-
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #define NAMESPACE hos_05
 
diff --git a/src/world/area_hos/hos_06/A394E0.c b/src/world/area_hos/hos_06/A394E0.c
index 5983a01247..27c5aba868 100644
--- a/src/world/area_hos/hos_06/A394E0.c
+++ b/src/world/area_hos/hos_06/A394E0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "hos_00";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_hos/hos_10/A3F760.c b/src/world/area_hos/hos_10/A3F760.c
index abe45b2b68..e5da7f9d3b 100644
--- a/src/world/area_hos/hos_10/A3F760.c
+++ b/src/world/area_hos/hos_10/A3F760.c
@@ -1,6 +1,6 @@
 #include "hos_10.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_8024032C_A3FA6C);
 
diff --git a/src/world/area_hos/hos_10/A3FBA0.c b/src/world/area_hos/hos_10/A3FBA0.c
index f60ac900e9..cc38c6be1f 100644
--- a/src/world/area_hos/hos_10/A3FBA0.c
+++ b/src/world/area_hos/hos_10/A3FBA0.c
@@ -1,6 +1,6 @@
 #include "hos_10.h"
 
 #define NAMESPACE dup_hos_10
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #define NAMESPACE hos_10
diff --git a/src/world/area_hos/hos_20/A45930.c b/src/world/area_hos/hos_20/A45930.c
index 08c4eac2ac..e38618c73d 100644
--- a/src/world/area_hos/hos_20/A45930.c
+++ b/src/world/area_hos/hos_20/A45930.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "hos_00";
 static char* N(exit_str_2) = "osr_03";
 static char* N(exit_str_3) = "hos_05";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_isk/isk_16/9959F0.c b/src/world/area_isk/isk_16/9959F0.c
index 7b6ca70ad8..f096bfddbd 100644
--- a/src/world/area_isk/isk_16/9959F0.c
+++ b/src/world/area_isk/isk_16/9959F0.c
@@ -1,5 +1,3 @@
 #include "isk_16.h"
 
-#include "world/common/UnkFunc27.inc.c"
-
-#include "world/common/UnkFunc26.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c
index 2de0fbf953..f9c946f954 100644
--- a/src/world/area_jan/jan_00/B20540.c
+++ b/src/world/area_jan/jan_00/B20540.c
@@ -1,7 +1,7 @@
 #include "jan_00.h"
 #include "effects.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C);
 
diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c
index f6c242994b..3de5e6ded8 100644
--- a/src/world/area_jan/jan_01/B28030.c
+++ b/src/world/area_jan/jan_01/B28030.c
@@ -3,7 +3,7 @@
 static char* N(exit_str_0) = "jan_00";
 static char* N(exit_str_1) = "jan_02";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_8024030C_B2833C);
 
diff --git a/src/world/area_jan/jan_02/B2C4A0.c b/src/world/area_jan/jan_02/B2C4A0.c
index 011f828d13..2556d15e8f 100644
--- a/src/world/area_jan/jan_02/B2C4A0.c
+++ b/src/world/area_jan/jan_02/B2C4A0.c
@@ -1,6 +1,6 @@
 #include "jan_02.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_8024033C_B2C7AC);
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 148e26b9c0..1c554380a7 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -9,7 +9,7 @@ static char* N(exit_str_3) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);
 
@@ -39,25 +39,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);
 
 static char* N(exit_str_4) = "tik_08";
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
diff --git a/src/world/area_jan/jan_04/B447B0.c b/src/world/area_jan/jan_04/B447B0.c
index 4de3f635e5..4915be8ed4 100644
--- a/src/world/area_jan/jan_04/B447B0.c
+++ b/src/world/area_jan/jan_04/B447B0.c
@@ -1,4 +1,4 @@
 #include "jan_04.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_jan/jan_05/B4AAB0.c b/src/world/area_jan/jan_05/B4AAB0.c
index 47be471158..13ba028cd6 100644
--- a/src/world/area_jan/jan_05/B4AAB0.c
+++ b/src/world/area_jan/jan_05/B4AAB0.c
@@ -1,4 +1,4 @@
 #include "jan_05.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_jan/jan_06/B52830.c b/src/world/area_jan/jan_06/B52830.c
index 469a23c0f6..ef142b0b6b 100644
--- a/src/world/area_jan/jan_06/B52830.c
+++ b/src/world/area_jan/jan_06/B52830.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "jan_07";
 static char* N(exit_str_2) = "jan_12";
 static char* N(exit_str_3) = "jan_09";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_jan/jan_08/B5E2B0.c b/src/world/area_jan/jan_08/B5E2B0.c
index 7dbc225d39..a74012b0e6 100644
--- a/src/world/area_jan/jan_08/B5E2B0.c
+++ b/src/world/area_jan/jan_08/B5E2B0.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "jan_05";
 static char* N(exit_str_2) = "jan_09";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c
index 64a0159d99..ee0fbebfba 100644
--- a/src/world/area_jan/jan_09/B65AB0.c
+++ b/src/world/area_jan/jan_09/B65AB0.c
@@ -7,5 +7,5 @@ static char* N(exit_str_3) = "jan_11";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_jan/jan_10/B6C390.c b/src/world/area_jan/jan_10/B6C390.c
index c0ec38cc25..4566180fc6 100644
--- a/src/world/area_jan/jan_10/B6C390.c
+++ b/src/world/area_jan/jan_10/B6C390.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "jan_09";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c
index 58803d70f7..60847ac9b4 100644
--- a/src/world/area_jan/jan_11/B70860.c
+++ b/src/world/area_jan/jan_11/B70860.c
@@ -3,7 +3,7 @@
 static char* N(exit_str_0) = "jan_09";
 static char* N(exit_str_1) = "";
 
-#include "world/common/DarkRoom.inc.c"
+#include "world/common/atomic/DarkRoom.inc.c"
 
 #include "world/common/atomic/Pipe.inc.c"
 
diff --git a/src/world/area_jan/jan_16/B80000.c b/src/world/area_jan/jan_16/B80000.c
index 6615954fc8..59c12bba94 100644
--- a/src/world/area_jan/jan_16/B80000.c
+++ b/src/world/area_jan/jan_16/B80000.c
@@ -5,6 +5,4 @@ static char* N(exit_str_1) = "jan_22";
 static char* N(exit_str_2) = "jan_17";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UnkFunc27.inc.c"
-
-#include "world/common/UnkFunc26.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
diff --git a/src/world/area_kgr/kgr_01/8A9A10.c b/src/world/area_kgr/kgr_01/8A9A10.c
index e7eebc882a..eccb708e16 100644
--- a/src/world/area_kgr/kgr_01/8A9A10.c
+++ b/src/world/area_kgr/kgr_01/8A9A10.c
@@ -3,4 +3,4 @@
 static char* N(exit_str_0) = "kgr_02";
 static char* N(exit_str_1) = "mac_05";
 
-#include "world/common/DarkRoom.inc.c"
+#include "world/common/atomic/DarkRoom.inc.c"
diff --git a/src/world/area_kgr/kgr_02/8AA450.c b/src/world/area_kgr/kgr_02/8AA450.c
index 7c014eef49..754f932ded 100644
--- a/src/world/area_kgr/kgr_02/8AA450.c
+++ b/src/world/area_kgr/kgr_02/8AA450.c
@@ -3,4 +3,4 @@
 static char* N(exit_str_0) = "kgr_01";
 static char* N(exit_str_1) = "mac_05";
 
-#include "world/common/DarkRoom.inc.c"
+#include "world/common/atomic/DarkRoom.inc.c"
diff --git a/src/world/area_kkj/kkj_03/AC9730.c b/src/world/area_kkj/kkj_03/AC9730.c
index add1970639..571e5c8b82 100644
--- a/src/world/area_kkj/kkj_03/AC9730.c
+++ b/src/world/area_kkj/kkj_03/AC9730.c
@@ -1,4 +1,4 @@
 #include "kkj_03.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kkj/kkj_13/AD5EF0.c b/src/world/area_kkj/kkj_13/AD5EF0.c
index 44d0f644f6..17f5e5dfcd 100644
--- a/src/world/area_kkj/kkj_13/AD5EF0.c
+++ b/src/world/area_kkj/kkj_13/AD5EF0.c
@@ -1,4 +1,4 @@
 #include "kkj_13.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kkj/kkj_14/ADAEF0.c b/src/world/area_kkj/kkj_14/ADAEF0.c
index 58bfd88c49..5fc386d09e 100644
--- a/src/world/area_kkj/kkj_14/ADAEF0.c
+++ b/src/world/area_kkj/kkj_14/ADAEF0.c
@@ -1,6 +1,6 @@
 #include "kkj_14.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_14/ADAEF0", func_8024035C_ADB1FC);
 
diff --git a/src/world/area_kkj/kkj_15/AE5590.c b/src/world/area_kkj/kkj_15/AE5590.c
index 95631f7a61..8ee72ff20b 100644
--- a/src/world/area_kkj/kkj_15/AE5590.c
+++ b/src/world/area_kkj/kkj_15/AE5590.c
@@ -7,6 +7,6 @@ static char* N(exit_str_3) = "kkj_11";
 static char* N(exit_str_4) = "kkj_11\0";
 static char* N(exit_str_5) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_8024030C_AE589C);
diff --git a/src/world/area_kkj/kkj_18/AF2CA0.c b/src/world/area_kkj/kkj_18/AF2CA0.c
index e9470f301e..9cebe0bcaf 100644
--- a/src/world/area_kkj/kkj_18/AF2CA0.c
+++ b/src/world/area_kkj/kkj_18/AF2CA0.c
@@ -5,6 +5,6 @@ static char* N(exit_str_1) = "kkj_19";
 static char* N(exit_str_2) = "kkj_11";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_8024030C_AF2FAC);
diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c
index 3aee75ef12..384a3e514e 100644
--- a/src/world/area_kkj/kkj_20/AFDE00.c
+++ b/src/world/area_kkj/kkj_20/AFDE00.c
@@ -1,23 +1,5 @@
 #include "kkj_20.h"
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405BC_AFE0FC);
diff --git a/src/world/area_kkj/kkj_27/B13D70.c b/src/world/area_kkj/kkj_27/B13D70.c
index 046bb7b3d3..472e7bc3ec 100644
--- a/src/world/area_kkj/kkj_27/B13D70.c
+++ b/src/world/area_kkj/kkj_27/B13D70.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kkj_14";
 static char* N(exit_str_1) = "kkj_15";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c
index 234e6759e0..51391bcdfb 100644
--- a/src/world/area_kmr/kmr_02/8B30E0.c
+++ b/src/world/area_kmr/kmr_02/8B30E0.c
@@ -1,21 +1,3 @@
 #include "kmr_02.h"
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c
index 4979013df3..98baab0b28 100644
--- a/src/world/area_kmr/kmr_20/8ED0C0.c
+++ b/src/world/area_kmr/kmr_20/8ED0C0.c
@@ -1,24 +1,6 @@
 #include "kmr_20.h"
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_8024159C_8ED3BC);
 
diff --git a/src/world/area_kmr/kmr_30/90B6D0.c b/src/world/area_kmr/kmr_30/90B6D0.c
index 60ae22d835..167a1535e4 100644
--- a/src/world/area_kmr/kmr_30/90B6D0.c
+++ b/src/world/area_kmr/kmr_30/90B6D0.c
@@ -1,4 +1,4 @@
 #include "kmr_30.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_01/A46F60.c b/src/world/area_kpa/kpa_01/A46F60.c
index 6f4152d5df..694389c51e 100644
--- a/src/world/area_kpa/kpa_01/A46F60.c
+++ b/src/world/area_kpa/kpa_01/A46F60.c
@@ -3,4 +3,4 @@
 static char* N(exit_str_0) = "kpa_14";
 static char* N(exit_str_1) = "kpa_03";
 
-#include "world/common/DarkRoom.inc.c"
+#include "world/common/atomic/DarkRoom.inc.c"
diff --git a/src/world/area_kpa/kpa_03/A485C0.c b/src/world/area_kpa/kpa_03/A485C0.c
index f04a064739..525e71232d 100644
--- a/src/world/area_kpa/kpa_03/A485C0.c
+++ b/src/world/area_kpa/kpa_03/A485C0.c
@@ -3,4 +3,4 @@
 static char* N(exit_str_0) = "kpa_01";
 static char* N(exit_str_1) = "kpa_04";
 
-#include "world/common/DarkRoom.inc.c"
+#include "world/common/atomic/DarkRoom.inc.c"
diff --git a/src/world/area_kpa/kpa_10/A51980.c b/src/world/area_kpa/kpa_10/A51980.c
index 8760425e8d..0b5c6aee65 100644
--- a/src/world/area_kpa/kpa_10/A51980.c
+++ b/src/world/area_kpa/kpa_10/A51980.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_12";
 static char* N(exit_str_2) = "kpa_17";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_102/A93740.c b/src/world/area_kpa/kpa_102/A93740.c
index 41bdf27254..83d580fd33 100644
--- a/src/world/area_kpa/kpa_102/A93740.c
+++ b/src/world/area_kpa/kpa_102/A93740.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kpa_41";
 static char* N(exit_str_1) = "kpa_53";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_11/A528C0.c b/src/world/area_kpa/kpa_11/A528C0.c
index 61a6fd04f4..d5a963367d 100644
--- a/src/world/area_kpa/kpa_11/A528C0.c
+++ b/src/world/area_kpa/kpa_11/A528C0.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_12";
 static char* N(exit_str_2) = "kpa_17";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_12/A54990.c b/src/world/area_kpa/kpa_12/A54990.c
index b2fc5d11da..6dc30fa78f 100644
--- a/src/world/area_kpa/kpa_12/A54990.c
+++ b/src/world/area_kpa/kpa_12/A54990.c
@@ -1,4 +1,4 @@
 #include "kpa_12.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_13/A55F60.c b/src/world/area_kpa/kpa_13/A55F60.c
index 6c019ec78c..50540ce904 100644
--- a/src/world/area_kpa/kpa_13/A55F60.c
+++ b/src/world/area_kpa/kpa_13/A55F60.c
@@ -1,4 +1,4 @@
 #include "kpa_13.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_133/AA7480.c b/src/world/area_kpa/kpa_133/AA7480.c
index 3dfac43a4f..b13826058f 100644
--- a/src/world/area_kpa/kpa_133/AA7480.c
+++ b/src/world/area_kpa/kpa_133/AA7480.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kpa_51";
 static char* N(exit_str_1) = "kpa_134";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_134/AA8FA0.c b/src/world/area_kpa/kpa_134/AA8FA0.c
index d237cc754b..654333f69b 100644
--- a/src/world/area_kpa/kpa_134/AA8FA0.c
+++ b/src/world/area_kpa/kpa_134/AA8FA0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kpa_133";
 static char* N(exit_str_1) = "kpa_130";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_14/A574F0.c b/src/world/area_kpa/kpa_14/A574F0.c
index 2de4683bcf..8257ce5c75 100644
--- a/src/world/area_kpa/kpa_14/A574F0.c
+++ b/src/world/area_kpa/kpa_14/A574F0.c
@@ -1,5 +1,5 @@
 #include "kpa_14.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_8024034C_A577FC);
diff --git a/src/world/area_kpa/kpa_15/A59390.c b/src/world/area_kpa/kpa_15/A59390.c
index 98ffdbd293..4f7f1b803b 100644
--- a/src/world/area_kpa/kpa_15/A59390.c
+++ b/src/world/area_kpa/kpa_15/A59390.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kpa_13";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_16/A5A030.c b/src/world/area_kpa/kpa_16/A5A030.c
index 0d1d8130e5..7419f5abef 100644
--- a/src/world/area_kpa/kpa_16/A5A030.c
+++ b/src/world/area_kpa/kpa_16/A5A030.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kpa_14";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_32/A5E0C0.c b/src/world/area_kpa/kpa_32/A5E0C0.c
index 9c378d0e4a..ccda01844d 100644
--- a/src/world/area_kpa/kpa_32/A5E0C0.c
+++ b/src/world/area_kpa/kpa_32/A5E0C0.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_90";
 static char* N(exit_str_2) = "kpa_51";
 static char* N(exit_str_3) = "kpa_96";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_33/A5F080.c b/src/world/area_kpa/kpa_33/A5F080.c
index e614b397fe..270f71fc07 100644
--- a/src/world/area_kpa/kpa_33/A5F080.c
+++ b/src/world/area_kpa/kpa_33/A5F080.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_61";
 static char* N(exit_str_2) = "kpa_52";
 static char* N(exit_str_3) = "kpa_09";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_60/A6CBE0.c b/src/world/area_kpa/kpa_60/A6CBE0.c
index d301d42d37..98a5379295 100644
--- a/src/world/area_kpa/kpa_60/A6CBE0.c
+++ b/src/world/area_kpa/kpa_60/A6CBE0.c
@@ -1,4 +1,4 @@
 #include "kpa_60.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_61/A6E3E0.c b/src/world/area_kpa/kpa_61/A6E3E0.c
index 0c0dd0baf0..5c23e89c43 100644
--- a/src/world/area_kpa/kpa_61/A6E3E0.c
+++ b/src/world/area_kpa/kpa_61/A6E3E0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kpa_82";
 static char* N(exit_str_1) = "kpa_33";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_62/A72300.c b/src/world/area_kpa/kpa_62/A72300.c
index 438bb595c1..9eecc4abfc 100644
--- a/src/world/area_kpa/kpa_62/A72300.c
+++ b/src/world/area_kpa/kpa_62/A72300.c
@@ -1,4 +1,4 @@
 #include "kpa_62.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_70/A74870.c b/src/world/area_kpa/kpa_70/A74870.c
index f20186f677..eb30be73c0 100644
--- a/src/world/area_kpa/kpa_70/A74870.c
+++ b/src/world/area_kpa/kpa_70/A74870.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kpa_62";
 static char* N(exit_str_1) = "kpa_50";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c
index cc1ab4ef21..ce10bf8397 100644
--- a/src/world/area_kpa/kpa_91/A86A50.c
+++ b/src/world/area_kpa/kpa_91/A86A50.c
@@ -37,22 +37,4 @@ static char* N(exit_str_1) = "";
 
 #include "world/common/UnkNpcAIMainFunc8.inc.c"
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c
index 430fe4efcb..f5600174f1 100644
--- a/src/world/area_kpa/kpa_95/A8CB60.c
+++ b/src/world/area_kpa/kpa_95/A8CB60.c
@@ -34,22 +34,4 @@
 
 #include "world/common/UnkNpcAIMainFunc8.inc.c"
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
diff --git a/src/world/area_kzn/kzn_01/C599D0.c b/src/world/area_kzn/kzn_01/C599D0.c
index 1299694d89..794334d893 100644
--- a/src/world/area_kzn/kzn_01/C599D0.c
+++ b/src/world/area_kzn/kzn_01/C599D0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "jan_22";
 static char* N(exit_str_1) = "kzn_02";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_02/C5A740.c b/src/world/area_kzn/kzn_02/C5A740.c
index f373f1b79c..35e2ff454e 100644
--- a/src/world/area_kzn/kzn_02/C5A740.c
+++ b/src/world/area_kzn/kzn_02/C5A740.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kzn_01";
 static char* N(exit_str_1) = "kzn_03";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_03/C60D10.c b/src/world/area_kzn/kzn_03/C60D10.c
index b69154479a..7162d6e942 100644
--- a/src/world/area_kzn/kzn_03/C60D10.c
+++ b/src/world/area_kzn/kzn_03/C60D10.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kzn_04";
 static char* N(exit_str_2) = "kzn_09";
 static char* N(exit_str_3) = "kzn_05";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_04/C68130.c b/src/world/area_kzn/kzn_04/C68130.c
index 84137e8e75..a044852eec 100644
--- a/src/world/area_kzn/kzn_04/C68130.c
+++ b/src/world/area_kzn/kzn_04/C68130.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kzn_03";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_05/C6C0D0.c b/src/world/area_kzn/kzn_05/C6C0D0.c
index 48329d0a9e..1feebd0204 100644
--- a/src/world/area_kzn/kzn_05/C6C0D0.c
+++ b/src/world/area_kzn/kzn_05/C6C0D0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kzn_06";
 static char* N(exit_str_1) = "kzn_03";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_06/C6C920.c b/src/world/area_kzn/kzn_06/C6C920.c
index 0bed5fc5c1..511ea5730b 100644
--- a/src/world/area_kzn/kzn_06/C6C920.c
+++ b/src/world/area_kzn/kzn_06/C6C920.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kzn_08";
 static char* N(exit_str_2) = "kzn_07";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_07/C6E330.c b/src/world/area_kzn/kzn_07/C6E330.c
index 8fc4a66e86..bb0ed90e77 100644
--- a/src/world/area_kzn/kzn_07/C6E330.c
+++ b/src/world/area_kzn/kzn_07/C6E330.c
@@ -4,5 +4,5 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240000_C6E330);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240348_C6E678);
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_08/C71480.c b/src/world/area_kzn/kzn_08/C71480.c
index fe722ecdf3..208a3e2d46 100644
--- a/src/world/area_kzn/kzn_08/C71480.c
+++ b/src/world/area_kzn/kzn_08/C71480.c
@@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240000_C71480);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240348_C717C8);
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240718_C71B98);
diff --git a/src/world/area_kzn/kzn_10/C7E180.c b/src/world/area_kzn/kzn_10/C7E180.c
index 9edbe93f91..b019d12b8a 100644
--- a/src/world/area_kzn/kzn_10/C7E180.c
+++ b/src/world/area_kzn/kzn_10/C7E180.c
@@ -3,6 +3,6 @@
 static char* N(exit_str_0) = "kzn_09";
 static char* N(exit_str_1) = "kzn_11";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E180", func_8024030C_C7E48C);
diff --git a/src/world/area_kzn/kzn_11/C801A0.c b/src/world/area_kzn/kzn_11/C801A0.c
index 844c1d82c4..28b298b8c8 100644
--- a/src/world/area_kzn/kzn_11/C801A0.c
+++ b/src/world/area_kzn/kzn_11/C801A0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kzn_10";
 static char* N(exit_str_1) = "kzn_17";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_17/C85AB0.c b/src/world/area_kzn/kzn_17/C85AB0.c
index 33d24cf6df..bcc86db7e7 100644
--- a/src/world/area_kzn/kzn_17/C85AB0.c
+++ b/src/world/area_kzn/kzn_17/C85AB0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kzn_11";
 static char* N(exit_str_1) = "kzn_18";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_18/C8C0E0.c b/src/world/area_kzn/kzn_18/C8C0E0.c
index ee4044ccc0..cabdf98a42 100644
--- a/src/world/area_kzn/kzn_18/C8C0E0.c
+++ b/src/world/area_kzn/kzn_18/C8C0E0.c
@@ -1,4 +1,4 @@
 #include "kzn_18.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c
index a5e799e7b3..dc076095a2 100644
--- a/src/world/area_kzn/kzn_19/C8DBB0.c
+++ b/src/world/area_kzn/kzn_19/C8DBB0.c
@@ -1,6 +1,6 @@
 #include "kzn_19.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/StarSpiritEffectFunc.inc.c"
 
diff --git a/src/world/area_kzn/kzn_20/C95F30.c b/src/world/area_kzn/kzn_20/C95F30.c
index 558abadb82..9cd9050d8b 100644
--- a/src/world/area_kzn/kzn_20/C95F30.c
+++ b/src/world/area_kzn/kzn_20/C95F30.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "kzn_19";
 static char* N(exit_str_1) = "kzn_22";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_kzn/kzn_22/C9A200.c b/src/world/area_kzn/kzn_22/C9A200.c
index afd07d0ef5..21aac84858 100644
--- a/src/world/area_kzn/kzn_22/C9A200.c
+++ b/src/world/area_kzn/kzn_22/C9A200.c
@@ -3,6 +3,6 @@
 static char* N(exit_str_0) = "kzn_20";
 static char* N(exit_str_1) = "kzn_23";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/GetFloorCollider.inc.c"
diff --git a/src/world/area_kzn/kzn_23/C9C300.c b/src/world/area_kzn/kzn_23/C9C300.c
index 0660c4406a..d68f7ddb2a 100644
--- a/src/world/area_kzn/kzn_23/C9C300.c
+++ b/src/world/area_kzn/kzn_23/C9C300.c
@@ -1,4 +1,4 @@
 #include "kzn_23.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c
index 6ea437cf0f..6aceeecf70 100644
--- a/src/world/area_mac/mac_00/7EAD10.c
+++ b/src/world/area_mac/mac_00/7EAD10.c
@@ -9,7 +9,7 @@ static char* N(exit_str_5) = "\0\0\0\0";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 ApiStatus func_802405EC_7EB2FC(Evt* script, s32 isInitialCall) {
     f32 x;
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 2890ab647b..d420559f54 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -103,27 +103,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243680_803F00);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-ApiStatus func_80243AA0_804320(Evt* script, s32 isInitialCall) {
-    return ApiStatus_DONE2;
-}
+#include "world/common/atomic/ToadHouse.inc.c"
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c
index b2286ff112..14635cd1f7 100644
--- a/src/world/area_mac/mac_02/8232C0.c
+++ b/src/world/area_mac/mac_02/8232C0.c
@@ -9,5 +9,5 @@ static char* N(exit_str_5) = "tik_15";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 36e3d9066c..df4dec46b3 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -89,7 +89,10 @@ ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-#include "world/common/Call800E9894.inc.c"
+ApiStatus N(80241C20_8447F0)(Evt* script, s32 isInitialCall) {
+    func_800E9894();
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C40_844810);
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index b9d9a33e51..8627009b48 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -5,7 +5,7 @@ static char* N(exit_str_1) = "kgr_01";
 
 #define UNK_ALPHA_FUNC_NPC 6
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C);
 
diff --git a/src/world/area_mac/mac_06/864B40.c b/src/world/area_mac/mac_06/864B40.c
index fd73b55999..fd3f8dbfcc 100644
--- a/src/world/area_mac/mac_06/864B40.c
+++ b/src/world/area_mac/mac_06/864B40.c
@@ -1,6 +1,6 @@
 #include "mac_06.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_8024030C_864E4C);
 
diff --git a/src/world/area_mac/machi/7E73A0.c b/src/world/area_mac/machi/7E73A0.c
index 361f5f1690..df4967a54c 100644
--- a/src/world/area_mac/machi/7E73A0.c
+++ b/src/world/area_mac/machi/7E73A0.c
@@ -73,7 +73,9 @@ static char* N(exit_str_4) = "jan_00";
 
 INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240000_7E73A0);
 
-#include "world/common/UnkFunc36.inc.c"
+ApiStatus N(80240030_7E73D0)(Evt* script, s32 isInitialCall) {
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240038_7E73D8);
 
diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c
index 998b80fa30..4bfbbf2f80 100644
--- a/src/world/area_mim/mim_11/BB7070.c
+++ b/src/world/area_mim/mim_11/BB7070.c
@@ -9,7 +9,7 @@ static char* N(exit_str_5) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802405EC_BB765C);
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index a33fa3fa6d..5bd0365e58 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -25,25 +25,7 @@ static char* N(exit_str_1) = "nok_02";
 
 #include "world/common/UnkNpcAIMainFunc4.inc.c"
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 #include "world/common/StashVars.inc.c"
 
diff --git a/src/world/area_obk/obk_07/BCF0F0.c b/src/world/area_obk/obk_07/BCF0F0.c
index ab0380861e..a774eed80d 100644
--- a/src/world/area_obk/obk_07/BCF0F0.c
+++ b/src/world/area_obk/obk_07/BCF0F0.c
@@ -44,7 +44,9 @@ 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 "world/common/UnkFunc36.inc.c"
+ApiStatus N(80241788_BD0378)(Evt* script, s32 isInitialCall) {
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241790_BD0380);
 
diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c
index bb4813ad88..58f8f5942a 100644
--- a/src/world/area_omo/omo_03/DA5260.c
+++ b/src/world/area_omo/omo_03/DA5260.c
@@ -18,5 +18,5 @@
 
 #include "common/IsAOrBPressed.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c
index dfc3358f3e..ca62e21c2b 100644
--- a/src/world/area_omo/omo_06/DB7910.c
+++ b/src/world/area_omo/omo_06/DB7910.c
@@ -25,5 +25,5 @@ static char* N(exit_str_7) = "";
 
 #include "common/IsAOrBPressed.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c
index 6c71476b55..174ac08ffd 100644
--- a/src/world/area_omo/omo_08/DC43D0.c
+++ b/src/world/area_omo/omo_08/DC43D0.c
@@ -23,5 +23,5 @@ static char* N(exit_str_5) = "omo_16";
 
 #include "common/IsAOrBPressed.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c
index 7296ae67f7..a6d62cd049 100644
--- a/src/world/area_omo/omo_10/DD79B0.c
+++ b/src/world/area_omo/omo_10/DD79B0.c
@@ -25,5 +25,5 @@ static char* N(exit_str_7) = "";
 
 #include "common/IsAOrBPressed.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c
index 4fd85ec290..06ca45e678 100644
--- a/src/world/area_omo/omo_12/DDF310.c
+++ b/src/world/area_omo/omo_12/DDF310.c
@@ -2,7 +2,7 @@
 
 #include "world/common/UnkFunc41.inc.c"
 
-#include "world/common/DarkRoom.inc.c"
+#include "world/common/atomic/DarkRoom.inc.c"
 
 #include "world/common/SetCamera0Flag1000.inc.c"
 
diff --git a/src/world/area_omo/omo_14/DE56B0.c b/src/world/area_omo/omo_14/DE56B0.c
index 2f74633d1b..bbe213e190 100644
--- a/src/world/area_omo/omo_14/DE56B0.c
+++ b/src/world/area_omo/omo_14/DE56B0.c
@@ -3,4 +3,4 @@
 static char* N(exit_str_0) = "omo_02";
 static char* N(exit_str_1) = "omo_15";
 
-#include "world/common/DarkRoom.inc.c"
+#include "world/common/atomic/DarkRoom.inc.c"
diff --git a/src/world/area_osr/osr_00/AAC830.c b/src/world/area_osr/osr_00/AAC830.c
index 58423eea9c..6af45a2f06 100644
--- a/src/world/area_osr/osr_00/AAC830.c
+++ b/src/world/area_osr/osr_00/AAC830.c
@@ -5,7 +5,7 @@ static char* N(exit_str_1) = "kkj_00";
 static char* N(exit_str_2) = "kmr_20";
 static char* N(exit_str_3) = "kkj_00\0";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_8024030C_AACB3C);
 
diff --git a/src/world/area_osr/osr_00/AACBB0.c b/src/world/area_osr/osr_00/AACBB0.c
index f3ca3c28b6..35a27fffb0 100644
--- a/src/world/area_osr/osr_00/AACBB0.c
+++ b/src/world/area_osr/osr_00/AACBB0.c
@@ -1,8 +1,6 @@
 #include "osr_00.h"
 
-#include "world/common/UnkFunc27.inc.c"
-
-#include "world/common/UnkFunc26.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
 INCLUDE_ASM(s32, "world/area_osr/osr_00/AACBB0", func_80240678_AACEA8);
 
diff --git a/src/world/area_osr/osr_01/AB0040.c b/src/world/area_osr/osr_01/AB0040.c
index 1a132b76ee..2ff56a8e6f 100644
--- a/src/world/area_osr/osr_01/AB0040.c
+++ b/src/world/area_osr/osr_01/AB0040.c
@@ -1,4 +1,4 @@
 #include "osr_01.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_sam/sam_01/CF7B70.c b/src/world/area_sam/sam_01/CF7B70.c
index 69c2d53baa..0dd512003c 100644
--- a/src/world/area_sam/sam_01/CF7B70.c
+++ b/src/world/area_sam/sam_01/CF7B70.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "sam_02";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c
index 53c517790b..1df3eb230f 100644
--- a/src/world/area_sam/sam_02/D05730.c
+++ b/src/world/area_sam/sam_02/D05730.c
@@ -7,7 +7,7 @@ static char* N(exit_str_3) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "common/foliage.inc.c"
 
diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c
index 4b2fd89272..97f7c47e8b 100644
--- a/src/world/area_sam/sam_02/D05F60.c
+++ b/src/world/area_sam/sam_02/D05F60.c
@@ -2,25 +2,7 @@
 
 #define UNK_ALPHA_FUNC_NPC 8
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 #include "world/common/StashVars.inc.c"
 
diff --git a/src/world/area_sam/sam_06/D1FE90.c b/src/world/area_sam/sam_06/D1FE90.c
index 9454670d3d..7c8bdff576 100644
--- a/src/world/area_sam/sam_06/D1FE90.c
+++ b/src/world/area_sam/sam_06/D1FE90.c
@@ -3,7 +3,7 @@
 static char* N(exit_str_0) = "sam_05";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "common/foliage.inc.c"
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 6337ba8d58..15615d3b9f 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -38,25 +38,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44);
 
-#include "world/common/Call800E9894.inc.c"
-
-#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
-
-#include "world/common/UnkFunc32.inc.c"
-
-#include "world/common/CamSetFOV.inc.c"
-
-#include "world/common/AwaitScriptComplete.inc.c"
-
-#include "world/common/PartnerToggleAbilityScript.inc.c"
-
-#include "world/common/DoesPlayerNeedSleep.inc.c"
-
-#include "world/common/UnkFunc35.inc.c"
-
-#include "world/common/GetPartnerCall800EB168.inc.c"
-
-#include "world/common/UnkFunc36.inc.c"
+#include "world/common/atomic/ToadHouse.inc.c"
 
 #include "world/common/SetManyVars.inc.c"
 
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index 6735ea7a94..a35cf9bb42 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802418B4_D3BE84);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241A6C_D3C03C);
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241DAC_D3C37C);
 
diff --git a/src/world/area_sbk/sbk_02/92A2B0.c b/src/world/area_sbk/sbk_02/92A2B0.c
index 5e68b0b2b8..c1fe2dde20 100644
--- a/src/world/area_sbk/sbk_02/92A2B0.c
+++ b/src/world/area_sbk/sbk_02/92A2B0.c
@@ -21,9 +21,7 @@ s32 func_80240000_92A2B0(void) {
     return phi;
 }
 
-#include "world/common/UnkFunc27.inc.c"
-
-#include "world/common/UnkFunc26.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
 ApiStatus func_80240338_92A5E8(Evt* script, s32 isInitialCall) {
     EffectInstance* effect = (EffectInstance*)evt_get_variable(script, EVT_MAP_VAR(0));
diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c
index aeb6c47356..e11cdc83fb 100644
--- a/src/world/area_sbk/sbk_30/93F5B0.c
+++ b/src/world/area_sbk/sbk_30/93F5B0.c
@@ -9,9 +9,7 @@ static char* N(exit_str_5) = "";
 
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240000_93F5B0);
 
-#include "world/common/UnkFunc27.inc.c"
-
-#include "world/common/UnkFunc26.inc.c"
+#include "world/common/atomic/UnkFunc27.inc.c"
 
 #include "world/common/SpawnSunEffect.inc.c"
 
diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c
index 9fd4b399bc..824c789ba7 100644
--- a/src/world/area_tik/tik_01/8694B0.c
+++ b/src/world/area_tik/tik_01/8694B0.c
@@ -7,6 +7,6 @@ static char* N(exit_str_3) = "nok_02";
 static char* N(exit_str_4) = "dro_01";
 static char* N(exit_str_5) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/atomic/Pipe.inc.c"
diff --git a/src/world/area_tik/tik_02/86C740.c b/src/world/area_tik/tik_02/86C740.c
index d363037782..264e79ba79 100644
--- a/src/world/area_tik/tik_02/86C740.c
+++ b/src/world/area_tik/tik_02/86C740.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "tik_18";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c
index d89f71c4be..4c88bebc78 100644
--- a/src/world/area_tik/tik_03/86EB00.c
+++ b/src/world/area_tik/tik_03/86EB00.c
@@ -7,5 +7,5 @@ static char* N(exit_str_3) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c
index 861e63d186..95bb131b08 100644
--- a/src/world/area_tik/tik_04/871A30.c
+++ b/src/world/area_tik/tik_04/871A30.c
@@ -5,6 +5,6 @@ static char* N(exit_str_1) = "tik_07";
 static char* N(exit_str_2) = "tik_03";
 static char* N(exit_str_3) = "tik_12";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/atomic/Pipe.inc.c"
diff --git a/src/world/area_tik/tik_05/874DC0.c b/src/world/area_tik/tik_05/874DC0.c
index 00d45abdd3..a20e2c7893 100644
--- a/src/world/area_tik/tik_05/874DC0.c
+++ b/src/world/area_tik/tik_05/874DC0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "tik_04";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c
index 723232327c..496a3cbfb3 100644
--- a/src/world/area_tik/tik_06/876EE0.c
+++ b/src/world/area_tik/tik_06/876EE0.c
@@ -9,5 +9,5 @@ static char* N(exit_str_5) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c
index 3a9af7ef94..77e4e130c4 100644
--- a/src/world/area_tik/tik_08/87EDF0.c
+++ b/src/world/area_tik/tik_08/87EDF0.c
@@ -7,5 +7,5 @@ static char* N(exit_str_3) = "jan_03";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c
index f6b1b8f3d9..9d701db61f 100644
--- a/src/world/area_tik/tik_09/8821C0.c
+++ b/src/world/area_tik/tik_09/8821C0.c
@@ -7,5 +7,5 @@ static char* N(exit_str_3) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_10/8863C0.c b/src/world/area_tik/tik_10/8863C0.c
index eb5496b07e..248853e944 100644
--- a/src/world/area_tik/tik_10/8863C0.c
+++ b/src/world/area_tik/tik_10/8863C0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "tik_09";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c
index a4a0221f1b..4b4ad4465c 100644
--- a/src/world/area_tik/tik_12/888BD0.c
+++ b/src/world/area_tik/tik_12/888BD0.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c
index 81893df338..ee13d4205d 100644
--- a/src/world/area_tik/tik_14/88D600.c
+++ b/src/world/area_tik/tik_14/88D600.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "tik_21";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c
index e221a92181..e35a0862e6 100644
--- a/src/world/area_tik/tik_15/88FBA0.c
+++ b/src/world/area_tik/tik_15/88FBA0.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "mac_02";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c
index fbef87a889..683d775b3a 100644
--- a/src/world/area_tik/tik_17/893790.c
+++ b/src/world/area_tik/tik_17/893790.c
@@ -2,5 +2,5 @@
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_18/8956E0.c b/src/world/area_tik/tik_18/8956E0.c
index 4065a24cd3..005c47181e 100644
--- a/src/world/area_tik/tik_18/8956E0.c
+++ b/src/world/area_tik/tik_18/8956E0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "tik_06";
 static char* N(exit_str_1) = "tik_02";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c
index 7ece36ae91..640c6cb06e 100644
--- a/src/world/area_tik/tik_19/8975E0.c
+++ b/src/world/area_tik/tik_19/8975E0.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c
index 265e8c4126..ce48705285 100644
--- a/src/world/area_tik/tik_20/89A350.c
+++ b/src/world/area_tik/tik_20/89A350.c
@@ -5,7 +5,7 @@ static char* N(exit_str_1) = "tik_21";
 static char* N(exit_str_2) = "tik_23";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/atomic/Pipe.inc.c"
 
diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c
index df2eadf6c5..9521c9d4b3 100644
--- a/src/world/area_tik/tik_21/89D7A0.c
+++ b/src/world/area_tik/tik_21/89D7A0.c
@@ -5,7 +5,7 @@ static char* N(exit_str_1) = "tik_22";
 static char* N(exit_str_2) = "tik_14";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/atomic/Pipe.inc.c"
 
diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c
index 22ff2a2926..7d10d50c10 100644
--- a/src/world/area_tik/tik_22/89FEF0.c
+++ b/src/world/area_tik/tik_22/89FEF0.c
@@ -1,6 +1,6 @@
 #include "tik_22.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/atomic/Pipe.inc.c"
 
diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c
index 059c6bb5a9..9ace1ff747 100644
--- a/src/world/area_tik/tik_23/8A23D0.c
+++ b/src/world/area_tik/tik_23/8A23D0.c
@@ -5,6 +5,6 @@ static char* N(exit_str_1) = "tik_20";
 
 #include "world/common/atomic/Pipe.inc.c"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/UnkPosFunc2.inc.c"
diff --git a/src/world/area_tik/tik_24/8A5AD0.c b/src/world/area_tik/tik_24/8A5AD0.c
index 6f0f09579c..a9aed24f67 100644
--- a/src/world/area_tik/tik_24/8A5AD0.c
+++ b/src/world/area_tik/tik_24/8A5AD0.c
@@ -1,4 +1,4 @@
 #include "tik_24.h"
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_tik/tik_25/8A7F80.c b/src/world/area_tik/tik_25/8A7F80.c
index 520df4da4b..03a7e77f06 100644
--- a/src/world/area_tik/tik_25/8A7F80.c
+++ b/src/world/area_tik/tik_25/8A7F80.c
@@ -3,6 +3,6 @@
 static char* N(exit_str_0) = "tik_24";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
 #include "world/common/UnkPosFunc2.inc.c"
diff --git a/src/world/area_trd/trd_00/999C70.c b/src/world/area_trd/trd_00/999C70.c
index d47744738f..ed2f2aa321 100644
--- a/src/world/area_trd/trd_00/999C70.c
+++ b/src/world/area_trd/trd_00/999C70.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "trd_01";
 static char* N(exit_str_2) = "trd_05";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_trd/trd_01/99C990.c b/src/world/area_trd/trd_01/99C990.c
index 111be43211..7cd5efda1b 100644
--- a/src/world/area_trd/trd_01/99C990.c
+++ b/src/world/area_trd/trd_01/99C990.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "trd_02";
 static char* N(exit_str_2) = "trd_09";
 static char* N(exit_str_3) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_trd/trd_04/9A83F0.c b/src/world/area_trd/trd_04/9A83F0.c
index 248b346acb..049059111a 100644
--- a/src/world/area_trd/trd_04/9A83F0.c
+++ b/src/world/area_trd/trd_04/9A83F0.c
@@ -5,5 +5,5 @@ static char* N(exit_str_1) = "trd_05";
 static char* N(exit_str_2) = "trd_07";
 static char* N(exit_str_3) = "trd_06";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_trd/trd_06/9B1790.c b/src/world/area_trd/trd_06/9B1790.c
index f1936b4fe6..b01bf7aa0f 100644
--- a/src/world/area_trd/trd_06/9B1790.c
+++ b/src/world/area_trd/trd_06/9B1790.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "trd_04";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_trd/trd_07/9B6980.c b/src/world/area_trd/trd_07/9B6980.c
index f077899bde..8d700384e9 100644
--- a/src/world/area_trd/trd_07/9B6980.c
+++ b/src/world/area_trd/trd_07/9B6980.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "trd_08";
 static char* N(exit_str_1) = "trd_04";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/area_trd/trd_08/9BB2A0.c b/src/world/area_trd/trd_08/9BB2A0.c
index e46ecabebf..1cbd10f219 100644
--- a/src/world/area_trd/trd_08/9BB2A0.c
+++ b/src/world/area_trd/trd_08/9BB2A0.c
@@ -3,5 +3,5 @@
 static char* N(exit_str_0) = "trd_07";
 static char* N(exit_str_1) = "";
 
-#include "world/common/UpdateTexturePan.inc.c"
+#include "world/common/atomic/TexturePan.inc.c"
 
diff --git a/src/world/common/AwaitScriptComplete.inc.c b/src/world/common/AwaitScriptComplete.inc.c
deleted file mode 100644
index f555f6cb20..0000000000
--- a/src/world/common/AwaitScriptComplete.inc.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(AwaitScriptComplete)(Evt* script, s32 isInitialCall) {
-    return (!does_script_exist(evt_get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2;
-}
diff --git a/src/world/common/Call800E9894.inc.c b/src/world/common/Call800E9894.inc.c
deleted file mode 100644
index a770a83999..0000000000
--- a/src/world/common/Call800E9894.inc.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(Call800E9894)(Evt* script, s32 isInitialCall) {
-    func_800E9894();
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/Call800E98C4SyncStatusMenu.inc.c b/src/world/common/Call800E98C4SyncStatusMenu.inc.c
deleted file mode 100644
index 46f9ebd27d..0000000000
--- a/src/world/common/Call800E98C4SyncStatusMenu.inc.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(Call800E98C4SyncStatusMenu)(Evt* script, s32 isInitialCall) {
-    func_800E98C4();
-    sync_status_menu();
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/CamSetFOV.inc.c b/src/world/common/CamSetFOV.inc.c
deleted file mode 100644
index b48fb70293..0000000000
--- a/src/world/common/CamSetFOV.inc.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(CamSetFOV)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32 camIdx = evt_get_variable(script, *args++);
-
-    gCameras[camIdx].vfov = evt_get_variable(script, *args++);
-
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/DoesPlayerNeedSleep.inc.c b/src/world/common/DoesPlayerNeedSleep.inc.c
deleted file mode 100644
index 401048121b..0000000000
--- a/src/world/common/DoesPlayerNeedSleep.inc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(DoesPlayerNeedSleep)(Evt* 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/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c
deleted file mode 100644
index af905e6ca1..0000000000
--- a/src/world/common/GetPartnerCall800EB168.inc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(GetPartnerCall800EB168)(Evt* script, s32 isInitialCall) {
-    evt_set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner);
-    switch_to_partner(0);
-    return ApiStatus_DONE2;
-}
-
-ApiStatus N(Call800EB168)(Evt* script, s32 isInitialCall) {
-    switch_to_partner((s8)evt_get_variable(script, *script->ptrReadPos));
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/PartnerToggleAbilityScript.inc.c b/src/world/common/PartnerToggleAbilityScript.inc.c
deleted file mode 100644
index 145a027f05..0000000000
--- a/src/world/common/PartnerToggleAbilityScript.inc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "common.h"
-#include "../partners.h"
-#include "npc.h"
-
-ApiStatus N(PartnerSuspendAbilityScript)(Evt* script, s32 isInitialCall) {
-    if (gPlayerData.currentPartner == PARTNER_NONE) {
-        return ApiStatus_DONE2;
-    }
-    partner_suspend_ability_script();
-    return ApiStatus_DONE2;
-}
-
-ApiStatus N(PartnerResumeAbilityScript)(Evt* script, s32 isInitialCall) {
-    partner_resume_ability_script();
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/UnkFunc26.inc.c b/src/world/common/UnkFunc26.inc.c
deleted file mode 100644
index 4fb0b05ce3..0000000000
--- a/src/world/common/UnkFunc26.inc.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-void set_model_fog_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7, u8 var8, s32 var9, s32 var10);
-void set_model_env_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7);
-
-ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32 var1 = evt_get_variable(script, *args++);
-    s32 var2 = evt_get_variable(script, *args++);
-    s32 var3 = evt_get_variable(script, *args++);
-    s32 var4 = evt_get_variable(script, *args++);
-    s32 var5 = evt_get_variable(script, *args++);
-    s32 var6 = evt_get_variable(script, *args++);
-    s32 var7 = evt_get_variable(script, *args++);
-    s32 var8 = evt_get_variable(script, *args++);
-    s32 var9 = evt_get_variable(script, *args++);
-    s32 var10 = evt_get_variable(script, *args++);
-
-    switch (var1) {
-        case 1:
-            set_background_color_blend(var2, var3, var4, var5);
-            break;
-        case 2:
-            set_model_fog_color_parameters(var2, var3, var4, var5, var6, var7, var8, var9, var10);
-            break;
-        case 3:
-            set_model_env_color_parameters(var2, var3, var4, var5, var6, var7);
-            break;
-    }
-
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/UnkFunc32.inc.c b/src/world/common/UnkFunc32.inc.c
deleted file mode 100644
index 32341b0177..0000000000
--- a/src/world/common/UnkFunc32.inc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(UnkFunc32)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32 var1 = evt_get_variable(script, *args++);
-    s32 var2 = evt_get_variable(script, *args++);
-
-    set_screen_overlay_center(0, 0, 190, 145);
-    set_screen_overlay_params_front(var1, var2);
-
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/UnkFunc35.inc.c b/src/world/common/UnkFunc35.inc.c
deleted file mode 100644
index d9fc99a114..0000000000
--- a/src/world/common/UnkFunc35.inc.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(UnkFunc35)(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-    s32 R = evt_get_variable(script, *args++);
-    s32 G = evt_get_variable(script, *args++);
-    s32 B = evt_get_variable(script, *args++);
-
-    set_screen_overlay_color(0, R, G, B);
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/UnkFunc36.inc.c b/src/world/common/UnkFunc36.inc.c
deleted file mode 100644
index def2ae4621..0000000000
--- a/src/world/common/UnkFunc36.inc.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "common.h"
-#include "npc.h"
-
-ApiStatus N(UnkFunc36)(Evt* script, s32 isInitialCall) {
-    return ApiStatus_DONE2;
-}
diff --git a/src/world/common/DarkRoom.inc.c b/src/world/common/atomic/DarkRoom.inc.c
similarity index 100%
rename from src/world/common/DarkRoom.inc.c
rename to src/world/common/atomic/DarkRoom.inc.c
diff --git a/src/world/common/UpdateTexturePan.inc.c b/src/world/common/atomic/TexturePan.inc.c
similarity index 100%
rename from src/world/common/UpdateTexturePan.inc.c
rename to src/world/common/atomic/TexturePan.inc.c
diff --git a/src/world/common/atomic/ToadHouse.inc.c b/src/world/common/atomic/ToadHouse.inc.c
new file mode 100644
index 0000000000..ee31e7bdd9
--- /dev/null
+++ b/src/world/common/atomic/ToadHouse.inc.c
@@ -0,0 +1,106 @@
+#include "common.h"
+#include "npc.h"
+#include "../../partners.h"
+
+ApiStatus N(ToadHouse_DisableStatusMenu)(Evt* script, s32 isInitialCall) {
+    func_800E9894();
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_ShowStatusMenu)(Evt* script, s32 isInitialCall) {
+    func_800E98C4();
+    sync_status_menu();
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_UpdateScreenOverlay)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 type = evt_get_variable(script, *args++);
+    s32 zoom = evt_get_variable(script, *args++);
+
+    set_screen_overlay_center(0, 0, 190, 145);
+    set_screen_overlay_params_front(type, zoom);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_CamSetFOV)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 camIdx = evt_get_variable(script, *args++);
+
+    gCameras[camIdx].vfov = evt_get_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_AwaitScriptComplete)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 waitingScriptID = evt_get_variable(script, *args++);
+    
+    if (!does_script_exist(waitingScriptID)) {
+        return ApiStatus_DONE2;
+    } else {
+        return ApiStatus_BLOCK;
+    }
+}
+
+ApiStatus N(ToadHouse_PartnerSuspendAbilityScript)(Evt* script, s32 isInitialCall) {
+    if (gPlayerData.currentPartner == PARTNER_NONE) {
+        return ApiStatus_DONE2;
+    }
+    partner_suspend_ability_script();
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_PartnerResumeAbilityScript)(Evt* script, s32 isInitialCall) {
+    partner_resume_ability_script();
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_DoesPlayerNeedSleep)(Evt* 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;
+}
+
+ApiStatus N(ToadHouse_InitScreenOverlay)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 r = evt_get_variable(script, *args++);
+    s32 g = evt_get_variable(script, *args++);
+    s32 b = evt_get_variable(script, *args++);
+
+    set_screen_overlay_color(0, r, g, b);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_PutPartnerAway)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Bytecode saveToVar = *args++;
+
+    evt_set_variable(script, saveToVar, gPlayerData.currentPartner);
+    switch_to_partner(PARTNER_NONE);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus N(ToadHouse_GetPartnerBackOut)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Bytecode readFromVar = *args++;
+
+    switch_to_partner((s8)evt_get_variable(script, readFromVar));
+    return ApiStatus_DONE2;
+}
+
+// do nothing (unused)
+ApiStatus N(ToadHouse_Stub)(Evt* script, s32 isInitialCall) {
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/common/UnkFunc27.inc.c b/src/world/common/atomic/UnkFunc27.inc.c
similarity index 52%
rename from src/world/common/UnkFunc27.inc.c
rename to src/world/common/atomic/UnkFunc27.inc.c
index 3547e4ee94..62f0b31b30 100644
--- a/src/world/common/UnkFunc27.inc.c
+++ b/src/world/common/atomic/UnkFunc27.inc.c
@@ -48,3 +48,34 @@ ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall) {
     }
     return ApiStatus_DONE2;
 }
+
+void set_model_fog_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7, u8 var8, s32 var9, s32 var10);
+void set_model_env_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7);
+
+ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 var1 = evt_get_variable(script, *args++);
+    s32 var2 = evt_get_variable(script, *args++);
+    s32 var3 = evt_get_variable(script, *args++);
+    s32 var4 = evt_get_variable(script, *args++);
+    s32 var5 = evt_get_variable(script, *args++);
+    s32 var6 = evt_get_variable(script, *args++);
+    s32 var7 = evt_get_variable(script, *args++);
+    s32 var8 = evt_get_variable(script, *args++);
+    s32 var9 = evt_get_variable(script, *args++);
+    s32 var10 = evt_get_variable(script, *args++);
+
+    switch (var1) {
+        case 1:
+            set_background_color_blend(var2, var3, var4, var5);
+            break;
+        case 2:
+            set_model_fog_color_parameters(var2, var3, var4, var5, var6, var7, var8, var9, var10);
+            break;
+        case 3:
+            set_model_env_color_parameters(var2, var3, var4, var5, var6, var7);
+            break;
+    }
+
+    return ApiStatus_DONE2;
+}
diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c
index cd8e014339..e5a7c090c4 100644
--- a/src/world/script_api/7E3700.c
+++ b/src/world/script_api/7E3700.c
@@ -1,5 +1,11 @@
 #include "common.h"
 
+extern PushBlockGrid* D_802DBC88[]; //TODO determind length
+extern EvtScript D_80285674_7E64F4;
+extern EntityBlueprint D_802EA2BC;
+
+#define BLOCK_GRID_SIZE 25
+
 ApiStatus func_80282880(Evt* script, s32 isInitialCall) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
@@ -22,20 +28,147 @@ INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283174);
 ApiStatus CheckActionState(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Bytecode a0 = *args++;
-    s32 var = evt_get_float_variable(script, *args);
+    s32 var = evt_get_float_variable(script, *args++);
 
     evt_set_variable(script, a0, gPlayerActionState == var);
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283240);
+ApiStatus func_80283240(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
+    Bytecode outVar = *args++;
+    Bytecode* sourceToFind = (Bytecode*)evt_get_variable(script, *args++);
+    s32 retVal = FALSE;
+    s32 i;
 
-INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", CreatePushBlockGrid, Evt* script, s32 isInitialCall);
+    for (i = 0; i < MAX_SCRIPTS; i++) {
+        Evt* iterScript = get_script_by_index(i);
+        if (iterScript != 0) {
+            if (iterScript->ptrFirstLine == sourceToFind) {
+                retVal = TRUE;
+                break;
+            }
+        }
+    }
+    evt_set_variable(script, outVar, retVal);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", SetPushBlock, Evt* script, s32 isInitialCall);
+ApiStatus CreatePushBlockGrid(Evt* script, s32 isInitialCall) {
+    Bytecode* arg = script->ptrReadPos;
+    s32 blockSystemID = evt_get_variable(script, *arg++);
+    s32 sizeNx = evt_get_variable(script, *arg++);
+    s32 sizeNz = evt_get_variable(script, *arg++);
+    s32 centerX = evt_get_variable(script, *arg++);
+    s32 centerY = evt_get_variable(script, *arg++);
+    s32 centerZ = evt_get_variable(script, *arg++);
+    u8* inputGridData = (u8*)evt_get_variable(script, *arg++);
 
-INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", GetPushBlock, Evt* script, s32 isInitialCall);
+    PushBlockGrid* blockGrid;
+    u8* dataToCopy;
+    s32 i;
 
-INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", GetGridIndexFromPos, Evt* script, s32 isInitialCall);
+    D_802DBC88[blockSystemID] = blockGrid = general_heap_malloc(sizeof(PushBlockGrid));
 
-INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", SetPushBlockFallEffect, Evt* script, s32 isInitialCall);
+    blockGrid->cells = general_heap_malloc(sizeNx*sizeNz);
+
+    if (inputGridData == NULL) {
+        for (i = 0; i < sizeNx*sizeNz; i++) {
+            blockGrid->cells[i] = 0;
+        }
+    } else {
+        dataToCopy = inputGridData;
+        for (i = 0; i < sizeNx*sizeNz; i++) {
+            blockGrid->cells[i] = dataToCopy[i];
+        }
+    }
+
+    blockGrid->numCellsX = sizeNx;
+    blockGrid->numCellsZ = sizeNz;
+    blockGrid->centerPos[0] = centerX;
+    blockGrid->centerPos[1] = centerY;
+    blockGrid->centerPos[2] = centerZ;
+    blockGrid->dropCallback = NULL;
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus SetPushBlock(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 blockSystemID = evt_get_variable(script, *args++);
+    s32 gridX = evt_get_variable(script, *args++);
+    s32 gridZ = evt_get_variable(script, *args++);
+    s32 occupant = evt_get_variable(script, *args++);
+
+    PushBlockGrid* blockGrid = D_802DBC88[blockSystemID];
+    s32 blockEntityID;
+    s32 cellIndex;
+
+    cellIndex = gridX + (gridZ * blockGrid->numCellsX);
+    blockGrid->cells[cellIndex] = occupant;
+
+    if (occupant == PUSH_GRID_BLOCK) {
+        s32 posX = blockGrid->centerPos[0] + (gridX * BLOCK_GRID_SIZE) + (BLOCK_GRID_SIZE / 2);
+        s32 posY = blockGrid->centerPos[1];
+        s32 posZ = blockGrid->centerPos[2] + (gridZ * BLOCK_GRID_SIZE) + (BLOCK_GRID_SIZE / 2);
+        blockEntityID = create_entity(&D_802EA2BC, posX, posY, posZ, 0, 0, 0, 0, MAKE_ENTITY_END);
+        bind_trigger_1(&D_80285674_7E64F4, TRIGGER_WALL_PUSH, blockEntityID + EVT_ENTITY_ID_BIT, (s32)blockGrid, blockEntityID, 3);
+        script->varTable[0] = blockEntityID;
+    }
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus GetPushBlock(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 blockSystemID = evt_get_variable(script, *args++);
+    s32 gridX = evt_get_variable(script, *args++);
+    s32 gridZ = evt_get_variable(script, *args++);
+    s32 outVar = *args++;
+
+    PushBlockGrid* blockGrid = D_802DBC88[blockSystemID];
+    s32 cellIndex;
+
+    if (gridX >= blockGrid->numCellsX || gridX < 0 || gridZ >= blockGrid->numCellsZ || gridZ < 0) {
+         // vanilla bug: sets error value and then performs lookup anyway -- return statement forgotten here
+        evt_set_variable(script, outVar, PUSH_GRID_OUT_OF_BOUNDS);
+    }
+    cellIndex = gridX + (gridZ * blockGrid->numCellsX);
+    evt_set_variable(script, outVar, blockGrid->cells[cellIndex]);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus GetGridIndexFromPos(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 blockSystemID = evt_get_variable(script, *args++);
+    s32 posX = evt_get_variable(script, *args++);
+    s32 posY = evt_get_variable(script, *args++);
+    s32 posZ = evt_get_variable(script, *args++);
+    Bytecode outVarX = *args++;
+    Bytecode outVarZ = *args++;
+
+    PushBlockGrid* blockGrid = D_802DBC88[blockSystemID];
+    s32 gridX;
+    s32 gridZ;
+
+    posX -= blockGrid->centerPos[0];
+    gridX = posX / BLOCK_GRID_SIZE;
+    posZ -= blockGrid->centerPos[2];
+    gridZ = posZ / BLOCK_GRID_SIZE;
+
+    evt_set_variable(script, outVarX, gridX);
+    evt_set_variable(script, outVarZ, gridZ);
+
+    return ApiStatus_DONE2;
+}
+
+ApiStatus SetPushBlockFallEffect(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 blockSystemID = evt_get_variable(script, *args++);
+    PushBlockFallCallback fallCallback = (PushBlockFallCallback)evt_get_variable(script, *args++);
+
+    D_802DBC88[blockSystemID]->dropCallback = fallCallback;
+
+    return ApiStatus_DONE2;
+}
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 737095b0d3..75e903af8a 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 @@ dlabel 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
 
 dlabel 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, 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
+.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_ToadHouse_InitScreenOverlay, 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_ToadHouse_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_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247B1C_A22C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80247AA4_A22BA4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, hos_03_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, hos_03_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel hos_03_varTable
 .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 348c0e6ee2..655957643f 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
@@ -99,7 +99,7 @@ dlabel D_8024A794_A25894
 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B30002, 0x00B30001, 0x00000000, 0x000A0063, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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, 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
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A794_A25894, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x8024365C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, hos_03_ToadHouse_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_ToadHouse_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
 
 dlabel D_8024AB00_A25C00
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80247C74, 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 160107b966..a3d8846af6 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 @@ dlabel 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
 
 dlabel D_8024709C_B3BC6C
-.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
+.word 0x00000043, 0x00000004, jan_03_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024A6B8_B3F288, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, jan_03_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, jan_03_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246F44_B3BB14, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A718_B3F2E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246ECC_B3BA9C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024A9AC_B3F57C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, jan_03_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247444_B3C014
 .word 0x00000000
@@ -249,7 +249,7 @@ dlabel 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
 
 dlabel D_8024A718_B3F2E8
-.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
+.word 0x00000044, 0x00000001, 0x80243394, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8880, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000142, 0xFFFFFF4E, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, jan_03_ToadHouse_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_ToadHouse_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
 
 dlabel 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_kkj/kkj_20/AFE610.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE610.data.s
index 4d1968be2d..64cf6c3949 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 @@ dlabel 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
 
 dlabel D_80242E6C_B009AC
-.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
+.word 0x00000043, 0x00000004, kkj_20_ToadHouse_InitScreenOverlay, 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_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kkj_20_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C9C_B007DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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 @@ dlabel 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
 
 dlabel D_8024390C_B0144C
-.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
+.word 0x00000044, 0x00000001, 0x8024066C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000032, 0xFFFFFFD8, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kkj_20_ToadHouse_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_ToadHouse_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
 
 dlabel 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
 
 dlabel D_80243C24_B01764
-.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
+.word 0x00000043, 0x00000004, kkj_20_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024385C_B0139C, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kkj_20_ToadHouse_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_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242D14_B00854, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_20_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024390C_B0144C, 0xFE363C89, 0x00000043, 0x00000002, kkj_20_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kkj_20_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kkj_20_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
index 80c5abdaa1..fa7e20cd05 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
@@ -456,13 +456,13 @@ dlabel 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
 
 dlabel D_80254264_8C42D4
-.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
+.word 0x00000043, 0x00000004, kmr_02_ToadHouse_InitScreenOverlay, 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_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_02_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8025410C_8C417C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80254094_8C4104, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_02_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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
 
 dlabel D_802546BC_8C472C
-.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
+.word 0x00000044, 0x00000001, 0x80243C6C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kmr_02_ToadHouse_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_ToadHouse_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
 
 dlabel 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_20/8F3130.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s
index 1327b54230..d7e659027c 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 @@ dlabel 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
 
 dlabel 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, 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
+.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_ToadHouse_InitScreenOverlay, 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_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_20_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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
 
 dlabel 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, 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
+.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_ToadHouse_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_ToadHouse_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
 
 dlabel 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
 
 dlabel D_80249FE4_8F5E04
-.word 0x00000043, 0x00000001, kmr_20_WaitForPlayerToLand, 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
+.word 0x00000043, 0x00000001, kmr_20_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, kmr_20_ToadHouse_InitScreenOverlay, 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_ToadHouse_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_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80249A5C_8F587C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, kmr_20_ToadHouse_ShowStatusMenu, 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_kpa/kpa_91/A88730.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s
index 346322414b..da61afc1bc 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 @@ dlabel 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
 
 dlabel D_8024415C_A8ABAC
-.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
+.word 0x00000043, 0x00000004, kpa_91_ToadHouse_InitScreenOverlay, 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_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_91_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244004_A8AA54, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243F8C_A8A9DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_91_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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
 
 dlabel D_80244564_A8AFB4
-.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
+.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kpa_91_ToadHouse_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
 
 dlabel D_80244800_A8B250
-.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
+.word 0x00000043, 0x00000003, kpa_91_ToadHouse_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
 
 dlabel 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 1bf2d9ead9..3846cb844b 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 @@ dlabel 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
 
 dlabel D_8024436C_A90DEC
-.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
+.word 0x00000043, 0x00000004, kpa_95_ToadHouse_InitScreenOverlay, 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_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_95_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244214_A90C94, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024419C_A90C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_95_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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
 
 dlabel D_80244774_A911F4
-.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
+.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kpa_95_ToadHouse_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
 
 dlabel D_80244A10_A91490
-.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
+.word 0x00000043, 0x00000003, kpa_95_ToadHouse_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
 
 dlabel 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_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
index 08e6de92c0..0078da54b0 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
@@ -186,7 +186,7 @@ dlabel 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
 
 dlabel D_8024D59C_80DE1C
-.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
+.word 0x00000043, 0x00000004, mac_01_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025BAE0_81C360, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, mac_01_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mac_01_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D444_80DCC4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8025BB80_81C400, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D3CC_80DC4C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025BDDC_81C65C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, mac_01_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024D944_80E1C4
 .word 0x00000000
@@ -558,7 +558,7 @@ dlabel 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
 
 dlabel D_8025BB80_81C400
-.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
+.word 0x00000044, 0x00000001, 0x80246924, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000217, 0xFFFFFF65, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, mac_01_ToadHouse_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_ToadHouse_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
 
 dlabel 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_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
index f922f49f22..834664ca9e 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
@@ -180,7 +180,7 @@ dlabel D_8024911C_84BCEC
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80248E2C_84B9FC, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249184_84BD54
-.word 0x0000000A, 0x00000002, 0xF8405CA3, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A8, 0x00000024, 0x00000002, 0xF8405CA3, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A9, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_Call800E9894, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E000E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AA, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_GetPlayerCoins, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000027, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AB, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B90_844760, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AC, 0x00000043, 0x00000002, ShowChoice, 0x001E000B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AD, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D1, 0x00000016, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D2, 0x00000016, 0x00000001, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D3, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600B1, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFD9, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AE, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x0000024B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C87, 0x0000001A, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60006, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60001, 0x00000043, 0x00000001, func_80241A64_844634, 0x00000043, 0x00000002, func_802418AC_84447C, 0xFE363C86, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600AF, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600B0, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x00002098, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF97188B2, 0x00000001, 0x00000043, 0x00000001, func_80241C60_844830, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405CA3, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A8, 0x00000024, 0x00000002, 0xF8405CA3, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A9, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_80241C20_8447F0, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E000E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AA, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_GetPlayerCoins, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000027, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AB, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B90_844760, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AC, 0x00000043, 0x00000002, ShowChoice, 0x001E000B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AD, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D1, 0x00000016, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D2, 0x00000016, 0x00000001, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D3, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600B1, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFD9, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AE, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x0000024B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C87, 0x0000001A, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60006, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60001, 0x00000043, 0x00000001, func_80241A64_844634, 0x00000043, 0x00000002, func_802418AC_84447C, 0xFE363C86, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600AF, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600B0, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x00002098, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF97188B2, 0x00000001, 0x00000043, 0x00000001, func_80241C60_844830, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802497B0_84C380
 .word 0x0000000A, 0x00000002, 0xF97188B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000026, 0x00000034, 0x00000043, 0x00000003, mac_04_SetNpcShadowScale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00010000, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249184_84BD54, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
index a1f08ce1f5..e2b492366d 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
@@ -102,7 +102,7 @@ dlabel 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
 
 dlabel D_80245B9C_9CAF7C
-.word 0x00000043, 0x00000004, nok_01_UnkFunc35, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249810_9CEBF0, 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, D_802498E8_9CECC8, 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, D_80249B68_9CEF48, 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 0x00000043, 0x00000004, nok_01_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249810_9CEBF0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, nok_01_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, nok_01_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80245A44_9CAE24, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802498E8_9CECC8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802459CC_9CADAC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, nok_01_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, nok_01_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249B68_9CEF48, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, nok_01_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel nok_01_varTable
 .word 0x00000000
@@ -255,7 +255,7 @@ dlabel D_80249810_9CEBF0
 .word 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
 
 dlabel D_802498E8_9CECC8
-.word 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
+.word 0x00000044, 0x00000001, 0x80242F38, 0x00000043, 0x00000004, func_802D1270, 0xFFFFFEC9, 0x00000055, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, nok_01_ToadHouse_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_ToadHouse_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
 
 dlabel D_80249B68_9CEF48
 .word 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
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 829871bc11..1817e9cb41 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 @@ dlabel 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
 
 dlabel D_802446EC_BD32DC
-.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, obk_07_UnkFunc36, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, obk_07_80241788_BD0378, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
index 08ee8709de..3b609a3671 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 @@ dlabel 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
 
 dlabel D_802466E4_D0BE14
-.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
+.word 0x00000043, 0x00000004, sam_02_ToadHouse_InitScreenOverlay, 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_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, sam_02_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024658C_D0BCBC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_02_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246514_D0BC44, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_02_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_02_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80246A8C_D0C1BC
 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001
@@ -171,7 +171,7 @@ dlabel 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
 
 dlabel D_802492D0_D0EA00
-.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
+.word 0x00000044, 0x00000001, 0x80241CDC, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000126, 0xFFFFFF2B, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, sam_02_ToadHouse_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_ToadHouse_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
 
 dlabel 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 1241682e8a..4f771aa0e1 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 @@ dlabel 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
 
 dlabel D_80246A94_D26924
-.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
+.word 0x00000043, 0x00000004, sam_06_ToadHouse_InitScreenOverlay, 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_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, sam_06_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024693C_D267CC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_ToadHouse_PutPartnerAway, 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_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802468C4_D26754, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_06_ToadHouse_UpdateScreenOverlay, 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_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel 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 @@ dlabel 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
 
 dlabel D_80249AB0_D29940
-.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
+.word 0x00000044, 0x00000001, 0x8024269C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEB0, 0xFFFFFFD0, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, sam_06_ToadHouse_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_ToadHouse_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
 
 dlabel 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/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
deleted file mode 100644
index 3d0f5d7a8e..0000000000
--- a/ver/us/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
+++ /dev/null
@@ -1,112 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel CreatePushBlockGrid
-/* 7E4160 802832E0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 7E4164 802832E4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4168 802832E8 0080882D */  daddu     $s1, $a0, $zero
-/* 7E416C 802832EC AFBF0034 */  sw        $ra, 0x34($sp)
-/* 7E4170 802832F0 AFBE0030 */  sw        $fp, 0x30($sp)
-/* 7E4174 802832F4 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 7E4178 802832F8 AFB60028 */  sw        $s6, 0x28($sp)
-/* 7E417C 802832FC AFB50024 */  sw        $s5, 0x24($sp)
-/* 7E4180 80283300 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7E4184 80283304 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E4188 80283308 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E418C 8028330C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4190 80283310 8E30000C */  lw        $s0, 0xc($s1)
-/* 7E4194 80283314 8E050000 */  lw        $a1, ($s0)
-/* 7E4198 80283318 0C0B1EAF */  jal       evt_get_variable
-/* 7E419C 8028331C 26100004 */   addiu    $s0, $s0, 4
-/* 7E41A0 80283320 8E050000 */  lw        $a1, ($s0)
-/* 7E41A4 80283324 26100004 */  addiu     $s0, $s0, 4
-/* 7E41A8 80283328 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41AC 8028332C 0C0B1EAF */  jal       evt_get_variable
-/* 7E41B0 80283330 0040902D */   daddu    $s2, $v0, $zero
-/* 7E41B4 80283334 8E050000 */  lw        $a1, ($s0)
-/* 7E41B8 80283338 26100004 */  addiu     $s0, $s0, 4
-/* 7E41BC 8028333C 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41C0 80283340 0C0B1EAF */  jal       evt_get_variable
-/* 7E41C4 80283344 0040A82D */   daddu    $s5, $v0, $zero
-/* 7E41C8 80283348 8E050000 */  lw        $a1, ($s0)
-/* 7E41CC 8028334C 26100004 */  addiu     $s0, $s0, 4
-/* 7E41D0 80283350 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41D4 80283354 0C0B1EAF */  jal       evt_get_variable
-/* 7E41D8 80283358 0040A02D */   daddu    $s4, $v0, $zero
-/* 7E41DC 8028335C 8E050000 */  lw        $a1, ($s0)
-/* 7E41E0 80283360 26100004 */  addiu     $s0, $s0, 4
-/* 7E41E4 80283364 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41E8 80283368 0C0B1EAF */  jal       evt_get_variable
-/* 7E41EC 8028336C 0040F02D */   daddu    $fp, $v0, $zero
-/* 7E41F0 80283370 0220202D */  daddu     $a0, $s1, $zero
-/* 7E41F4 80283374 8E050000 */  lw        $a1, ($s0)
-/* 7E41F8 80283378 0C0B1EAF */  jal       evt_get_variable
-/* 7E41FC 8028337C 0040B82D */   daddu    $s7, $v0, $zero
-/* 7E4200 80283380 02B40018 */  mult      $s5, $s4
-/* 7E4204 80283384 26100004 */  addiu     $s0, $s0, 4
-/* 7E4208 80283388 0220202D */  daddu     $a0, $s1, $zero
-/* 7E420C 8028338C 8E050000 */  lw        $a1, ($s0)
-/* 7E4210 80283390 00008812 */  mflo      $s1
-/* 7E4214 80283394 0C0B1EAF */  jal       evt_get_variable
-/* 7E4218 80283398 0040B02D */   daddu    $s6, $v0, $zero
-/* 7E421C 8028339C 2404001C */  addiu     $a0, $zero, 0x1c
-/* 7E4220 802833A0 0C00AB0A */  jal       general_heap_malloc
-/* 7E4224 802833A4 0040982D */   daddu    $s3, $v0, $zero
-/* 7E4228 802833A8 00129080 */  sll       $s2, $s2, 2
-/* 7E422C 802833AC 0040802D */  daddu     $s0, $v0, $zero
-/* 7E4230 802833B0 3C01802E */  lui       $at, %hi(D_802DBC88)
-/* 7E4234 802833B4 00320821 */  addu      $at, $at, $s2
-/* 7E4238 802833B8 AC30BC88 */  sw        $s0, %lo(D_802DBC88)($at)
-/* 7E423C 802833BC 0C00AB0A */  jal       general_heap_malloc
-/* 7E4240 802833C0 0220202D */   daddu    $a0, $s1, $zero
-/* 7E4244 802833C4 1660000D */  bnez      $s3, .L802833FC
-/* 7E4248 802833C8 AE020000 */   sw       $v0, ($s0)
-/* 7E424C 802833CC 1A200018 */  blez      $s1, .L80283430
-/* 7E4250 802833D0 0000282D */   daddu    $a1, $zero, $zero
-/* 7E4254 802833D4 0220202D */  daddu     $a0, $s1, $zero
-.L802833D8:
-/* 7E4258 802833D8 8E020000 */  lw        $v0, ($s0)
-/* 7E425C 802833DC 00451021 */  addu      $v0, $v0, $a1
-/* 7E4260 802833E0 24A50001 */  addiu     $a1, $a1, 1
-/* 7E4264 802833E4 A0400000 */  sb        $zero, ($v0)
-/* 7E4268 802833E8 00A4102A */  slt       $v0, $a1, $a0
-/* 7E426C 802833EC 1440FFFA */  bnez      $v0, .L802833D8
-/* 7E4270 802833F0 00000000 */   nop
-/* 7E4274 802833F4 080A0D0D */  j         .L80283434
-/* 7E4278 802833F8 A2150004 */   sb       $s5, 4($s0)
-.L802833FC:
-/* 7E427C 802833FC 0000282D */  daddu     $a1, $zero, $zero
-/* 7E4280 80283400 1A20000B */  blez      $s1, .L80283430
-/* 7E4284 80283404 0260302D */   daddu    $a2, $s3, $zero
-/* 7E4288 80283408 0220202D */  daddu     $a0, $s1, $zero
-/* 7E428C 8028340C 00C51021 */  addu      $v0, $a2, $a1
-.L80283410:
-/* 7E4290 80283410 8E030000 */  lw        $v1, ($s0)
-/* 7E4294 80283414 90420000 */  lbu       $v0, ($v0)
-/* 7E4298 80283418 00651821 */  addu      $v1, $v1, $a1
-/* 7E429C 8028341C 24A50001 */  addiu     $a1, $a1, 1
-/* 7E42A0 80283420 A0620000 */  sb        $v0, ($v1)
-/* 7E42A4 80283424 00A4102A */  slt       $v0, $a1, $a0
-/* 7E42A8 80283428 1440FFF9 */  bnez      $v0, .L80283410
-/* 7E42AC 8028342C 00C51021 */   addu     $v0, $a2, $a1
-.L80283430:
-/* 7E42B0 80283430 A2150004 */  sb        $s5, 4($s0)
-.L80283434:
-/* 7E42B4 80283434 A2140005 */  sb        $s4, 5($s0)
-/* 7E42B8 80283438 AE1E0008 */  sw        $fp, 8($s0)
-/* 7E42BC 8028343C AE17000C */  sw        $s7, 0xc($s0)
-/* 7E42C0 80283440 AE160010 */  sw        $s6, 0x10($s0)
-/* 7E42C4 80283444 AE000014 */  sw        $zero, 0x14($s0)
-/* 7E42C8 80283448 8FBF0034 */  lw        $ra, 0x34($sp)
-/* 7E42CC 8028344C 8FBE0030 */  lw        $fp, 0x30($sp)
-/* 7E42D0 80283450 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 7E42D4 80283454 8FB60028 */  lw        $s6, 0x28($sp)
-/* 7E42D8 80283458 8FB50024 */  lw        $s5, 0x24($sp)
-/* 7E42DC 8028345C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7E42E0 80283460 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E42E4 80283464 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E42E8 80283468 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E42EC 8028346C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E42F0 80283470 24020002 */  addiu     $v0, $zero, 2
-/* 7E42F4 80283474 03E00008 */  jr        $ra
-/* 7E42F8 80283478 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
deleted file mode 100644
index 768faac3aa..0000000000
--- a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
+++ /dev/null
@@ -1,65 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel GetGridIndexFromPos
-/* 7E4538 802836B8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E453C 802836BC AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E4540 802836C0 0080982D */  daddu     $s3, $a0, $zero
-/* 7E4544 802836C4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 7E4548 802836C8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E454C 802836CC AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4550 802836D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4554 802836D4 8E70000C */  lw        $s0, 0xc($s3)
-/* 7E4558 802836D8 8E050000 */  lw        $a1, ($s0)
-/* 7E455C 802836DC 0C0B1EAF */  jal       evt_get_variable
-/* 7E4560 802836E0 26100004 */   addiu    $s0, $s0, 4
-/* 7E4564 802836E4 8E050000 */  lw        $a1, ($s0)
-/* 7E4568 802836E8 26100004 */  addiu     $s0, $s0, 4
-/* 7E456C 802836EC 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4570 802836F0 0C0B1EAF */  jal       evt_get_variable
-/* 7E4574 802836F4 0040882D */   daddu    $s1, $v0, $zero
-/* 7E4578 802836F8 0040902D */  daddu     $s2, $v0, $zero
-/* 7E457C 802836FC 8E050000 */  lw        $a1, ($s0)
-/* 7E4580 80283700 26100004 */  addiu     $s0, $s0, 4
-/* 7E4584 80283704 0C0B1EAF */  jal       evt_get_variable
-/* 7E4588 80283708 0260202D */   daddu    $a0, $s3, $zero
-/* 7E458C 8028370C 8E050000 */  lw        $a1, ($s0)
-/* 7E4590 80283710 0C0B1EAF */  jal       evt_get_variable
-/* 7E4594 80283714 0260202D */   daddu    $a0, $s3, $zero
-/* 7E4598 80283718 00118880 */  sll       $s1, $s1, 2
-/* 7E459C 8028371C 3C04802E */  lui       $a0, %hi(D_802DBC88)
-/* 7E45A0 80283720 00912021 */  addu      $a0, $a0, $s1
-/* 7E45A4 80283724 8C84BC88 */  lw        $a0, %lo(D_802DBC88)($a0)
-/* 7E45A8 80283728 3C0651EB */  lui       $a2, 0x51eb
-/* 7E45AC 8028372C 8C830008 */  lw        $v1, 8($a0)
-/* 7E45B0 80283730 34C6851F */  ori       $a2, $a2, 0x851f
-/* 7E45B4 80283734 02439023 */  subu      $s2, $s2, $v1
-/* 7E45B8 80283738 02460018 */  mult      $s2, $a2
-/* 7E45BC 8028373C 26100004 */  addiu     $s0, $s0, 4
-/* 7E45C0 80283740 8E050000 */  lw        $a1, ($s0)
-/* 7E45C4 80283744 8E100004 */  lw        $s0, 4($s0)
-/* 7E45C8 80283748 8C830010 */  lw        $v1, 0x10($a0)
-/* 7E45CC 8028374C 00003810 */  mfhi      $a3
-/* 7E45D0 80283750 0260202D */  daddu     $a0, $s3, $zero
-/* 7E45D4 80283754 00431023 */  subu      $v0, $v0, $v1
-/* 7E45D8 80283758 00460018 */  mult      $v0, $a2
-/* 7E45DC 8028375C 001297C3 */  sra       $s2, $s2, 0x1f
-/* 7E45E0 80283760 000730C3 */  sra       $a2, $a3, 3
-/* 7E45E4 80283764 00D23023 */  subu      $a2, $a2, $s2
-/* 7E45E8 80283768 000217C3 */  sra       $v0, $v0, 0x1f
-/* 7E45EC 8028376C 00001810 */  mfhi      $v1
-/* 7E45F0 80283770 000388C3 */  sra       $s1, $v1, 3
-/* 7E45F4 80283774 0C0B2026 */  jal       evt_set_variable
-/* 7E45F8 80283778 02228823 */   subu     $s1, $s1, $v0
-/* 7E45FC 8028377C 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4600 80283780 0200282D */  daddu     $a1, $s0, $zero
-/* 7E4604 80283784 0C0B2026 */  jal       evt_set_variable
-/* 7E4608 80283788 0220302D */   daddu    $a2, $s1, $zero
-/* 7E460C 8028378C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 7E4610 80283790 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E4614 80283794 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E4618 80283798 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E461C 8028379C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4620 802837A0 24020002 */  addiu     $v0, $zero, 2
-/* 7E4624 802837A4 03E00008 */  jr        $ra
-/* 7E4628 802837A8 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
deleted file mode 100644
index b7a7fcd3b6..0000000000
--- a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel GetPushBlock
-/* 7E4440 802835C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E4444 802835C4 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7E4448 802835C8 0080A02D */  daddu     $s4, $a0, $zero
-/* 7E444C 802835CC AFBF0024 */  sw        $ra, 0x24($sp)
-/* 7E4450 802835D0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E4454 802835D4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E4458 802835D8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E445C 802835DC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4460 802835E0 8E90000C */  lw        $s0, 0xc($s4)
-/* 7E4464 802835E4 8E050000 */  lw        $a1, ($s0)
-/* 7E4468 802835E8 0C0B1EAF */  jal       evt_get_variable
-/* 7E446C 802835EC 26100004 */   addiu    $s0, $s0, 4
-/* 7E4470 802835F0 8E050000 */  lw        $a1, ($s0)
-/* 7E4474 802835F4 26100004 */  addiu     $s0, $s0, 4
-/* 7E4478 802835F8 0280202D */  daddu     $a0, $s4, $zero
-/* 7E447C 802835FC 0C0B1EAF */  jal       evt_get_variable
-/* 7E4480 80283600 0040882D */   daddu    $s1, $v0, $zero
-/* 7E4484 80283604 0280202D */  daddu     $a0, $s4, $zero
-/* 7E4488 80283608 8E050000 */  lw        $a1, ($s0)
-/* 7E448C 8028360C 0C0B1EAF */  jal       evt_get_variable
-/* 7E4490 80283610 0040982D */   daddu    $s3, $v0, $zero
-/* 7E4494 80283614 00118880 */  sll       $s1, $s1, 2
-/* 7E4498 80283618 26100004 */  addiu     $s0, $s0, 4
-/* 7E449C 8028361C 3C12802E */  lui       $s2, %hi(D_802DBC88)
-/* 7E44A0 80283620 02519021 */  addu      $s2, $s2, $s1
-/* 7E44A4 80283624 8E52BC88 */  lw        $s2, %lo(D_802DBC88)($s2)
-/* 7E44A8 80283628 92430004 */  lbu       $v1, 4($s2)
-/* 7E44AC 8028362C 8E100000 */  lw        $s0, ($s0)
-/* 7E44B0 80283630 0263182A */  slt       $v1, $s3, $v1
-/* 7E44B4 80283634 10600009 */  beqz      $v1, .L8028365C
-/* 7E44B8 80283638 0040882D */   daddu    $s1, $v0, $zero
-/* 7E44BC 8028363C 06600008 */  bltz      $s3, .L80283660
-/* 7E44C0 80283640 0280202D */   daddu    $a0, $s4, $zero
-/* 7E44C4 80283644 92420005 */  lbu       $v0, 5($s2)
-/* 7E44C8 80283648 0222102A */  slt       $v0, $s1, $v0
-/* 7E44CC 8028364C 10400005 */  beqz      $v0, .L80283664
-/* 7E44D0 80283650 0200282D */   daddu    $a1, $s0, $zero
-/* 7E44D4 80283654 06210005 */  bgez      $s1, .L8028366C
-/* 7E44D8 80283658 00000000 */   nop
-.L8028365C:
-/* 7E44DC 8028365C 0280202D */  daddu     $a0, $s4, $zero
-.L80283660:
-/* 7E44E0 80283660 0200282D */  daddu     $a1, $s0, $zero
-.L80283664:
-/* 7E44E4 80283664 0C0B2026 */  jal       evt_set_variable
-/* 7E44E8 80283668 24060003 */   addiu    $a2, $zero, 3
-.L8028366C:
-/* 7E44EC 8028366C 92420004 */  lbu       $v0, 4($s2)
-/* 7E44F0 80283670 02220018 */  mult      $s1, $v0
-/* 7E44F4 80283674 0280202D */  daddu     $a0, $s4, $zero
-/* 7E44F8 80283678 8E420000 */  lw        $v0, ($s2)
-/* 7E44FC 8028367C 00003812 */  mflo      $a3
-/* 7E4500 80283680 02671821 */  addu      $v1, $s3, $a3
-/* 7E4504 80283684 00431021 */  addu      $v0, $v0, $v1
-/* 7E4508 80283688 90460000 */  lbu       $a2, ($v0)
-/* 7E450C 8028368C 0C0B2026 */  jal       evt_set_variable
-/* 7E4510 80283690 0200282D */   daddu    $a1, $s0, $zero
-/* 7E4514 80283694 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 7E4518 80283698 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7E451C 8028369C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E4520 802836A0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E4524 802836A4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E4528 802836A8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E452C 802836AC 24020002 */  addiu     $v0, $zero, 2
-/* 7E4530 802836B0 03E00008 */  jr        $ra
-/* 7E4534 802836B4 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
deleted file mode 100644
index 79ff8eb097..0000000000
--- a/ver/us/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
+++ /dev/null
@@ -1,86 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel SetPushBlock
-/* 7E42FC 8028347C 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 7E4300 80283480 AFB30034 */  sw        $s3, 0x34($sp)
-/* 7E4304 80283484 0080982D */  daddu     $s3, $a0, $zero
-/* 7E4308 80283488 AFBF0038 */  sw        $ra, 0x38($sp)
-/* 7E430C 8028348C AFB20030 */  sw        $s2, 0x30($sp)
-/* 7E4310 80283490 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 7E4314 80283494 AFB00028 */  sw        $s0, 0x28($sp)
-/* 7E4318 80283498 8E70000C */  lw        $s0, 0xc($s3)
-/* 7E431C 8028349C 8E050000 */  lw        $a1, ($s0)
-/* 7E4320 802834A0 0C0B1EAF */  jal       evt_get_variable
-/* 7E4324 802834A4 26100004 */   addiu    $s0, $s0, 4
-/* 7E4328 802834A8 8E050000 */  lw        $a1, ($s0)
-/* 7E432C 802834AC 26100004 */  addiu     $s0, $s0, 4
-/* 7E4330 802834B0 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4334 802834B4 0C0B1EAF */  jal       evt_get_variable
-/* 7E4338 802834B8 0040882D */   daddu    $s1, $v0, $zero
-/* 7E433C 802834BC 8E050000 */  lw        $a1, ($s0)
-/* 7E4340 802834C0 26100004 */  addiu     $s0, $s0, 4
-/* 7E4344 802834C4 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4348 802834C8 0C0B1EAF */  jal       evt_get_variable
-/* 7E434C 802834CC 0040902D */   daddu    $s2, $v0, $zero
-/* 7E4350 802834D0 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4354 802834D4 8E050000 */  lw        $a1, ($s0)
-/* 7E4358 802834D8 0C0B1EAF */  jal       evt_get_variable
-/* 7E435C 802834DC 0040802D */   daddu    $s0, $v0, $zero
-/* 7E4360 802834E0 00118880 */  sll       $s1, $s1, 2
-/* 7E4364 802834E4 3C01802E */  lui       $at, %hi(D_802DBC88)
-/* 7E4368 802834E8 00310821 */  addu      $at, $at, $s1
-/* 7E436C 802834EC 8C31BC88 */  lw        $s1, %lo(D_802DBC88)($at)
-/* 7E4370 802834F0 92230004 */  lbu       $v1, 4($s1)
-/* 7E4374 802834F4 02030018 */  mult      $s0, $v1
-/* 7E4378 802834F8 8E230000 */  lw        $v1, ($s1)
-/* 7E437C 802834FC 00004012 */  mflo      $t0
-/* 7E4380 80283500 02482021 */  addu      $a0, $s2, $t0
-/* 7E4384 80283504 00641821 */  addu      $v1, $v1, $a0
-/* 7E4388 80283508 A0620000 */  sb        $v0, ($v1)
-/* 7E438C 8028350C 24030001 */  addiu     $v1, $zero, 1
-/* 7E4390 80283510 14430023 */  bne       $v0, $v1, .L802835A0
-/* 7E4394 80283514 3C028000 */   lui      $v0, 0x8000
-/* 7E4398 80283518 3C04802F */  lui       $a0, %hi(D_802EA2BC)
-/* 7E439C 8028351C 2484A2BC */  addiu     $a0, $a0, %lo(D_802EA2BC)
-/* 7E43A0 80283520 8E250008 */  lw        $a1, 8($s1)
-/* 7E43A4 80283524 8E26000C */  lw        $a2, 0xc($s1)
-/* 7E43A8 80283528 8E270010 */  lw        $a3, 0x10($s1)
-/* 7E43AC 8028352C AFA20020 */  sw        $v0, 0x20($sp)
-/* 7E43B0 80283530 00721004 */  sllv      $v0, $s2, $v1
-/* 7E43B4 80283534 00521021 */  addu      $v0, $v0, $s2
-/* 7E43B8 80283538 000210C0 */  sll       $v0, $v0, 3
-/* 7E43BC 8028353C 00521021 */  addu      $v0, $v0, $s2
-/* 7E43C0 80283540 AFA00010 */  sw        $zero, 0x10($sp)
-/* 7E43C4 80283544 AFA00014 */  sw        $zero, 0x14($sp)
-/* 7E43C8 80283548 AFA00018 */  sw        $zero, 0x18($sp)
-/* 7E43CC 8028354C AFA0001C */  sw        $zero, 0x1c($sp)
-/* 7E43D0 80283550 00A22821 */  addu      $a1, $a1, $v0
-/* 7E43D4 80283554 24A5000C */  addiu     $a1, $a1, 0xc
-/* 7E43D8 80283558 00701004 */  sllv      $v0, $s0, $v1
-/* 7E43DC 8028355C 00501021 */  addu      $v0, $v0, $s0
-/* 7E43E0 80283560 000210C0 */  sll       $v0, $v0, 3
-/* 7E43E4 80283564 00501021 */  addu      $v0, $v0, $s0
-/* 7E43E8 80283568 00E23821 */  addu      $a3, $a3, $v0
-/* 7E43EC 8028356C 0C044631 */  jal       create_entity
-/* 7E43F0 80283570 24E7000C */   addiu    $a3, $a3, 0xc
-/* 7E43F4 80283574 3C048028 */  lui       $a0, %hi(D_80285674_7E64F4)
-/* 7E43F8 80283578 24845674 */  addiu     $a0, $a0, %lo(D_80285674_7E64F4)
-/* 7E43FC 8028357C 24050040 */  addiu     $a1, $zero, 0x40
-/* 7E4400 80283580 0040802D */  daddu     $s0, $v0, $zero
-/* 7E4404 80283584 26064000 */  addiu     $a2, $s0, 0x4000
-/* 7E4408 80283588 0220382D */  daddu     $a3, $s1, $zero
-/* 7E440C 8028358C 24020003 */  addiu     $v0, $zero, 3
-/* 7E4410 80283590 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4414 80283594 0C0B10AA */  jal       bind_trigger_1
-/* 7E4418 80283598 AFA20014 */   sw       $v0, 0x14($sp)
-/* 7E441C 8028359C AE700084 */  sw        $s0, 0x84($s3)
-.L802835A0:
-/* 7E4420 802835A0 8FBF0038 */  lw        $ra, 0x38($sp)
-/* 7E4424 802835A4 8FB30034 */  lw        $s3, 0x34($sp)
-/* 7E4428 802835A8 8FB20030 */  lw        $s2, 0x30($sp)
-/* 7E442C 802835AC 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 7E4430 802835B0 8FB00028 */  lw        $s0, 0x28($sp)
-/* 7E4434 802835B4 24020002 */  addiu     $v0, $zero, 2
-/* 7E4438 802835B8 03E00008 */  jr        $ra
-/* 7E443C 802835BC 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
deleted file mode 100644
index da9ac54bb5..0000000000
--- a/ver/us/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel SetPushBlockFallEffect
-/* 7E462C 802837AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 7E4630 802837B0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E4634 802837B4 0080882D */  daddu     $s1, $a0, $zero
-/* 7E4638 802837B8 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 7E463C 802837BC AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E4640 802837C0 8E30000C */  lw        $s0, 0xc($s1)
-/* 7E4644 802837C4 8E050000 */  lw        $a1, ($s0)
-/* 7E4648 802837C8 0C0B1EAF */  jal       evt_get_variable
-/* 7E464C 802837CC 26100004 */   addiu    $s0, $s0, 4
-/* 7E4650 802837D0 0220202D */  daddu     $a0, $s1, $zero
-/* 7E4654 802837D4 8E050000 */  lw        $a1, ($s0)
-/* 7E4658 802837D8 0C0B1EAF */  jal       evt_get_variable
-/* 7E465C 802837DC 0040802D */   daddu    $s0, $v0, $zero
-/* 7E4660 802837E0 00108080 */  sll       $s0, $s0, 2
-/* 7E4664 802837E4 3C03802E */  lui       $v1, %hi(D_802DBC88)
-/* 7E4668 802837E8 00701821 */  addu      $v1, $v1, $s0
-/* 7E466C 802837EC 8C63BC88 */  lw        $v1, %lo(D_802DBC88)($v1)
-/* 7E4670 802837F0 AC620014 */  sw        $v0, 0x14($v1)
-/* 7E4674 802837F4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 7E4678 802837F8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E467C 802837FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4680 80283800 24020002 */  addiu     $v0, $zero, 2
-/* 7E4684 80283804 03E00008 */  jr        $ra
-/* 7E4688 80283808 27BD0020 */   addiu    $sp, $sp, 0x20
-/* 7E468C 8028380C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/func_80283240.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/func_80283240.s
deleted file mode 100644
index 580b26816f..0000000000
--- a/ver/us/asm/nonmatchings/world/script_api/7E3700/func_80283240.s
+++ /dev/null
@@ -1,48 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80283240
-/* 7E40C0 80283240 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 7E40C4 80283244 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7E40C8 80283248 0080982D */  daddu     $s3, $a0, $zero
-/* 7E40CC 8028324C AFB10014 */  sw        $s1, 0x14($sp)
-/* 7E40D0 80283250 0000882D */  daddu     $s1, $zero, $zero
-/* 7E40D4 80283254 AFBF0024 */  sw        $ra, 0x24($sp)
-/* 7E40D8 80283258 AFB40020 */  sw        $s4, 0x20($sp)
-/* 7E40DC 8028325C AFB20018 */  sw        $s2, 0x18($sp)
-/* 7E40E0 80283260 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7E40E4 80283264 8E62000C */  lw        $v0, 0xc($s3)
-/* 7E40E8 80283268 8C450004 */  lw        $a1, 4($v0)
-/* 7E40EC 8028326C 8C540000 */  lw        $s4, ($v0)
-/* 7E40F0 80283270 0C0B1EAF */  jal       evt_get_variable
-/* 7E40F4 80283274 0220802D */   daddu    $s0, $s1, $zero
-/* 7E40F8 80283278 0040902D */  daddu     $s2, $v0, $zero
-.L8028327C:
-/* 7E40FC 8028327C 0C0B11E4 */  jal       get_script_by_index
-/* 7E4100 80283280 0200202D */   daddu    $a0, $s0, $zero
-/* 7E4104 80283284 10400006 */  beqz      $v0, .L802832A0
-/* 7E4108 80283288 26100001 */   addiu    $s0, $s0, 1
-/* 7E410C 8028328C 8C42015C */  lw        $v0, 0x15c($v0)
-/* 7E4110 80283290 14520004 */  bne       $v0, $s2, .L802832A4
-/* 7E4114 80283294 2A020080 */   slti     $v0, $s0, 0x80
-/* 7E4118 80283298 080A0CAB */  j         .L802832AC
-/* 7E411C 8028329C 24110001 */   addiu    $s1, $zero, 1
-.L802832A0:
-/* 7E4120 802832A0 2A020080 */  slti      $v0, $s0, 0x80
-.L802832A4:
-/* 7E4124 802832A4 1440FFF5 */  bnez      $v0, .L8028327C
-/* 7E4128 802832A8 00000000 */   nop
-.L802832AC:
-/* 7E412C 802832AC 0260202D */  daddu     $a0, $s3, $zero
-/* 7E4130 802832B0 0280282D */  daddu     $a1, $s4, $zero
-/* 7E4134 802832B4 0C0B2026 */  jal       evt_set_variable
-/* 7E4138 802832B8 0220302D */   daddu    $a2, $s1, $zero
-/* 7E413C 802832BC 8FBF0024 */  lw        $ra, 0x24($sp)
-/* 7E4140 802832C0 8FB40020 */  lw        $s4, 0x20($sp)
-/* 7E4144 802832C4 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 7E4148 802832C8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 7E414C 802832CC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 7E4150 802832D0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 7E4154 802832D4 24020002 */  addiu     $v0, $zero, 2
-/* 7E4158 802832D8 03E00008 */  jr        $ra
-/* 7E415C 802832DC 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index ff1feea350..01bfe077ff 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -11929,7 +11929,7 @@ D_80283F58_7E4DD8 = 0x80283F58; // type:data rom:0x7E4DD8
 BadgeShopInteract = 0x80284034; // type:data rom:0x7E4EB4
 D_80284054_7E4ED4 = 0x80284054; // type:data rom:0x7E4ED4
 func_80240000_7E73A0 = 0x80240000; // type:func rom:0x7E73A0
-machi_UnkFunc36 = 0x80240030; // type:func rom:0x7E73D0
+machi_80240030_7E73D0 = 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
@@ -12098,18 +12098,18 @@ func_80243500_803D80 = 0x80243500; // type:func rom:0x803D80
 func_802435C0_803E40 = 0x802435C0; // type:func rom:0x803E40
 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
-mac_01_UnkFunc32 = 0x802437F4; // type:func rom:0x804074
-mac_01_CamSetFOV = 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
-mac_01_DoesPlayerNeedSleep = 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
+mac_01_ToadHouse_DisableStatusMenu = 0x802437AC; // type:func rom:0x80402C
+mac_01_ToadHouse_ShowStatusMenu = 0x802437CC; // type:func rom:0x80404C
+mac_01_ToadHouse_UpdateScreenOverlay = 0x802437F4; // type:func rom:0x804074
+mac_01_ToadHouse_CamSetFOV = 0x80243870; // type:func rom:0x8040F0
+mac_01_ToadHouse_AwaitScriptComplete = 0x802438F0; // type:func rom:0x804170
+mac_01_ToadHouse_PartnerSuspendAbilityScript = 0x80243920; // type:func rom:0x8041A0
+mac_01_ToadHouse_PartnerResumeAbilityScript = 0x8024394C; // type:func rom:0x8041CC
+mac_01_ToadHouse_DoesPlayerNeedSleep = 0x8024396C; // type:func rom:0x8041EC
+mac_01_ToadHouse_InitScreenOverlay = 0x802439C0; // type:func rom:0x804240
+mac_01_ToadHouse_PutPartnerAway = 0x80243A3C; // type:func rom:0x8042BC
+mac_01_ToadHouse_GetPartnerBackOut = 0x80243A70; // type:func rom:0x8042F0
+mac_01_ToadHouse_Stub = 0x80243AA0; // type:func rom:0x804320
 mac_01_GetNpcCollisionHeight = 0x80243AA8; // type:func rom:0x804328
 mac_01_AddPlayerHandsOffset = 0x80243B04; // type:func rom:0x804384
 func_80243CD4_804554 = 0x80243CD4; // type:func rom:0x804554
@@ -12375,7 +12375,7 @@ func_802419E4_8445B4 = 0x802419E4; // type:func rom:0x8445B4
 func_80241A64_844634 = 0x80241A64; // type:func rom:0x844634
 func_80241B90_844760 = 0x80241B90; // type:func rom:0x844760
 mac_04_SetNpcShadowScale = 0x80241BB8; // type:func rom:0x844788
-mac_04_Call800E9894 = 0x80241C20; // type:func rom:0x8447F0
+mac_04_80241C20_8447F0 = 0x80241C20; // type:func rom:0x8447F0
 func_80241C40_844810 = 0x80241C40; // type:func rom:0x844810
 func_80241C60_844830 = 0x80241C60; // type:func rom:0x844830
 func_80241C90_844860 = 0x80241C90; // type:func rom:0x844860
@@ -12978,18 +12978,18 @@ func_80242F08_8B2F78 = 0x80242F08; // type:func rom:0x8B2F78
 func_80242F28_8B2F98 = 0x80242F28; // type:func rom:0x8B2F98
 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
-kmr_02_UnkFunc32 = 0x802430B8; // type:func rom:0x8B3128
-kmr_02_CamSetFOV = 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
-kmr_02_DoesPlayerNeedSleep = 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
-kmr_02_UnkFunc36 = 0x80243364; // type:func rom:0x8B33D4
+kmr_02_ToadHouse_DisableStatusMenu = 0x80243070; // type:func rom:0x8B30E0
+kmr_02_ToadHouse_ShowStatusMenu = 0x80243090; // type:func rom:0x8B3100
+kmr_02_ToadHouse_UpdateScreenOverlay = 0x802430B8; // type:func rom:0x8B3128
+kmr_02_ToadHouse_CamSetFOV = 0x80243134; // type:func rom:0x8B31A4
+kmr_02_ToadHouse_AwaitScriptComplete = 0x802431B4; // type:func rom:0x8B3224
+kmr_02_ToadHouse_PartnerSuspendAbilityScript = 0x802431E4; // type:func rom:0x8B3254
+kmr_02_ToadHouse_PartnerResumeAbilityScript = 0x80243210; // type:func rom:0x8B3280
+kmr_02_ToadHouse_DoesPlayerNeedSleep = 0x80243230; // type:func rom:0x8B32A0
+kmr_02_ToadHouse_InitScreenOverlay = 0x80243284; // type:func rom:0x8B32F4
+kmr_02_ToadHouse_PutPartnerAway = 0x80243300; // type:func rom:0x8B3370
+kmr_02_ToadHouse_GetPartnerBackOut = 0x80243334; // type:func rom:0x8B33A4
+kmr_02_ToadHouse_Stub = 0x80243364; // type:func rom:0x8B33D4
 func_80243370_8B33E0 = 0x80243370; // type:func rom:0x8B33E0
 kmr_02_SetEntityPositionF = 0x802433AC; // type:func rom:0x8B341C
 kmr_02_GetEntityPosition = 0x80243474; // type:func rom:0x8B34E4
@@ -13217,18 +13217,18 @@ dup_kmr_20_foliage_setup_shear_mtx = 0x80240E20; // type:func rom:0x8ECC40
 dup_kmr_20_TransformFoliage = 0x80240E90; // type:func rom:0x8ECCB0
 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
-kmr_20_UnkFunc32 = 0x802412E8; // type:func rom:0x8ED108
-kmr_20_CamSetFOV = 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
-kmr_20_DoesPlayerNeedSleep = 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
-kmr_20_UnkFunc36 = 0x80241594; // type:func rom:0x8ED3B4
+kmr_20_ToadHouse_DisableStatusMenu = 0x802412A0; // type:func rom:0x8ED0C0
+kmr_20_ToadHouse_ShowStatusMenu = 0x802412C0; // type:func rom:0x8ED0E0
+kmr_20_ToadHouse_UpdateScreenOverlay = 0x802412E8; // type:func rom:0x8ED108
+kmr_20_ToadHouse_CamSetFOV = 0x80241364; // type:func rom:0x8ED184
+kmr_20_ToadHouse_AwaitScriptComplete = 0x802413E4; // type:func rom:0x8ED204
+kmr_20_ToadHouse_PartnerSuspendAbilityScript = 0x80241414; // type:func rom:0x8ED234
+kmr_20_ToadHouse_PartnerResumeAbilityScript = 0x80241440; // type:func rom:0x8ED260
+kmr_20_ToadHouse_DoesPlayerNeedSleep = 0x80241460; // type:func rom:0x8ED280
+kmr_20_ToadHouse_InitScreenOverlay = 0x802414B4; // type:func rom:0x8ED2D4
+kmr_20_ToadHouse_PutPartnerAway = 0x80241530; // type:func rom:0x8ED350
+kmr_20_ToadHouse_GetPartnerBackOut = 0x80241564; // type:func rom:0x8ED384
+kmr_20_ToadHouse_Stub = 0x80241594; // type:func rom:0x8ED3B4
 func_8024159C_8ED3BC = 0x8024159C; // type:func rom:0x8ED3BC
 func_802415C4_8ED3E4 = 0x802415C4; // type:func rom:0x8ED3E4
 kmr_20_WaitForPlayerToLand = 0x802415EC; // type:func rom:0x8ED40C
@@ -14006,18 +14006,18 @@ 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
-dro_02_UnkFunc32 = 0x802434CC; // type:func rom:0x96C68C
-dro_02_CamSetFOV = 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
-dro_02_DoesPlayerNeedSleep = 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
-dro_02_UnkFunc36 = 0x80243778; // type:func rom:0x96C938
+dro_02_ToadHouse_DisableStatusMenu = 0x80243484; // type:func rom:0x96C644
+dro_02_ToadHouse_ShowStatusMenu = 0x802434A4; // type:func rom:0x96C664
+dro_02_ToadHouse_UpdateScreenOverlay = 0x802434CC; // type:func rom:0x96C68C
+dro_02_ToadHouse_CamSetFOV = 0x80243548; // type:func rom:0x96C708
+dro_02_ToadHouse_AwaitScriptComplete = 0x802435C8; // type:func rom:0x96C788
+dro_02_ToadHouse_PartnerSuspendAbilityScript = 0x802435F8; // type:func rom:0x96C7B8
+dro_02_ToadHouse_PartnerResumeAbilityScript = 0x80243624; // type:func rom:0x96C7E4
+dro_02_ToadHouse_DoesPlayerNeedSleep = 0x80243644; // type:func rom:0x96C804
+dro_02_ToadHouse_InitScreenOverlay = 0x80243698; // type:func rom:0x96C858
+dro_02_ToadHouse_PutPartnerAway = 0x80243714; // type:func rom:0x96C8D4
+dro_02_ToadHouse_GetPartnerBackOut = 0x80243748; // type:func rom:0x96C908
+dro_02_ToadHouse_Stub = 0x80243778; // type:func rom:0x96C938
 dro_02_SetManyVars = 0x80243780; // type:func rom:0x96C940
 dro_02_UnkYawFunc = 0x80243870; // type:func rom:0x96CA30
 dro_02_func_802439FC_96CBBC = 0x802439FC; // type:func rom:0x96CBBC
@@ -14519,18 +14519,18 @@ nok_01_UnkNpcAIFunc10 = 0x802404F8; // type:func rom:0x9C58D8
 nok_01_UnkNpcAIFunc42 = 0x80240540; // type:func rom:0x9C5920
 nok_01_UnkNpcAIFunc45 = 0x802405EC; // type:func rom:0x9C59CC
 nok_01_UnkNpcAIMainFunc4 = 0x802407F4; // type:func rom:0x9C5BD4
-nok_01_Call800E9894 = 0x80240A6C; // type:func rom:0x9C5E4C
-nok_01_Call800E98C4SyncStatusMenu = 0x80240A8C; // type:func rom:0x9C5E6C
-nok_01_UnkFunc32 = 0x80240AB4; // type:func rom:0x9C5E94
-nok_01_CamSetFOV = 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
-nok_01_DoesPlayerNeedSleep = 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
-nok_01_UnkFunc36 = 0x80240D60; // type:func rom:0x9C6140
+nok_01_ToadHouse_DisableStatusMenu = 0x80240A6C; // type:func rom:0x9C5E4C
+nok_01_ToadHouse_ShowStatusMenu = 0x80240A8C; // type:func rom:0x9C5E6C
+nok_01_ToadHouse_UpdateScreenOverlay = 0x80240AB4; // type:func rom:0x9C5E94
+nok_01_ToadHouse_CamSetFOV = 0x80240B30; // type:func rom:0x9C5F10
+nok_01_ToadHouse_AwaitScriptComplete = 0x80240BB0; // type:func rom:0x9C5F90
+nok_01_ToadHouse_PartnerSuspendAbilityScript = 0x80240BE0; // type:func rom:0x9C5FC0
+nok_01_ToadHouse_PartnerResumeAbilityScript = 0x80240C0C; // type:func rom:0x9C5FEC
+nok_01_ToadHouse_DoesPlayerNeedSleep = 0x80240C2C; // type:func rom:0x9C600C
+nok_01_ToadHouse_InitScreenOverlay = 0x80240C80; // type:func rom:0x9C6060
+nok_01_ToadHouse_PutPartnerAway = 0x80240CFC; // type:func rom:0x9C60DC
+nok_01_ToadHouse_GetPartnerBackOut = 0x80240D30; // type:func rom:0x9C6110
+nok_01_ToadHouse_Stub = 0x80240D60; // type:func rom:0x9C6140
 nok_01_StashVars = 0x80240D68; // type:func rom:0x9C6148
 nok_01_GetItemName = 0x80240E1C; // type:func rom:0x9C61FC
 nok_01_Set80151310_1 = 0x80240E80; // type:func rom:0x9C6260
@@ -14976,18 +14976,18 @@ hos_03_UnkNpcAIFunc3 = 0x80241AA4; // type:func rom:0xA1CBA4
 hos_03_UnkFunc6 = 0x80241B08; // type:func rom:0xA1CC08
 hos_03_UnkFunc5 = 0x80241E98; // type:func rom:0xA1CF98
 hos_03_UnkNpcAIMainFunc9 = 0x80241FBC; // type:func rom:0xA1D0BC
-hos_03_Call800E9894 = 0x802421A8; // type:func rom:0xA1D2A8
-hos_03_Call800E98C4SyncStatusMenu = 0x802421C8; // type:func rom:0xA1D2C8
-hos_03_UnkFunc32 = 0x802421F0; // type:func rom:0xA1D2F0
-hos_03_CamSetFOV = 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
-hos_03_DoesPlayerNeedSleep = 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
-hos_03_UnkFunc36 = 0x8024249C; // type:func rom:0xA1D59C
+hos_03_ToadHouse_DisableStatusMenu = 0x802421A8; // type:func rom:0xA1D2A8
+hos_03_ToadHouse_ShowStatusMenu = 0x802421C8; // type:func rom:0xA1D2C8
+hos_03_ToadHouse_UpdateScreenOverlay = 0x802421F0; // type:func rom:0xA1D2F0
+hos_03_ToadHouse_CamSetFOV = 0x8024226C; // type:func rom:0xA1D36C
+hos_03_ToadHouse_AwaitScriptComplete = 0x802422EC; // type:func rom:0xA1D3EC
+hos_03_ToadHouse_PartnerSuspendAbilityScript = 0x8024231C; // type:func rom:0xA1D41C
+hos_03_ToadHouse_PartnerResumeAbilityScript = 0x80242348; // type:func rom:0xA1D448
+hos_03_ToadHouse_DoesPlayerNeedSleep = 0x80242368; // type:func rom:0xA1D468
+hos_03_ToadHouse_InitScreenOverlay = 0x802423BC; // type:func rom:0xA1D4BC
+hos_03_ToadHouse_PutPartnerAway = 0x80242438; // type:func rom:0xA1D538
+hos_03_ToadHouse_GetPartnerBackOut = 0x8024246C; // type:func rom:0xA1D56C
+hos_03_ToadHouse_Stub = 0x8024249C; // type:func rom:0xA1D59C
 hos_03_StashVars = 0x802424A4; // type:func rom:0xA1D5A4
 hos_03_GetItemName = 0x80242558; // type:func rom:0xA1D658
 hos_03_Set80151310_1 = 0x802425BC; // type:func rom:0xA1D6BC
@@ -15611,18 +15611,18 @@ kpa_91_UnkDistFunc = 0x80240F0C; // type:func rom:0xA8795C
 kpa_91_UnkNpcAIFunc12 = 0x80241040; // type:func rom:0xA87A90
 kpa_91_set_script_owner_npc_col_height = 0x802411A4; // type:func rom:0xA87BF4
 kpa_91_UnkNpcAIMainFunc8 = 0x80241224; // type:func rom:0xA87C74
-kpa_91_Call800E9894 = 0x80241528; // type:func rom:0xA87F78
-kpa_91_Call800E98C4SyncStatusMenu = 0x80241548; // type:func rom:0xA87F98
-kpa_91_UnkFunc32 = 0x80241570; // type:func rom:0xA87FC0
-kpa_91_CamSetFOV = 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
-kpa_91_DoesPlayerNeedSleep = 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
-kpa_91_UnkFunc36 = 0x8024181C; // type:func rom:0xA8826C
+kpa_91_ToadHouse_DisableStatusMenu = 0x80241528; // type:func rom:0xA87F78
+kpa_91_ToadHouse_ShowStatusMenu = 0x80241548; // type:func rom:0xA87F98
+kpa_91_ToadHouse_UpdateScreenOverlay = 0x80241570; // type:func rom:0xA87FC0
+kpa_91_ToadHouse_CamSetFOV = 0x802415EC; // type:func rom:0xA8803C
+kpa_91_ToadHouse_AwaitScriptComplete = 0x8024166C; // type:func rom:0xA880BC
+kpa_91_ToadHouse_PartnerSuspendAbilityScript = 0x8024169C; // type:func rom:0xA880EC
+kpa_91_ToadHouse_PartnerResumeAbilityScript = 0x802416C8; // type:func rom:0xA88118
+kpa_91_ToadHouse_DoesPlayerNeedSleep = 0x802416E8; // type:func rom:0xA88138
+kpa_91_ToadHouse_InitScreenOverlay = 0x8024173C; // type:func rom:0xA8818C
+kpa_91_ToadHouse_PutPartnerAway = 0x802417B8; // type:func rom:0xA88208
+kpa_91_ToadHouse_GetPartnerBackOut = 0x802417EC; // type:func rom:0xA8823C
+kpa_91_ToadHouse_Stub = 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
@@ -15647,18 +15647,18 @@ kpa_95_UnkDistFunc = 0x80240FEC; // type:func rom:0xA8DA6C
 kpa_95_UnkNpcAIFunc12 = 0x80241120; // type:func rom:0xA8DBA0
 kpa_95_set_script_owner_npc_col_height = 0x80241284; // type:func rom:0xA8DD04
 kpa_95_UnkNpcAIMainFunc8 = 0x80241304; // type:func rom:0xA8DD84
-kpa_95_Call800E9894 = 0x80241608; // type:func rom:0xA8E088
-kpa_95_Call800E98C4SyncStatusMenu = 0x80241628; // type:func rom:0xA8E0A8
-kpa_95_UnkFunc32 = 0x80241650; // type:func rom:0xA8E0D0
-kpa_95_CamSetFOV = 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
-kpa_95_DoesPlayerNeedSleep = 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
-kpa_95_UnkFunc36 = 0x802418FC; // type:func rom:0xA8E37C
+kpa_95_ToadHouse_DisableStatusMenu = 0x80241608; // type:func rom:0xA8E088
+kpa_95_ToadHouse_ShowStatusMenu = 0x80241628; // type:func rom:0xA8E0A8
+kpa_95_ToadHouse_UpdateScreenOverlay = 0x80241650; // type:func rom:0xA8E0D0
+kpa_95_ToadHouse_CamSetFOV = 0x802416CC; // type:func rom:0xA8E14C
+kpa_95_ToadHouse_AwaitScriptComplete = 0x8024174C; // type:func rom:0xA8E1CC
+kpa_95_ToadHouse_PartnerSuspendAbilityScript = 0x8024177C; // type:func rom:0xA8E1FC
+kpa_95_ToadHouse_PartnerResumeAbilityScript = 0x802417A8; // type:func rom:0xA8E228
+kpa_95_ToadHouse_DoesPlayerNeedSleep = 0x802417C8; // type:func rom:0xA8E248
+kpa_95_ToadHouse_InitScreenOverlay = 0x8024181C; // type:func rom:0xA8E29C
+kpa_95_ToadHouse_PutPartnerAway = 0x80241898; // type:func rom:0xA8E318
+kpa_95_ToadHouse_GetPartnerBackOut = 0x802418CC; // type:func rom:0xA8E34C
+kpa_95_ToadHouse_Stub = 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
@@ -16025,18 +16025,18 @@ kkj_20_StashVars = 0x80240000; // type:func rom:0xAFDB40
 kkj_20_GetItemName = 0x802400B4; // type:func rom:0xAFDBF4
 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
-kkj_20_UnkFunc32 = 0x80240308; // type:func rom:0xAFDE48
-kkj_20_CamSetFOV = 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
-kkj_20_DoesPlayerNeedSleep = 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
-kkj_20_UnkFunc36 = 0x802405B4; // type:func rom:0xAFE0F4
+kkj_20_ToadHouse_DisableStatusMenu = 0x802402C0; // type:func rom:0xAFDE00
+kkj_20_ToadHouse_ShowStatusMenu = 0x802402E0; // type:func rom:0xAFDE20
+kkj_20_ToadHouse_UpdateScreenOverlay = 0x80240308; // type:func rom:0xAFDE48
+kkj_20_ToadHouse_CamSetFOV = 0x80240384; // type:func rom:0xAFDEC4
+kkj_20_ToadHouse_AwaitScriptComplete = 0x80240404; // type:func rom:0xAFDF44
+kkj_20_ToadHouse_PartnerSuspendAbilityScript = 0x80240434; // type:func rom:0xAFDF74
+kkj_20_ToadHouse_PartnerResumeAbilityScript = 0x80240460; // type:func rom:0xAFDFA0
+kkj_20_ToadHouse_DoesPlayerNeedSleep = 0x80240480; // type:func rom:0xAFDFC0
+kkj_20_ToadHouse_InitScreenOverlay = 0x802404D4; // type:func rom:0xAFE014
+kkj_20_ToadHouse_PutPartnerAway = 0x80240550; // type:func rom:0xAFE090
+kkj_20_ToadHouse_GetPartnerBackOut = 0x80240584; // type:func rom:0xAFE0C4
+kkj_20_ToadHouse_Stub = 0x802405B4; // type:func rom:0xAFE0F4
 func_802405BC_AFE0FC = 0x802405BC; // type:func rom:0xAFE0FC
 kkj_20_varTable = 0x80240880; // type:data rom:0xAFE3C0
 kkj_23_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xB02880
@@ -16247,18 +16247,18 @@ jan_03_UnkFunc15 = 0x80240F6C; // type:func rom:0xB35B3C
 jan_03_UnkNpcDurationFlagFunc = 0x8024108C; // type:func rom:0xB35C5C
 jan_03_UnkFunc16 = 0x802410F4; // type:func rom:0xB35CC4
 jan_03_UnkNpcAIMainFunc = 0x802411B4; // type:func rom:0xB35D84
-jan_03_Call800E9894 = 0x802414B0; // type:func rom:0xB36080
-jan_03_Call800E98C4SyncStatusMenu = 0x802414D0; // type:func rom:0xB360A0
-jan_03_UnkFunc32 = 0x802414F8; // type:func rom:0xB360C8
-jan_03_CamSetFOV = 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
-jan_03_DoesPlayerNeedSleep = 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
-jan_03_UnkFunc36 = 0x802417A4; // type:func rom:0xB36374
+jan_03_ToadHouse_DisableStatusMenu = 0x802414B0; // type:func rom:0xB36080
+jan_03_ToadHouse_ShowStatusMenu = 0x802414D0; // type:func rom:0xB360A0
+jan_03_ToadHouse_UpdateScreenOverlay = 0x802414F8; // type:func rom:0xB360C8
+jan_03_ToadHouse_CamSetFOV = 0x80241574; // type:func rom:0xB36144
+jan_03_ToadHouse_AwaitScriptComplete = 0x802415F4; // type:func rom:0xB361C4
+jan_03_ToadHouse_PartnerSuspendAbilityScript = 0x80241624; // type:func rom:0xB361F4
+jan_03_ToadHouse_PartnerResumeAbilityScript = 0x80241650; // type:func rom:0xB36220
+jan_03_ToadHouse_DoesPlayerNeedSleep = 0x80241670; // type:func rom:0xB36240
+jan_03_ToadHouse_InitScreenOverlay = 0x802416C4; // type:func rom:0xB36294
+jan_03_ToadHouse_PutPartnerAway = 0x80241740; // type:func rom:0xB36310
+jan_03_ToadHouse_GetPartnerBackOut = 0x80241774; // type:func rom:0xB36344
+jan_03_ToadHouse_Stub = 0x802417A4; // type:func rom:0xB36374
 jan_03_GetNpcCollisionHeight = 0x802417AC; // type:func rom:0xB3637C
 jan_03_AddPlayerHandsOffset = 0x80241808; // type:func rom:0xB363D8
 func_802419D8_B365A8 = 0x802419D8; // type:func rom:0xB365A8
@@ -16911,7 +16911,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
-obk_07_UnkFunc36 = 0x80241788; // type:func rom:0xBD0378
+obk_07_80241788_BD0378 = 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
@@ -20339,7 +20339,7 @@ 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_80240040_CEC280 = 0x80240040; // type:func rom:0xCEC280
 flo_22_foliage_setup_shear_mtx = 0x80240050; // type:func rom:0xCEC290
 flo_22_TransformFoliage = 0x802400C0; // type:func rom:0xCEC300
 flo_22_entryList = 0x80240290; // type:data rom:0xCEC4D0
@@ -20566,18 +20566,18 @@ sam_02_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xD05A10
 sam_02_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xD05B34
 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
-sam_02_UnkFunc32 = 0x80240878; // type:func rom:0xD05FA8
-sam_02_CamSetFOV = 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
-sam_02_DoesPlayerNeedSleep = 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
-sam_02_UnkFunc36 = 0x80240B24; // type:func rom:0xD06254
+sam_02_ToadHouse_DisableStatusMenu = 0x80240830; // type:func rom:0xD05F60
+sam_02_ToadHouse_ShowStatusMenu = 0x80240850; // type:func rom:0xD05F80
+sam_02_ToadHouse_UpdateScreenOverlay = 0x80240878; // type:func rom:0xD05FA8
+sam_02_ToadHouse_CamSetFOV = 0x802408F4; // type:func rom:0xD06024
+sam_02_ToadHouse_AwaitScriptComplete = 0x80240974; // type:func rom:0xD060A4
+sam_02_ToadHouse_PartnerSuspendAbilityScript = 0x802409A4; // type:func rom:0xD060D4
+sam_02_ToadHouse_PartnerResumeAbilityScript = 0x802409D0; // type:func rom:0xD06100
+sam_02_ToadHouse_DoesPlayerNeedSleep = 0x802409F0; // type:func rom:0xD06120
+sam_02_ToadHouse_InitScreenOverlay = 0x80240A44; // type:func rom:0xD06174
+sam_02_ToadHouse_PutPartnerAway = 0x80240AC0; // type:func rom:0xD061F0
+sam_02_ToadHouse_GetPartnerBackOut = 0x80240AF4; // type:func rom:0xD06224
+sam_02_ToadHouse_Stub = 0x80240B24; // type:func rom:0xD06254
 sam_02_StashVars = 0x80240B2C; // type:func rom:0xD0625C
 sam_02_GetItemName = 0x80240BE0; // type:func rom:0xD06310
 sam_02_Set80151310_1 = 0x80240C44; // type:func rom:0xD06374
@@ -20676,18 +20676,18 @@ func_80241D8C_D21C1C = 0x80241D8C; // type:func rom:0xD21C1C
 func_80241DE0_D21C70 = 0x80241DE0; // type:func rom:0xD21C70
 func_80241E18_D21CA8 = 0x80241E18; // type:func rom:0xD21CA8
 func_80241EB4_D21D44 = 0x80241EB4; // type:func rom:0xD21D44
-sam_06_Call800E9894 = 0x80241F50; // type:func rom:0xD21DE0
-sam_06_Call800E98C4SyncStatusMenu = 0x80241F70; // type:func rom:0xD21E00
-sam_06_UnkFunc32 = 0x80241F98; // type:func rom:0xD21E28
-sam_06_CamSetFOV = 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
-sam_06_DoesPlayerNeedSleep = 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
-sam_06_UnkFunc36 = 0x80242244; // type:func rom:0xD220D4
+sam_06_ToadHouse_DisableStatusMenu = 0x80241F50; // type:func rom:0xD21DE0
+sam_06_ToadHouse_ShowStatusMenu = 0x80241F70; // type:func rom:0xD21E00
+sam_06_ToadHouse_UpdateScreenOverlay = 0x80241F98; // type:func rom:0xD21E28
+sam_06_ToadHouse_CamSetFOV = 0x80242014; // type:func rom:0xD21EA4
+sam_06_ToadHouse_AwaitScriptComplete = 0x80242094; // type:func rom:0xD21F24
+sam_06_ToadHouse_PartnerSuspendAbilityScript = 0x802420C4; // type:func rom:0xD21F54
+sam_06_ToadHouse_PartnerResumeAbilityScript = 0x802420F0; // type:func rom:0xD21F80
+sam_06_ToadHouse_DoesPlayerNeedSleep = 0x80242110; // type:func rom:0xD21FA0
+sam_06_ToadHouse_InitScreenOverlay = 0x80242164; // type:func rom:0xD21FF4
+sam_06_ToadHouse_PutPartnerAway = 0x802421E0; // type:func rom:0xD22070
+sam_06_ToadHouse_GetPartnerBackOut = 0x80242214; // type:func rom:0xD220A4
+sam_06_ToadHouse_Stub = 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